From 9b24e6307fbd58c89bfc6734d2eaf2b120a4c067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 27 Nov 2019 18:45:05 +0100 Subject: [PATCH] DEB trinity-apt-archive + trinity-keyring: Update metapackages + Split apt sources package from keyring package. + Change repository url to http-redirector on the mirror. + Key is installed as file into /etc/apt/trusted.gpg.d instead of adding into apt keyring. + Add a second key for the trinity archive. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- debian/_base/metapackages/trinity-apt-archive | 1 + debian/lenny/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 | 6 ++ .../trinity-apt-archive/debian/install | 1 + .../trinity-apt-archive/debian/postinst | 24 +++++ .../trinity-apt-archive/debian/prerm | 24 +++++ .../trinity-apt-archive/debian/rules | 29 ++++++ .../trinity-apt-archive/debian/source/format | 1 + .../trinity-apt-archive/debian/source/options | 6 ++ .../metapackages/trinity-keyring/changelog | 5 -- .../trinity-keyring/debian/control | 1 + .../keyrings/trinity-archive-keyring.gpg | 75 ++++++++++++++++ .../keyrings/trinity-keyring-removed.gpg} | 0 .../keyrings/trinity-keyring.gpg | 29 ++++++ .../debian/distrospecific/md5sums.txt | 22 +++++ .../debian/distrospecific/sha512sums.txt | 22 +++++ .../trinity-keyring/debian/install | 1 + .../trinity-keyring/debian/postinst | 5 -- .../trinity-keyring/debian/preinst | 29 ++++++ .../metapackages/trinity-keyring/debian/prerm | 9 -- .../metapackages/trinity-keyring/debian/rules | 88 +++++++------------ .../trinity-keyring/debian/source/format | 1 + .../trinity-keyring/debian/source/options | 6 ++ .../metapackages/trinity-keyring/md5sums.txt | 11 --- .../trinity-keyring/repositories/trinity.list | 6 -- 29 files changed, 348 insertions(+), 93 deletions(-) create mode 120000 debian/_base/metapackages/trinity-apt-archive create mode 120000 debian/lenny/metapackages/trinity-apt-archive create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/changelog create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/compat create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/control create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/copyright create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/install create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/postinst create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/prerm create mode 100755 ubuntu/_base/metapackages/trinity-apt-archive/debian/rules create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/source/format create mode 100644 ubuntu/_base/metapackages/trinity-apt-archive/debian/source/options delete mode 100644 ubuntu/_base/metapackages/trinity-keyring/changelog create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-archive-keyring.gpg rename ubuntu/_base/metapackages/trinity-keyring/{keyrings/trinity-keyring.gpg => debian/distrospecific/keyrings/trinity-keyring-removed.gpg} (100%) create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/sha512sums.txt create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/install delete mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/postinst create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/preinst delete mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/prerm create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/source/format create mode 100644 ubuntu/_base/metapackages/trinity-keyring/debian/source/options delete mode 100644 ubuntu/_base/metapackages/trinity-keyring/md5sums.txt delete mode 100644 ubuntu/_base/metapackages/trinity-keyring/repositories/trinity.list diff --git a/debian/_base/metapackages/trinity-apt-archive b/debian/_base/metapackages/trinity-apt-archive new file mode 120000 index 000000000..8f9c0d413 --- /dev/null +++ b/debian/_base/metapackages/trinity-apt-archive @@ -0,0 +1 @@ +../../../ubuntu/_base/metapackages/trinity-apt-archive \ No newline at end of file diff --git a/debian/lenny/metapackages/trinity-apt-archive b/debian/lenny/metapackages/trinity-apt-archive new file mode 120000 index 000000000..8f9c0d413 --- /dev/null +++ b/debian/lenny/metapackages/trinity-apt-archive @@ -0,0 +1 @@ +../../../ubuntu/_base/metapackages/trinity-apt-archive \ No newline at end of file diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/changelog b/ubuntu/_base/metapackages/trinity-apt-archive/debian/changelog new file mode 100644 index 000000000..73f3f2324 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/changelog @@ -0,0 +1,6 @@ +trinity-apt-archive (2011.11.01-1) maverick; urgency=low + + * NIGHTLY BUILDS + + -- Timothy Pearson Fri, 28 Oct 2011 11:39:00 -0600 + diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/compat b/ubuntu/_base/metapackages/trinity-apt-archive/debian/compat new file mode 100644 index 000000000..7f8f011eb --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/compat @@ -0,0 +1 @@ +7 diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/control b/ubuntu/_base/metapackages/trinity-apt-archive/debian/control new file mode 100644 index 000000000..dab80544f --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/control @@ -0,0 +1,15 @@ +Source: trinity-apt-archive +Section: misc +Priority: optional +Maintainer: Timothy Pearson +Build-Depends: debhelper (>= 7.0.50~), cdbs +Standards-Version: 3.8.4 + +Package: trinity-apt-archive +Priority: optional +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/_base/metapackages/trinity-apt-archive/debian/copyright b/ubuntu/_base/metapackages/trinity-apt-archive/debian/copyright new file mode 100644 index 000000000..81235ac6d --- /dev/null +++ b/ubuntu/_base/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/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list b/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list new file mode 100644 index 000000000..eb9ddef21 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list @@ -0,0 +1,6 @@ +# Trinity repositories + +deb http://mirror.ppa.trinitydesktop.org/trinity/trinity-builddeps-v3.5.13/ubuntu maverick main +deb-src http://mirror.ppa.trinitydesktop.org/trinity/trinity-builddeps-v3.5.13/ubuntu maverick main +deb http://mirror.ppa.trinitydesktop.org/trinity/trinity-v3.5.13/ubuntu maverick main +deb-src http://mirror.ppa.trinitydesktop.org/trinity/trinity-v3.5.13/ubuntu maverick main diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/install b/ubuntu/_base/metapackages/trinity-apt-archive/debian/install new file mode 100644 index 000000000..1246138c5 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/install @@ -0,0 +1 @@ +repositories/trinity.list etc/apt/sources.list.d diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/postinst b/ubuntu/_base/metapackages/trinity-apt-archive/debian/postinst new file mode 100644 index 000000000..0319ce224 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/postinst @@ -0,0 +1,24 @@ +#!/bin/sh +# postinst script for trinity-apt-archive + +set -e + +case "$1" in + configure) + ;; + + 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/_base/metapackages/trinity-apt-archive/debian/prerm b/ubuntu/_base/metapackages/trinity-apt-archive/debian/prerm new file mode 100644 index 000000000..763b8cf65 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/prerm @@ -0,0 +1,24 @@ +#!/bin/sh +# prerm script for trinity-apt-archive + +set -e + +case "$1" in + remove) + ;; + + 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/_base/metapackages/trinity-apt-archive/debian/rules b/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules new file mode 100755 index 000000000..311f254a1 --- /dev/null +++ b/ubuntu/_base/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/_base/metapackages/trinity-apt-archive/debian/source/format b/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/options b/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/_base/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/_base/metapackages/trinity-keyring/changelog b/ubuntu/_base/metapackages/trinity-keyring/changelog deleted file mode 100644 index eca44f384..000000000 --- a/ubuntu/_base/metapackages/trinity-keyring/changelog +++ /dev/null @@ -1,5 +0,0 @@ -debian-archive-keyring (2006.01.10) unstable; urgency=low - - * Initial release - - -- Michael Vogt Tue, 10 Jan 2006 09:17:43 +0100 diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/control b/ubuntu/_base/metapackages/trinity-keyring/debian/control index c61c58fba..c528a7149 100644 --- a/ubuntu/_base/metapackages/trinity-keyring/debian/control +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/control @@ -2,6 +2,7 @@ Source: trinity-keyring Section: misc Priority: optional Maintainer: Timothy Pearson +Build-Depends: debhelper (>= 7.0.50~), cdbs, gnupg Standards-Version: 3.8.4 Package: trinity-keyring diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-archive-keyring.gpg b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-archive-keyring.gpg new file mode 100644 index 000000000..228bbb7a9 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-archive-keyring.gpg @@ -0,0 +1,75 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.12 (GNU/Linux) + +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 +5AoiHUlDz3QLNfE04n6LGyft +=UPdj +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ubuntu/_base/metapackages/trinity-keyring/keyrings/trinity-keyring.gpg b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg similarity index 100% rename from ubuntu/_base/metapackages/trinity-keyring/keyrings/trinity-keyring.gpg rename to ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg new file mode 100644 index 000000000..8147d55e5 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg @@ -0,0 +1,29 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.11 (GNU/Linux) + +mQINBFOUyaYBEAC3rFd2SKHlXUE+LmdL6yAuS+tD8c3JHVrHeN2UF4qrk4gLpr83 +wxZShHQujOwB33hoSjNTE4y86d84wi49WduyTLIvUJi6pXQLNz0pgqcmiJX2V+x5 +5KNY+coqpnbi2d10eynD7RtkVf/8U5O7ehqIAbr7GIyqao+o8543Y3XBtnxW3OJJ +So5XKbvCmRy2ZfSHV+uE3pfB02CymV+ap6EfRf/b5IOzn1mCpboTaseeS7RVEp6p +yIbfUU/jDg9frl6nUmb1ZwieD6rI5zbYYbJWu/9P9T/4H2b7nNDTNQIlKljpsRBF +ZHmcw2VSMteVqx4lLNI1KqdQzxqgXiB6hnYjy0X6SDTQgPGZGkBAwZj07DjSxUD9 +dFYBbxpI14jTW1SdoWsEdLge4iIjQrWEv314OVMLamftUFI6/BbF20X4SnIxbzwO +4oHR1uFWDHzIeRiKUoe7fiPXThwgBYvqViukHIKqVKt9oZyzJrknKCfIAko7vYP8 +Ws5kp8QKpubn+H0Jrknz5ZkuaagBHVzcUw7Vw4VpH+fNrFPvCXSekkQ4/tT6QxW4 +MKtLVI3T+p4ZqtfVbAvVS0AWE3XkDxq3emv97pkIY/x1sF9ca2ZHxiuIEj/k2tc3 +ggnyAjQrdizBdghQs3hMrR1wFTz7G7IeAJl1P/04VwbzEdSb6q5EcxJyDQARAQAB +tCZRdWlja0J1aWxkIFRyaW5pdHkgRGVza3RvcCBFbnZpcm9ubWVudIkCOAQTAQIA +IgUCU5TJpgIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQlslRUvXPyVzH ++g/8CqKKtXen4ReULjfF4C3hW1VUMDOfstsfdbxarY80ejLMBlm0+NUS1YEUpJJl +W2wHwxu20nvO5KKNsFXXy6ayZEhBPdWTSPbNEJFpMFW3QnxLHvxoMQvsmlOQLTSZ +Qj7QOBZtFE4waF+3pyC7FlxwsnlSmOHO+3YyBBbXuCE+43o3RU6TWeI4ZdWTeQpF +98YhH2EUzuGIqxxUlLSxc8Wr51T73G6Alua3PBeuLthpRkF7LkRW/3mvpNe9qVb2 +yCu7V5LHK893+y+S0mrSQXOMi9MQfbiEqbMeSNz8Z/PCvLSBDSqj075mFNX3vfaU +nZV9aWQRrRnXnLYOMDXtopK5tNMZzRyMkzrnqDNA+xwkpf/HZm5uT+nq3oUcq7HV +fYgamMk1p3tJ2jCNboSudVGbffHcMHNlcW8OTmpoD/wKECl8gKizpKE+tAor3Uaa +fORFQ5ZBnUyFxZTBcwZ88f/K6sFy/EfTK9CCTIrDjSGO295sTzifwC9CliLvNpcS +Ud1o1qgVpvYumYRzyJa4sLI17rKmpXcnM2KHuz2KEht9g1pUM/ew53XJ8s2UitI8 +lzFfpyf6slXSoQ4Y6GFT5N5E6YqpRO+3eX6j7PhUI5r17IXWwVGfpanfsWRaWkGB +p6emszaT7EUhA0tns2XYGusASN+CBJteTeq3u3+f3N8u7Rc= +=JneN +-----END PGP PUBLIC KEY BLOCK----- diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt new file mode 100644 index 000000000..910f1a562 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +7d31c6d96998f2cf978c8b641a72c1d8 keyrings/trinity-keyring.gpg +be87deb46e4e576e63e8ca2603b99bb1 keyrings/trinity-archive-keyring.gpg +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iQIcBAEBCgAGBQJcu1TdAAoJEGCPUpOgS+ZoYWsP/2oVdV6IItB93c8c4rkb7nxy +Nse1jA8LebXUsdVG2YqUWABoUjIkJ61Trr3IDUnhoWQQscgQOBx/liNkKqPvkLHt +0EKpwDA305kTlzfS8c3NnOkYTs6oX0RQkdYMeNdCcuGeUJcia0DlUlWnghARaMO8 +fk+ph0dsq+G+uhXGhJPj5+mPzYCOhn6372OlG1s0dfG9F4Bgc8eDgrk9GBbsnafj +sV7NOj4l4S0+DLRbmmVuTAoFLg7QNShwWw/sNX384MOZgZhk3idDYAqz+42sYYmN +AXqbh7fjGTLEm+kjahekeEMRbvydvSTFgKvAAodxKAjZmhr4tNmaC+Ejq1+02Bev +Kjd0r+t4z3dTqrnlQR8HM0kw8u5/+Yh71x+TW47PlaCtO5E3JLsQmp5wk3jGQuaZ +cwiO/MAeqyXOINLZL4tgNdtG1Af91MGm7bK9mojCg+efBL9l/VoV6SZrAD0Rmr0y +Ja4nOExAmRgGF60kil37E6FhK0P4ZYQoIRDVrO1Vu4GhXwUiOzqok6SJyXurH43p +Yc1Jp2bgF5+u4jBRB8IWWpVzgHV+u68HMRa5GrHmr8yFPb7Q5BmRie0lSGkBvUXB +33wObwSFAwo5twkY3HezLBg7UOY4ZYlg7UETOeDETg5buLEY1CD1XoiB9hLNDwvs +jg00u1gDSJDIWIM/MYEw +=l1P0 +-----END PGP SIGNATURE----- diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/sha512sums.txt b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/sha512sums.txt new file mode 100644 index 000000000..5a82cecde --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/distrospecific/sha512sums.txt @@ -0,0 +1,22 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +b9fe7db453460e42b62f7e06ce87f24d63ae092bbf7858a50f40851b59c37dc5884c93b4faef0d81f7dfc0b77f6195b71890f2bc5e5157657d596c0f818c9c23 keyrings/trinity-keyring.gpg +2873f610356103f471ae1eb0e86ded1f7d5f5a331cba0b37403f85658228422d2566e0706a2e960154ded704d8db68e80604999af12567b90391e9df6f9d12b9 keyrings/trinity-archive-keyring.gpg +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.12 (GNU/Linux) + +iQIcBAEBCgAGBQJcu1VWAAoJEGCPUpOgS+ZoceEQAJfUdhFZ/QRlg3jHpxluTR/A +NZKMkchOnXl5WAT/sswrNCf3gdKA4ViTnJyLToNjs/LxqemJcxaRCaTb1opJgzVg +IedkZqIyMjocG3dwGK5GNTjQSPNRfsbU+NNx1bXkqTYR2tfpobaaaZm2TEAncm6k +KNWv6enm+eUfQFMpkNgqDyX//esV7O6b4vZKADkntOvYs8PJk2CHnLDx4pOQc+4U +hFaFXQhWeweHyCvPeINBCkbd1eWeJ6nYzSHZ4Eawh8q8dpSiYlbOCyYrAsQtjgx8 +YKySHDGV7qkngtuu9UFqLn3i1W/W+tB3UG2/VZxZhgjuTzKRf5Pb0yV/yHjSUMEI +2DT+/mg/JfzuBNCE6CyE3GNL+f8qZnriK9X8Jv1j+kc1184CfUFt3u3g8b6ygvW6 +/lek64DW7rZ7yZwmWC1KYUTWPWlcChd3rVqUtTg5nciJ5S5NhFeEUTpgpG/5BR+H +YeOUbfviIxF7cbGsYl8ZUXdvTnEiyssj6dJrL8bjoND0R+wXDGS5s24t7a9K4Svc +xh9oI6Vhbu4H37X0KgRtEfN0v7BnGC/5S5PLlJNjlT8d8A5igv1BbVI3AzbYBP6B +Y/ztq7giCwVRz3oYB4IWCyo1gvwItssA+UeD23HvG0wU0PgzZCvKpXK21AvdyJNl +jC9qFHi/FO58UWXmLZC6 +=q/J5 +-----END PGP SIGNATURE----- diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/install b/ubuntu/_base/metapackages/trinity-keyring/debian/install new file mode 100644 index 000000000..b3a5bac5c --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/install @@ -0,0 +1 @@ +keyrings usr/share diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/postinst b/ubuntu/_base/metapackages/trinity-keyring/debian/postinst deleted file mode 100644 index fa0073eba..000000000 --- a/ubuntu/_base/metapackages/trinity-keyring/debian/postinst +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -if [ -x /usr/bin/apt-key ]; then - /usr/bin/apt-key add /usr/share/keyrings/trinity-keyring.gpg -fi diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/preinst b/ubuntu/_base/metapackages/trinity-keyring/debian/preinst new file mode 100644 index 000000000..53c7d0cbc --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/preinst @@ -0,0 +1,29 @@ +#! /bin/sh +# preinst script for trinity-keyring + +set -e + +case "$1" in + install|upgrade) + if [ ! -f /etc/apt/trusted.gpg.d/trinity-keyring.gpg ] && + [ -f /etc/apt/trusted.gpg ]; then + # Remove key F5CFC95C (2014.06.08) from apt keyring + apt-key --keyring /etc/apt/trusted.gpg del F5CFC95C 2> /dev/null || true + + # Remove key 2B8638D0 (2010.06.15) from apt keyring + apt-key --keyring /etc/apt/trusted.gpg del 2B8638D0 2> /dev/null || true + fi + ;; + + abort-upgrade) + ;; + + *) + echo "preinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/prerm b/ubuntu/_base/metapackages/trinity-keyring/debian/prerm deleted file mode 100644 index 4af539bb3..000000000 --- a/ubuntu/_base/metapackages/trinity-keyring/debian/prerm +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -case "$1" in - remove|purge) - if [ -x /usr/bin/apt-key ]; then - /usr/bin/apt-key del 2B8638D0 - fi - ;; -esac diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/rules b/ubuntu/_base/metapackages/trinity-keyring/debian/rules index 8695ad9dc..45de64142 100755 --- a/ubuntu/_base/metapackages/trinity-keyring/debian/rules +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/rules @@ -1,63 +1,37 @@ #!/usr/bin/make -f -# debian/rules file - for debian/keyring -# Based on sample debian/rules file - for GNU Hello (1.3). -# Copyright 1994,1995 by Ian Jackson. -# Copyright 1998-2003 James Troup -# I hereby give you perpetual unlimited permission to copy, -# modify and relicense this file, provided that you do not remove -# my name from the file itself. (I assert my moral right of -# paternity under the Copyright, Designs and Patents Act 1988.) -# This file may have to be extensively modified -install_dir=install -d -m 755 -install_file=install -m 644 -install_script=install -m 755 -install_binary=install -m 755 -s +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) -build: - -clean: - $(checkdir) - -rm -f foo foo.asc *.bak *~ */*~ debian/files* debian/*substvars - -rm -rf debian/tmp - -binary-indep: checkroot - $(checkdir) - -rm -rf debian/tmp - $(install_dir) debian/tmp/DEBIAN/ - $(install_script) debian/postinst debian/tmp/DEBIAN/ - $(install_script) debian/prerm debian/tmp/DEBIAN/ - - $(install_dir) debian/tmp/usr/share/keyrings/ - $(install_file) keyrings/trinity-keyring.gpg debian/tmp/usr/share/keyrings/ - $(install_dir) debian/tmp/etc/apt/sources.list.d/ - $(install_file) repositories/trinity.list debian/tmp/etc/apt/sources.list.d/ - sed -i 's|ubuntu [^ ]* main|ubuntu ${DISTRIBUTION} main|g' debian/tmp/etc/apt/sources.list.d/trinity.list - - $(install_dir) debian/tmp/usr/share/doc/trinity-keyring/ - $(install_file) debian/changelog debian/tmp/usr/share/doc/trinity-keyring/changelog - $(install_file) debian/copyright debian/tmp/usr/share/doc/trinity-keyring/ - - dpkg-gencontrol -ptrinity-keyring -isp - chown -R root.root debian/tmp - chmod -R go=rX debian/tmp - dpkg --build debian/tmp .. - -binary-arch: - -define checkdir - test -f keyrings/trinity-keyring.gpg -endef - -# Below here is fairly generic really - -binary: binary-indep binary-arch - -checkroot: - $(checkdir) - test root = "`whoami`" - -.PHONY: binary binary-arch binary-indep clean checkroot +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-keyring:: + dh_testdir + mkdir -p debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d + gpg --output debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-keyring.gpg \ + --dearmor keyrings/trinity-keyring.gpg + touch -r keyrings/trinity-keyring.gpg \ + debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-keyring.gpg + gpg --output debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-archive-keyring.gpg \ + --dearmor keyrings/trinity-archive-keyring.gpg + touch -r keyrings/trinity-archive-keyring.gpg \ + debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/trinity-archive-keyring.gpg diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/source/format b/ubuntu/_base/metapackages/trinity-keyring/debian/source/format new file mode 100644 index 000000000..163aaf8d8 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/ubuntu/_base/metapackages/trinity-keyring/debian/source/options b/ubuntu/_base/metapackages/trinity-keyring/debian/source/options new file mode 100644 index 000000000..72f1f5450 --- /dev/null +++ b/ubuntu/_base/metapackages/trinity-keyring/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/_base/metapackages/trinity-keyring/md5sums.txt b/ubuntu/_base/metapackages/trinity-keyring/md5sums.txt deleted file mode 100644 index f65dfc593..000000000 --- a/ubuntu/_base/metapackages/trinity-keyring/md5sums.txt +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -c92d44bfab485525f3078b6bcdafa0aa keyrings/kde3-maintainers-keyring.gpg ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.9 (GNU/Linux) - -iEYEARECAAYFAknxzxAACgkQ1qe3DOI85pKjkgCeLm9YEGnuXOvhzuCQF2UDLLAn -pC0AoMNmSPQt2+W0jStHxn7lnHHnoqHd -=068G ------END PGP SIGNATURE----- diff --git a/ubuntu/_base/metapackages/trinity-keyring/repositories/trinity.list b/ubuntu/_base/metapackages/trinity-keyring/repositories/trinity.list deleted file mode 100644 index 25c3e39da..000000000 --- a/ubuntu/_base/metapackages/trinity-keyring/repositories/trinity.list +++ /dev/null @@ -1,6 +0,0 @@ -# Trinity repositories - -deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-v3.5.13/ubuntu maverick main -deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-v3.5.13/ubuntu maverick main -deb http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-builddeps-v3.5.13/ubuntu maverick main -deb-src http://ppa.quickbuild.pearsoncomputing.net/trinity/trinity-builddeps-v3.5.13/ubuntu maverick main