From a5eeb70cf0c638ed6eb755918f1c42d927ae6d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Dec 2019 19:00:27 +0100 Subject: [PATCH] DEB trinity-apt-archive: Update for new archive layout. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../debian/distrospecific/repositories/trinity.list | 6 ++---- ubuntu/_base/metapackages/trinity-apt-archive/debian/rules | 2 +- 2 files changed, 3 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..9c02dd904 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,4 @@ # 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-testing main deps +deb-src http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing main deps 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