DEB: updated after metapackages have been consolidated in one folder in main repo.

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

12 files changed, 1 insertions, 127 deletions

diff --git a/ubuntu/_base/metapackages/trinity-apt-archive b/ubuntu/_base/metapackages/trinity-apt-archive
new file mode 120000
index 000000000..c614eb54c
--- /dev/null
+++ b/ubuntu/_base/metapackages/trinity-apt-archive
@@ -0,0 +1 @@
+./../../../debian/_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
deleted file mode 100644
index 73f3f2324..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-trinity-apt-archive (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/_base/metapackages/trinity-apt-archive/debian/compat b/ubuntu/_base/metapackages/trinity-apt-archive/debian/compat
deleted file mode 100644
index ec635144f..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/control b/ubuntu/_base/metapackages/trinity-apt-archive/debian/control
deleted file mode 100644
index fef7f3508..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/control
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: trinity-apt-archive
-Section: misc
-Priority: optional
-Maintainer: Timothy Pearson <kb9vqf@pearsoncomputing.net>
-Build-Depends: debhelper (>= 9~), 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
deleted file mode 100644
index 81235ac6d..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/copyright
+++ /dev/null
@@ -1,16 +0,0 @@
-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
deleted file mode 100644
index 9c02dd904..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/distrospecific/repositories/trinity.list
+++ /dev/null
@@ -1,4 +0,0 @@
-# Trinity repositories
-
-deb http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps
-deb-src http://mirror.ppa.trinitydesktop.org/trinity/deb/trinity-testing <distribution> main deps
diff --git a/ubuntu/_base/metapackages/trinity-apt-archive/debian/install b/ubuntu/_base/metapackages/trinity-apt-archive/debian/install
deleted file mode 100644
index 1246138c5..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/install
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 0319ce224..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/postinst
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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
deleted file mode 100644
index 763b8cf65..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/prerm
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/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
deleted file mode 100755
index fd65c8cd8..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/rules
+++ /dev/null
@@ -1,29 +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-apt-archive::
-	dh_testdir
-	sed -i 's|^\(deb[^ ]* [^ ]*\) [^ ]* main|\1 ${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
deleted file mode 100644
index 163aaf8d8..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 72f1f5450..000000000
--- a/ubuntu/_base/metapackages/trinity-apt-archive/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 = .*