DEB: use _base folder for a distro instead of specific distros (squeeze and maverick).

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

12 files changed, 0 insertions, 171 deletions

diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/changelog b/ubuntu/maverick/metapackages/trinity-keyring/debian/changelog
deleted file mode 100644
index 4073eea7f..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-trinity-keyring (2011.11.01-1) maverick; urgency=low
-
-  * NIGHTLY BUILDS
-
- -- Timothy Pearson <kb9vqf@pearsoncomputing.net>  Fri, 28 Oct 2011 11:39:00 -0600
-
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/compat b/ubuntu/maverick/metapackages/trinity-keyring/debian/compat
deleted file mode 100644
index 7f8f011eb..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-7
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/control b/ubuntu/maverick/metapackages/trinity-keyring/debian/control
deleted file mode 100644
index 8cb0d0aac..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/control
+++ /dev/null
@@ -1,14 +0,0 @@
-Source: trinity-keyring
-Section: misc
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 7.0.50~), cdbs
-Standards-Version: 3.8.4
-
-Package: trinity-keyring
-Priority: important
-Architecture: all
-Depends: gnupg (>= 1.0.6-4)
-Description: GnuPG key of the Trinity Desktop Environment repository
- The Trinity repository digitally signs its Release files. This package
- contains the repository key used for that.
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/copyright b/ubuntu/maverick/metapackages/trinity-keyring/debian/copyright
deleted file mode 100644
index d934ced33..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/copyright
+++ /dev/null
@@ -1,27 +0,0 @@
-This is Debian GNU's GnuPG keyrings of archive keys.
-
-This package was originally put together by Michael Vogt
-<mvo@debian.org> 
-
-The keys in the keyrings don't fall under any copyright.  Everything
-else in the package is covered by the GNU GPL.
-
-Debian support files Copyright (C) 2006 Michael Vogt <mvo@debian.org> 
-based on the debian-keyring package maintained by James Troup 
-
-Debian support files for debian-archive-keyring 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 debian-archive-keyring 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 debian-archive-keyring 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/keyrings/trinity-keyring-removed.gpg b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg
deleted file mode 100644
index d703b13cc..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring-removed.gpg
+++ /dev/null
@@ -1,13 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-mI0ETBb5vwEEANKouZGon6I/wxSh8LO49a/JRCsEI/wiXMBDw/eOa+AF6onugRs3
-9XYo0fPuSu5OzJW+Mjt7FD+IYBwrqWH8kqshXHEpiPfVh1uEa0lSDmDoEx6BEude
-CVvt/tc2x4YDzwxdChQ5X/Bwhq/kfTXCUXuNLmT1rifJiujeuISd+06VABEBAAG0
-JlF1aWNrQnVpbGQgVHJpbml0eSBEZXNrdG9wIEVudmlyb25tZW50iLgEEwECACIF
-AkwW+b8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEEPx3E8rhjjQu30E
-AJpz2+fjYXvpQOGIN3w2BoKBF0jVROS+xPs1dZMzHhvdwQR6/2KI8RVZ7M+VnnJi
-Y0VaYf6jYd08S4SsX5LuDuiCxxkMkno7RRdEOdsnxfiqGnv2EjvQEM3trflQzIBi
-9wc+mh9XeI7OZNke/KryAqRTLMdYlTIlv2XNAy/bXFS4
-=qpbT
------END PGP PUBLIC KEY BLOCK-----
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg
deleted file mode 100644
index 8147d55e5..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg
+++ /dev/null
@@ -1,29 +0,0 @@
------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/maverick/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
deleted file mode 100644
index 4498a51e8..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-7d31c6d96998f2cf978c8b641a72c1d8  keyrings/trinity-keyring.gpg
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iFYEAREKAAYFAlOU3l0ACgkQLaxZSoRZrGEK8gDfb8NcvOCmRG1vlISV5Wnqdehb
-+ZL9t4tbCl9vwQDgv8OYHWXQHigPDgR5N6n/9Eymy8aurntPF90BYQ==
-=kKmH
------END PGP SIGNATURE-----
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/install b/ubuntu/maverick/metapackages/trinity-keyring/debian/install
deleted file mode 100644
index b3a5bac5c..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-keyrings			usr/share
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst b/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst
deleted file mode 100644
index 53c7d0cbc..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/preinst
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /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/maverick/metapackages/trinity-keyring/debian/rules b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
deleted file mode 100755
index e2df3ba49..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/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-keyring::
-	dh_testdir
-	mkdir -p debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d
-	gpg --output debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/$(cdbs_curpkg).gpg \
-	    --dearmor keyrings/$(cdbs_curpkg).gpg
-	touch -r keyrings/$(cdbs_curpkg).gpg \
-	    debian/$(cdbs_curpkg)/etc/apt/trusted.gpg.d/$(cdbs_curpkg).gpg
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/format b/ubuntu/maverick/metapackages/trinity-keyring/debian/source/format
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/options b/ubuntu/maverick/metapackages/trinity-keyring/debian/source/options
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/source/options
+++ /dev/null
@@ -1,6 +0,0 @@
-# Use xz instead of gzip
-compression = "xz"
-compression-level = 9
-
-# Don't run differences
-diff-ignore = .*