Update remaining metapackages on Debian and Ubuntu

to conform the current automated scripts on build-farm

70 files changed, 278 insertions, 128 deletions

diff --git a/debian/lenny/metapackages/rename-meta/Makefile b/debian/lenny/metapackages/rename-meta/Makefile
deleted file mode 100644
index a36e6a1c9..000000000
--- a/debian/lenny/metapackages/rename-meta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-FPACKAGE = ubuntu-trinity-rename-meta
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
diff --git a/debian/lenny/metapackages/rename-meta/debian/rules b/debian/lenny/metapackages/rename-meta/debian/rules
index a9e7e66cb..bcf749744 100755
--- a/debian/lenny/metapackages/rename-meta/debian/rules
+++ b/debian/lenny/metapackages/rename-meta/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_BUILD_OPTIONS := nostrip
diff --git a/debian/lenny/metapackages/sudo-trinity/debian/changelog b/debian/lenny/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100755..100644
--- a/debian/lenny/metapackages/sudo-trinity/debian/changelog
+++ b/debian/lenny/metapackages/sudo-trinity/debian/changelog
diff --git a/debian/lenny/metapackages/sudo-trinity/debian/compat b/debian/lenny/metapackages/sudo-trinity/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/lenny/metapackages/sudo-trinity/debian/compat
+++ b/debian/lenny/metapackages/sudo-trinity/debian/compat
diff --git a/debian/lenny/metapackages/sudo-trinity/debian/dirs b/debian/lenny/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100755..100644
--- a/debian/lenny/metapackages/sudo-trinity/debian/dirs
+++ b/debian/lenny/metapackages/sudo-trinity/debian/dirs
diff --git a/debian/wheezy/metapackages/sudo-trinity/Makefile b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/Makefile
index bc4653675..f106ff05e 100755..100644
--- a/debian/wheezy/metapackages/sudo-trinity/Makefile
+++ b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/Makefile
@@ -1,12 +1,12 @@
-FPACKAGE = sudo-trinity

-VERSION = 1.0

-

-build:

-

-clean:

-

-install:

-	mkdir -p /etc

