diff options
Diffstat (limited to 'debian/_base/metapackages/trinity-apt-archive/debian')
4 files changed, 7 insertions, 6 deletions
diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/compat b/debian/_base/metapackages/trinity-apt-archive/debian/compat index ec635144f..f599e28b8 100644 --- a/debian/_base/metapackages/trinity-apt-archive/debian/compat +++ b/debian/_base/metapackages/trinity-apt-archive/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/control b/debian/_base/metapackages/trinity-apt-archive/debian/control index 1586bbf1c..ad303adae 100644 --- a/debian/_base/metapackages/trinity-apt-archive/debian/control +++ b/debian/_base/metapackages/trinity-apt-archive/debian/control @@ -2,12 +2,12 @@ Source: trinity-apt-archive Section: misc Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> -Build-Depends: debhelper (>= 9~), cdbs +Build-Depends: debhelper (>= 10~), cdbs Standards-Version: 3.8.4 Package: trinity-apt-archive Priority: optional -Architecture: all +Architecture: any Depends: apt Pre-Depends: trinity-keyring Description: APT sources list for the Trinity Desktop Environment repository diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list b/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list index 9c02dd904..fda8f69a7 100644 --- a/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list +++ b/debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list @@ -1,4 +1,4 @@ # Trinity repositories -deb http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps -deb-src http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps +deb [arch=<arch>] http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps +deb-src [arch=<arch>] http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/rules b/debian/_base/metapackages/trinity-apt-archive/debian/rules index ccd4e20a8..063ee8468 100755 --- a/debian/_base/metapackages/trinity-apt-archive/debian/rules +++ b/debian/_base/metapackages/trinity-apt-archive/debian/rules @@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2) DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2) +ARCHITECTURE := $(shell dpkg-architecture -qDEB_HOST_ARCH) # The default gzip compressor has been changed in dpkg >= 1.17.0. deb_default_compress = $(shell LANG=C dpkg-deb --version | head -n1 | \ @@ -33,4 +34,4 @@ clean:: binary-install/trinity-apt-archive:: dh_testdir - sed -i 's|^\(deb[^ ]* [^ ]*\) [^ ]* main|\1 ${DISTRIBUTION} main|g' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list + sed -i -e 's|<distribution>|${DISTRIBUTION}|' -e 's|<arch>|${ARCHITECTURE}|' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list |