8 files changed, 28 insertions, 21 deletions
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/squeeze/metapackages/sudo-trinity/Makefile b/debian/squeeze/metapackages/sudo-trinity/debian/distrospecific/Makefile
index bc4653675..f106ff05e 100755..100644
--- a/debian/squeeze/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