-	cp -Rp etc/*  $(DESTDIR)/etc/

-	chmod -R 644 $(DESTDIR)/etc

-	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
\ No newline at end of file
+FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+	mkdir -p /etc
+	cp -Rp etc/*  $(DESTDIR)/etc/
+	chmod -R 644 $(DESTDIR)/etc
+	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
diff --git a/debian/lenny/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/debian/lenny/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/debian/lenny/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/debian/lenny/metapackages/sudo-trinity/debian/rules b/debian/lenny/metapackages/sudo-trinity/debian/rules
index f8c89d5db..e5e2870b7 100755
--- a/debian/lenny/metapackages/sudo-trinity/debian/rules
+++ b/debian/lenny/metapackages/sudo-trinity/debian/rules
@@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL :=
 
 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
diff --git a/debian/squeeze/metapackages/rename-meta/Makefile b/debian/squeeze/metapackages/rename-meta/Makefile
deleted file mode 100644
index a36e6a1c9..000000000
--- a/debian/squeeze/metapackages/rename-meta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-FPACKAGE = ubuntu-trinity-rename-meta
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
diff --git a/debian/squeeze/metapackages/rename-meta/debian/rules b/debian/squeeze/metapackages/rename-meta/debian/rules
index a9e7e66cb..bcf749744 100755
--- a/debian/squeeze/metapackages/rename-meta/debian/rules
+++ b/debian/squeeze/metapackages/rename-meta/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_BUILD_OPTIONS := nostrip
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/changelog b/debian/squeeze/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100755..100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/changelog
+++ b/debian/squeeze/metapackages/sudo-trinity/debian/changelog
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/compat b/debian/squeeze/metapackages/sudo-trinity/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/compat
+++ b/debian/squeeze/metapackages/sudo-trinity/debian/compat
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/dirs b/debian/squeeze/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100755..100644
--- a/debian/squeeze/metapackages/sudo-trinity/debian/dirs
+++ b/debian/squeeze/metapackages/sudo-trinity/debian/dirs
diff --git a/debian/lenny/metapackages/sudo-trinity/Makefile b/debian/squeeze/metapackages/sudo-trinity/debian/distrospecific/Makefile
index bc4653675..f106ff05e 100755..100644
--- a/debian/lenny/metapackages/sudo-trinity/Makefile
+++ b/debian/squeeze/metapackages/sudo-trinity/debian/distrospecific/Makefile
@@ -1,12 +1,12 @@
-FPACKAGE = sudo-trinity

-VERSION = 1.0

-

-build:

-

-clean:

-

-install:

-	mkdir -p /etc

-	cp -Rp etc/*  $(DESTDIR)/etc/

-	chmod -R 644 $(DESTDIR)/etc

-	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
\ No newline at end of file
+FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+	mkdir -p /etc
+	cp -Rp etc/*  $(DESTDIR)/etc/
+	chmod -R 644 $(DESTDIR)/etc
+	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
diff --git a/debian/squeeze/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/debian/squeeze/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/debian/squeeze/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/debian/squeeze/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/debian/squeeze/metapackages/sudo-trinity/debian/rules b/debian/squeeze/metapackages/sudo-trinity/debian/rules
index f8c89d5db..e5e2870b7 100755
--- a/debian/squeeze/metapackages/sudo-trinity/debian/rules
+++ b/debian/squeeze/metapackages/sudo-trinity/debian/rules
@@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL :=
 
 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
diff --git a/debian/wheezy/metapackages/rename-meta/Makefile b/debian/wheezy/metapackages/rename-meta/Makefile
deleted file mode 100644
index a36e6a1c9..000000000
--- a/debian/wheezy/metapackages/rename-meta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-FPACKAGE = ubuntu-trinity-rename-meta
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
diff --git a/debian/wheezy/metapackages/rename-meta/debian/rules b/debian/wheezy/metapackages/rename-meta/debian/rules
index a9e7e66cb..bcf749744 100755
--- a/debian/wheezy/metapackages/rename-meta/debian/rules
+++ b/debian/wheezy/metapackages/rename-meta/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_BUILD_OPTIONS := nostrip
diff --git a/debian/wheezy/metapackages/sudo-trinity/debian/changelog b/debian/wheezy/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100755..100644
--- a/debian/wheezy/metapackages/sudo-trinity/debian/changelog
+++ b/debian/wheezy/metapackages/sudo-trinity/debian/changelog
diff --git a/debian/wheezy/metapackages/sudo-trinity/debian/compat b/debian/wheezy/metapackages/sudo-trinity/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/debian/wheezy/metapackages/sudo-trinity/debian/compat
+++ b/debian/wheezy/metapackages/sudo-trinity/debian/compat
diff --git a/debian/wheezy/metapackages/sudo-trinity/debian/dirs b/debian/wheezy/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100755..100644
--- a/debian/wheezy/metapackages/sudo-trinity/debian/dirs
+++ b/debian/wheezy/metapackages/sudo-trinity/debian/dirs
diff --git a/debian/squeeze/metapackages/sudo-trinity/Makefile b/debian/wheezy/metapackages/sudo-trinity/debian/distrospecific/Makefile
index bc4653675..f106ff05e 100755..100644
--- a/debian/squeeze/metapackages/sudo-trinity/Makefile
+++ b/debian/wheezy/metapackages/sudo-trinity/debian/distrospecific/Makefile
@@ -1,12 +1,12 @@
-FPACKAGE = sudo-trinity

-VERSION = 1.0

-

-build:

-

-clean:

-

-install:

-	mkdir -p /etc

-	cp -Rp etc/*  $(DESTDIR)/etc/

-	chmod -R 644 $(DESTDIR)/etc

-	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
\ No newline at end of file
+FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+	mkdir -p /etc
+	cp -Rp etc/*  $(DESTDIR)/etc/
+	chmod -R 644 $(DESTDIR)/etc
+	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
diff --git a/debian/wheezy/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/debian/wheezy/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/debian/wheezy/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/debian/wheezy/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/debian/wheezy/metapackages/sudo-trinity/debian/rules b/debian/wheezy/metapackages/sudo-trinity/debian/rules
index f8c89d5db..e5e2870b7 100755
--- a/debian/wheezy/metapackages/sudo-trinity/debian/rules
+++ b/debian/wheezy/metapackages/sudo-trinity/debian/rules
@@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL :=
 
 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
diff --git a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
index a018471b7..a018471b7 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
+++ b/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
diff --git a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity b/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
index bd764edcc..bd764edcc 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity
+++ b/ubuntu/maverick/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
diff --git a/ubuntu/maverick/metapackages/casper-trinity/debian/rules b/ubuntu/maverick/metapackages/casper-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/maverick/metapackages/casper-trinity/debian/rules
+++ b/ubuntu/maverick/metapackages/casper-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
+
+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
diff --git a/ubuntu/maverick/metapackages/rename-meta/Makefile b/ubuntu/maverick/metapackages/rename-meta/Makefile
deleted file mode 100644
index a36e6a1c9..000000000
--- a/ubuntu/maverick/metapackages/rename-meta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-FPACKAGE = ubuntu-trinity-rename-meta
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
diff --git a/ubuntu/maverick/metapackages/rename-meta/debian/rules b/ubuntu/maverick/metapackages/rename-meta/debian/rules
index a9e7e66cb..bcf749744 100755
--- a/ubuntu/maverick/metapackages/rename-meta/debian/rules
+++ b/ubuntu/maverick/metapackages/rename-meta/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_BUILD_OPTIONS := nostrip
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog b/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100755..100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog
+++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/changelog
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/compat b/ubuntu/maverick/metapackages/sudo-trinity/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/compat
+++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/compat
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs b/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100755..100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs
+++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/dirs
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/Makefile b/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/Makefile
index bc4653675..f106ff05e 100755..100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/Makefile
+++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/Makefile
@@ -1,12 +1,12 @@
-FPACKAGE = sudo-trinity

-VERSION = 1.0

-

-build:

-

-clean:

-

-install:

-	mkdir -p /etc

-	cp -Rp etc/*  $(DESTDIR)/etc/

-	chmod -R 644 $(DESTDIR)/etc

-	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
\ No newline at end of file
+FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+	mkdir -p /etc
+	cp -Rp etc/*  $(DESTDIR)/etc/
+	chmod -R 644 $(DESTDIR)/etc
+	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/ubuntu/maverick/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/maverick/metapackages/sudo-trinity/debian/rules b/ubuntu/maverick/metapackages/sudo-trinity/debian/rules
index f8c89d5db..e5e2870b7 100755
--- a/ubuntu/maverick/metapackages/sudo-trinity/debian/rules
+++ b/ubuntu/maverick/metapackages/sudo-trinity/debian/rules
@@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL :=
 
 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
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/changelog b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/changelog
index eca44f384..eca44f384 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/changelog
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/changelog
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/keyrings/trinity-keyring.gpg b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg
index d703b13cc..d703b13cc 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/keyrings/trinity-keyring.gpg
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/keyrings/trinity-keyring.gpg
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/md5sums.txt b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
index f65dfc593..f65dfc593 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/md5sums.txt
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/md5sums.txt
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/repositories/trinity.list b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/repositories/trinity.list
index cea2cf093..cea2cf093 100644
--- a/ubuntu/maverick/metapackages/trinity-keyring/repositories/trinity.list
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/distrospecific/repositories/trinity.list
diff --git a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
index 8695ad9dc..39064539d 100755
--- a/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
+++ b/ubuntu/maverick/metapackages/trinity-keyring/debian/rules
@@ -17,10 +17,22 @@ install_binary=install -m 755 -s
 VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2)
 DISTRIBUTION := $(shell dpkg-parsechangelog | grep ^Distribution: | cut -d' ' -f2)
 
-build:
+build: debian/stamp-distrospecific
+	$(checkdir)
+
+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:
-	$(checkdir)
+	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
 	-rm -f foo foo.asc *.bak *~ */*~ debian/files* debian/*substvars
 	-rm -rf debian/tmp
 
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/maverick/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
index e31165c02..e31165c02 100755
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
+++ b/ubuntu/maverick/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
diff --git a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/rules b/ubuntu/maverick/metapackages/ubiquity-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/maverick/metapackages/ubiquity-trinity/debian/rules
+++ b/ubuntu/maverick/metapackages/ubiquity-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
+
+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
diff --git a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
index a018471b7..a018471b7 100755
--- a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
+++ b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
diff --git a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
index bd764edcc..bd764edcc 100755
--- a/ubuntu/precise/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity
+++ b/ubuntu/precise/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
diff --git a/ubuntu/precise/metapackages/casper-trinity/debian/rules b/ubuntu/precise/metapackages/casper-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/precise/metapackages/casper-trinity/debian/rules
+++ b/ubuntu/precise/metapackages/casper-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
+
+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
diff --git a/ubuntu/precise/metapackages/rename-meta/Makefile b/ubuntu/precise/metapackages/rename-meta/Makefile
deleted file mode 100644
index a36e6a1c9..000000000
--- a/ubuntu/precise/metapackages/rename-meta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-FPACKAGE = ubuntu-trinity-rename-meta
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
diff --git a/ubuntu/precise/metapackages/rename-meta/debian/rules b/ubuntu/precise/metapackages/rename-meta/debian/rules
index a9e7e66cb..bcf749744 100755
--- a/ubuntu/precise/metapackages/rename-meta/debian/rules
+++ b/ubuntu/precise/metapackages/rename-meta/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_BUILD_OPTIONS := nostrip
diff --git a/ubuntu/precise/metapackages/sudo-trinity/Makefile b/ubuntu/precise/metapackages/sudo-trinity/Makefile
deleted file mode 100755
index bc4653675..000000000
--- a/ubuntu/precise/metapackages/sudo-trinity/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-FPACKAGE = sudo-trinity

-VERSION = 1.0

-

-build:

-

-clean:

-

-install:

-	mkdir -p /etc

-	cp -Rp etc/*  $(DESTDIR)/etc/

-	chmod -R 644 $(DESTDIR)/etc

-	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
\ No newline at end of file
diff --git a/ubuntu/precise/metapackages/sudo-trinity/debian/changelog b/ubuntu/precise/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100755..100644
--- a/ubuntu/precise/metapackages/sudo-trinity/debian/changelog
+++ b/ubuntu/precise/metapackages/sudo-trinity/debian/changelog
diff --git a/ubuntu/precise/metapackages/sudo-trinity/debian/compat b/ubuntu/precise/metapackages/sudo-trinity/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/precise/metapackages/sudo-trinity/debian/compat
+++ b/ubuntu/precise/metapackages/sudo-trinity/debian/compat
diff --git a/ubuntu/precise/metapackages/sudo-trinity/debian/dirs b/ubuntu/precise/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100755..100644
--- a/ubuntu/precise/metapackages/sudo-trinity/debian/dirs
+++ b/ubuntu/precise/metapackages/sudo-trinity/debian/dirs
diff --git a/ubuntu/precise/metapackages/sudo-trinity/debian/distrospecific/Makefile b/ubuntu/precise/metapackages/sudo-trinity/debian/distrospecific/Makefile
new file mode 100644
index 000000000..f106ff05e
--- /dev/null
+++ b/ubuntu/precise/metapackages/sudo-trinity/debian/distrospecific/Makefile
@@ -0,0 +1,12 @@
+FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+	mkdir -p /etc
+	cp -Rp etc/*  $(DESTDIR)/etc/
+	chmod -R 644 $(DESTDIR)/etc
+	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/precise/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/ubuntu/precise/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/ubuntu/precise/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/ubuntu/precise/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/precise/metapackages/sudo-trinity/debian/rules b/ubuntu/precise/metapackages/sudo-trinity/debian/rules
index f8c89d5db..e5e2870b7 100755
--- a/ubuntu/precise/metapackages/sudo-trinity/debian/rules
+++ b/ubuntu/precise/metapackages/sudo-trinity/debian/rules
@@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL :=
 
 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
diff --git a/ubuntu/precise/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/precise/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
index e31165c02..e31165c02 100755
--- a/ubuntu/precise/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
+++ b/ubuntu/precise/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
diff --git a/ubuntu/precise/metapackages/ubiquity-trinity/debian/rules b/ubuntu/precise/metapackages/ubiquity-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/precise/metapackages/ubiquity-trinity/debian/rules
+++ b/ubuntu/precise/metapackages/ubiquity-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
+
+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
diff --git a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
index a018471b7..a018471b7 100755
--- a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/15autologin-trinity
+++ b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/15autologin-trinity
diff --git a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
index bd764edcc..bd764edcc 100755
--- a/ubuntu/raring/metapackages/casper-trinity/scripts/casper-bottom/25adduser-trinity
+++ b/ubuntu/raring/metapackages/casper-trinity/debian/distrospecific/scripts/casper-bottom/25adduser-trinity
diff --git a/ubuntu/raring/metapackages/casper-trinity/debian/rules b/ubuntu/raring/metapackages/casper-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/raring/metapackages/casper-trinity/debian/rules
+++ b/ubuntu/raring/metapackages/casper-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
+
+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
diff --git a/ubuntu/raring/metapackages/rename-meta/Makefile b/ubuntu/raring/metapackages/rename-meta/Makefile
deleted file mode 100644
index a36e6a1c9..000000000
--- a/ubuntu/raring/metapackages/rename-meta/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-FPACKAGE = ubuntu-trinity-rename-meta
-VERSION = 1.0
-
-build:
-
-clean:
-
-install:
diff --git a/ubuntu/raring/metapackages/rename-meta/debian/rules b/ubuntu/raring/metapackages/rename-meta/debian/rules
index a9e7e66cb..bcf749744 100755
--- a/ubuntu/raring/metapackages/rename-meta/debian/rules
+++ b/ubuntu/raring/metapackages/rename-meta/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_BUILD_OPTIONS := nostrip
diff --git a/ubuntu/raring/metapackages/sudo-trinity/Makefile b/ubuntu/raring/metapackages/sudo-trinity/Makefile
deleted file mode 100755
index bc4653675..000000000
--- a/ubuntu/raring/metapackages/sudo-trinity/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-FPACKAGE = sudo-trinity

-VERSION = 1.0

-

-build:

-

-clean:

-

-install:

-	mkdir -p /etc

-	cp -Rp etc/*  $(DESTDIR)/etc/

-	chmod -R 644 $(DESTDIR)/etc

-	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
\ No newline at end of file
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/changelog b/ubuntu/raring/metapackages/sudo-trinity/debian/changelog
index 6d79a642a..6d79a642a 100755..100644
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/changelog
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/changelog
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/compat b/ubuntu/raring/metapackages/sudo-trinity/debian/compat
index 7ed6ff82d..7ed6ff82d 100755..100644
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/compat
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/compat
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/dirs b/ubuntu/raring/metapackages/sudo-trinity/debian/dirs
index ee19d5d17..ee19d5d17 100755..100644
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/dirs
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/dirs
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/Makefile b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/Makefile
new file mode 100644
index 000000000..f106ff05e
--- /dev/null
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/Makefile
@@ -0,0 +1,12 @@
+FPACKAGE = sudo-trinity
+VERSION = 1.0
+
+build:
+
+clean:
+
+install:
+	mkdir -p /etc
+	cp -Rp etc/*  $(DESTDIR)/etc/
+	chmod -R 644 $(DESTDIR)/etc
+	chmod -R 0440 $(DESTDIR)/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/raring/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
index f3c34f20a..f3c34f20a 100644
--- a/ubuntu/raring/metapackages/sudo-trinity/etc/sudoers.d/tde-secure-path
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/distrospecific/etc/sudoers.d/tde-secure-path
diff --git a/ubuntu/raring/metapackages/sudo-trinity/debian/rules b/ubuntu/raring/metapackages/sudo-trinity/debian/rules
index f8c89d5db..e5e2870b7 100755
--- a/ubuntu/raring/metapackages/sudo-trinity/debian/rules
+++ b/ubuntu/raring/metapackages/sudo-trinity/debian/rules
@@ -9,3 +9,19 @@ DEB_INSTALL_DOCS_ALL :=
 
 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
diff --git a/ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity b/ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
index e31165c02..e31165c02 100755
--- a/ubuntu/raring/metapackages/ubiquity-trinity/ubiquity-hooks/55_trinity
+++ b/ubuntu/raring/metapackages/ubiquity-trinity/debian/distrospecific/ubiquity-hooks/55_trinity
diff --git a/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules b/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules
index 9ded53d05..e6b6748ab 100755
--- a/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules
+++ b/ubuntu/raring/metapackages/ubiquity-trinity/debian/rules
@@ -4,3 +4,19 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                                && echo xz || echo bzip2)
+
+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