summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2019-12-03 19:04:20 +0100
committerSlávek Banko <slavek.banko@axis.cz>2019-12-03 19:04:20 +0100
commit00cbba064bbd475e11e8fe496e34183754ffc31b (patch)
treee450c9b3d4b3f6c2c83c603901f93fe6501653ea
parent25478084c1a56c2164aa36d44835f0bea909bf0c (diff)
downloadtde-packaging-00cbba064bbd475e11e8fe496e34183754ffc31b.tar.gz
tde-packaging-00cbba064bbd475e11e8fe496e34183754ffc31b.zip
DEB trinity-apt-archive: Update for new archive layout.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list8
-rwxr-xr-xubuntu/_base/metapackages/trinity-apt-archive/debian/rules2
2 files changed, 5 insertions, 5 deletions
diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list b/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
index 9b5333714..fe0288d27 100644
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
@@ -1,6 +1,6 @@
# Trinity repositories
-deb http://mirror.ppa.trinitydesktop.org/trinity/trinity-builddeps-r14.0.0/ubuntu maverick main
-deb-src http://mirror.ppa.trinitydesktop.org/trinity/trinity-builddeps-r14.0.0/ubuntu maverick main
-deb http://mirror.ppa.trinitydesktop.org/trinity/trinity-r14.0.0/ubuntu maverick main
-deb-src http://mirror.ppa.trinitydesktop.org/trinity/trinity-r14.0.0/ubuntu maverick main
+deb http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-builddeps-r14.0.x <distribution> main
+deb-src http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-builddeps-r14.0.x <distribution> main
+deb http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-r14.0.x <distribution> main
+deb-src http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-r14.0.x <distribution> main
diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules b/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules
index 311f254a1..fd65c8cd8 100755
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules
+++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules
@@ -26,4 +26,4 @@ clean::
binary-install/trinity-apt-archive::
dh_testdir
- sed -i 's|ubuntu [^ ]* main|ubuntu ${DISTRIBUTION} main|g' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list
+ sed -i 's|^\(deb[^ ]* [^ ]*\) [^ ]* main|\1 ${DISTRIBUTION} main|g' debian/$(cdbs_curpkg)/etc/apt/sources.list.d/trinity.list