Fix moving distribution specific data in metapackages on Debian and Ubuntu

11 years ago · 68a2f23896
parent 5181f56366
commit 68a2f23896
14 changed files with 156 additions and 37 deletions
--- a/ubuntu/maverick/defaultsettings/desktop-base/debian/rules
+++ b/ubuntu/maverick/defaultsettings/desktop-base/debian/rules
@ -4,8 +4,21 @@ include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 # needed for usplash
 CFLAGS += -fPIC
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/debian/rules
@ -2,8 +2,21 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 CFLAGS=-g -Wall -fPIC

--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/rules
@ -2,8 +2,21 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 CFLAGS=-g -Wall -fPIC

--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/rules
@ -2,8 +2,21 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 CFLAGS=-g -Wall -fPIC

--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/compat
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/compat
@ -1 +1 @@
-4
+5
--- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/rules
@ -5,20 +5,25 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                               && echo xz || echo bzip2)

-pre-build::
-	mv debian/distrospecific/* . || true
+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:
-	mv debian/distrospecific/* . || true
-
 	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
 	dh_clean
-
 	rm -rf build-stamp *.old debootstrap-dir

 DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

-build: build-stamp
+build: debian/stamp-distrospecific build-stamp
 build-stamp:	desktop-$(DEB_BUILD_ARCH)
 	dh_clean

--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/compat
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/compat
@ -1 +1 @@
-4
+5
--- a/ubuntu/precise/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/precise/metapackages/kubuntu-meta/debian/rules
@ -5,20 +5,25 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                               && echo xz || echo bzip2)

-pre-build::
-	mv debian/distrospecific/* . || true
+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:
-	mv debian/distrospecific/* . || true
-
 	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
 	dh_clean
-
 	rm -rf build-stamp *.old debootstrap-dir

 DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

-build: build-stamp
+build: debian/stamp-distrospecific build-stamp
 build-stamp:	desktop-$(DEB_BUILD_ARCH)
 	dh_clean

--- a/ubuntu/raring/defaultsettings/desktop-base/debian/rules
+++ b/ubuntu/raring/defaultsettings/desktop-base/debian/rules
@ -4,8 +4,21 @@ include /usr/share/cdbs/1/rules/buildcore.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 # needed for usplash
 CFLAGS += -fPIC
--- a/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/rules
+++ b/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/rules
@ -2,8 +2,21 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 CFLAGS=-g -Wall -fPIC

--- a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/rules
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/rules
@ -2,8 +2,21 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 CFLAGS=-g -Wall -fPIC

--- a/ubuntu/raring/defaultsettings/redmond-default-settings/debian/rules
+++ b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/rules
@ -2,8 +2,21 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/debhelper.mk

-pre-build::
-	mv debian/distrospecific/* . || true
+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

 CFLAGS=-g -Wall -fPIC

--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/compat
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/compat
@ -1 +1 @@
-4
+5
--- a/ubuntu/raring/metapackages/kubuntu-meta/debian/rules
+++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/rules
@ -5,20 +5,25 @@
 DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
                               && echo xz || echo bzip2)

-pre-build::
-	mv debian/distrospecific/* . || true
+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:
-	mv debian/distrospecific/* . || true
-
 	dh_testdir
+	[ ! -e debian/stamp-distrospecific ] || \
+	cat debian/stamp-distrospecific | \
+	tr "\n" "\0" | xargs -r0 mv -t debian/distrospecific
+	rm -f debian/stamp-distrospecific
 	dh_clean
-
 	rm -rf build-stamp *.old debootstrap-dir

 DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

-build: build-stamp
+build: debian/stamp-distrospecific build-stamp
 build-stamp:	desktop-$(DEB_BUILD_ARCH)
 	dh_clean