summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/_base/metapackages/trinity-apt-archive/debian/control2
-rw-r--r--debian/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list4
-rwxr-xr-xdebian/_base/metapackages/trinity-apt-archive/debian/rules3
3 files changed, 5 insertions, 4 deletions
diff --git a/debian/_base/metapackages/trinity-apt-archive/debian/control b/debian/_base/metapackages/trinity-apt-archive/debian/control
index 1586bbf1c..37ce190ed 100644
--- a/debian/_base/metapackages/trinity-apt-archive/debian/control
+++ b/debian/_base/metapackages/trinity-apt-archive/debian/control
@@ -7,7 +7,7 @@ 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 f92f8cc43..8408867d2 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-r14.1.x <distribution> main deps
-deb-src http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-r14.1.x <distribution> main deps
+deb [arch=<arch>] http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-r14.1.x <distribution> main deps
+deb-src [arch=<arch>] http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-r14.1.x <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