From 61508ec3ffdf90969c5694f5cf65732dd46cbcfb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 4 Nov 2014 11:42:38 -0600 Subject: [PATCH] Split apt sources package from keyring package This relates to Bug 649 --- debian/lenny/metapackages/trinity-apt-archive | 1 + .../squeeze/metapackages/trinity-apt-archive | 1 + .../trinity-apt-archive/debian/changelog | 6 ++++ .../trinity-apt-archive/debian/compat | 1 + .../trinity-apt-archive/debian/control | 15 ++++++++++ .../trinity-apt-archive/debian/copyright | 16 ++++++++++ .../distrospecific/repositories/trinity.list | 0 .../trinity-apt-archive/debian/install | 1 + .../trinity-apt-archive/debian/postinst | 25 ++++++++++++++++ .../trinity-apt-archive/debian/prerm | 25 ++++++++++++++++ .../trinity-apt-archive/debian/rules | 29 +++++++++++++++++++ .../trinity-apt-archive/debian/source/format | 1 + .../trinity-apt-archive/debian/source/options | 6 ++++ .../trinity-keyring/debian/install | 1 - 14 files changed, 127 insertions(+), 1 deletion(-) create mode 120000 debian/lenny/metapackages/trinity-apt-archive create mode 120000 debian/squeeze/metapackages/trinity-apt-archive create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/control create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright rename ubuntu/maverick/metapackages/{trinity-keyring => trinity-apt-archive}/debian/distrospecific/repositories/trinity.list (100%) create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/install create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm create mode 100755 ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format create mode 100644 ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options diff --git a/debian/lenny/metapackages/trinity-apt-archive b/debian/lenny/metapackages/trinity-apt-archive new file mode 120000 index 000000000..520e8d70f --- /dev/null +++ b/debian/lenny/metapackages/trinity-apt-archive @@ -0,0 +1 @@ +../../../ubuntu/maverick/metapackages/trinity-apt-archive \ No newline at end of file diff --git a/debian/squeeze/metapackages/trinity-apt-archive b/debian/squeeze/metapackages/trinity-apt-archive new file mode 120000 index 000000000..520e8d70f --- /dev/null +++ b/debian/squeeze/metapackages/trinity-apt-archive @@ -0,0 +1 @@ +../../../ubuntu/maverick/metapackages/trinity-apt-archive \ No newline at end of file diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog new file mode 100644 index 000000000..374da8a0b --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/changelog @@ -0,0 +1,6 @@ +trinity-apt-archive (2011.11.01-1) maverick; urgency=low + + * NIGHTLY BUILDS + + -- Timothy Pearson Mon, 28 Oct 2011 11:39:00 -0600 + diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat new file mode 100644 index 000000000..7f8f011eb --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/compat @@ -0,0 +1 @@ +7 diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control new file mode 100644 index 000000000..ba5158009 --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/control @@ -0,0 +1,15 @@ +Source: trinity-apt-archive +Section: misc +Priority: optional +Maintainer: Timothy Pearson +Build-Depends: debhelper (>=5.0), cdbs +Standards-Version: 3.8.4 + +Package: trinity-apt-archive +Priority: important +Architecture: all +Depends: apt +Pre-Depends: trinity-keyring +Description: APT sources list for the Trinity Desktop Environment repository + This convenience package contains the APT source list files for the + Trinity Desktop Environment repository. diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright new file mode 100644 index 000000000..81235ac6d --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/copyright @@ -0,0 +1,16 @@ +The files used to generate trinity-apt-archive are free software; you +can redistribute them and/or modify them under the terms of the GNU +General Public License as published by the Free Software Foundation; +either version 2, or (at your option) any later version. + +Debian support files for trinity-apt-archive are distributed in the +hope that they will be useful, but WITHOUT ANY WARRANTY; without even +the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +PURPOSE. See the GNU General Public License for more details. + +You should have received a copy of the GNU General Public License with +your Debian system, in /usr/share/common-licenses/GPL, or with the +Debian GNU trinity-apt-archive source package as the file COPYING. +If not, write to the Free Software Foundation, Inc., 51 Franklin Street, +Fifth Floor, Boston, MA 02110-1301 USA. + diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/repositories/trinity.list b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list similarity index 100% rename from ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/repositories/trinity.list rename to ubuntu/maverick/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install new file mode 100644 index 000000000..1246138c5 --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/install @@ -0,0 +1 @@ +repositories/trinity.list etc/apt/sources.list.d diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst new file mode 100644 index 000000000..5bad16531 --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/postinst @@ -0,0 +1,25 @@ +#!/bin/sh +# postinst script for trinity-apt-archive + +set -e + +case "$1" in + configure) + apt-get update + ;; + + remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm new file mode 100644 index 000000000..dafc8b940 --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/prerm @@ -0,0 +1,25 @@ +#!/bin/sh +# prerm script for trinity-apt-archive + +set -e + +case "$1" in + remove) + apt-get update + ;; + + upgrade|failed-upgrade|deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules new file mode 100755 index 000000000..311f254a1 --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/rules @@ -0,0 +1,29 @@ +#!/usr/bin/make -f + +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) + +DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ + && echo xz || echo bzip2) + +pre-build:: debian/stamp-distrospecific + +debian/stamp-distrospecific: + dh_testdir + [ -e debian/stamp-distrospecific ] || \ + ls -a1 debian/distrospecific | grep -v "^\.*$$" | \ + tee debian/stamp-distrospecific | \ + tr "\n" "\0" | (cd debian/distrospecific && xargs -r0 mv -t ../..) + +clean:: + dh_testdir + [ ! -e debian/stamp-distrospecific ] || \ + cat debian/stamp-distrospecific | \ + tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific + rm -f debian/stamp-distrospecific + +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 diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/maverick/metapackages/trinity-apt-archive/debian/source/options @@ -0,0 +1,6 @@ +# Use xz instead of gzip +compression = "xz" +compression-level = 9 + +# Don't run differences +diff-ignore = .* diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/install b/ubuntu/maverick/metapackages/trinity-keyring/debian/install index 03bc5d979..b3a5bac5c 100644 --- a/ubuntu/maverick/metapackages/trinity-keyring/debian/install +++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/install @@ -1,2 +1 @@ keyrings usr/share -repositories/trinity.list etc/apt/sources.list.d