diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2014-01-15 18:52:57 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2014-01-15 18:52:57 +0100 |
| commit | 68a2f23896b2dfd53c80fff69f3663b76b1b73e0 (patch) | |
| tree | 3292ca03fa3e6a70f1d66081c93181b17c048608 /ubuntu/raring | |
| parent | 5181f5636665f04b08fe3f53015e1aeb82c691dd (diff) | |
| download | tde-packaging-68a2f23896b2dfd53c80fff69f3663b76b1b73e0.tar.gz tde-packaging-68a2f23896b2dfd53c80fff69f3663b76b1b73e0.zip | |
Fix moving distribution specific data in metapackages on Debian and Ubuntu
Diffstat (limited to 'ubuntu/raring')
6 files changed, 72 insertions, 15 deletions
diff --git a/ubuntu/raring/defaultsettings/desktop-base/debian/rules b/ubuntu/raring/defaultsettings/desktop-base/debian/rules index b9aec371b..67ba1f7f8 100755 --- 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 diff --git a/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/rules b/ubuntu/raring/defaultsettings/kubuntu-default-settings/debian/rules index 21fd96aa1..b6386b0d8 100755 --- 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 diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/rules b/ubuntu/raring/defaultsettings/redmond-default-settings-ii/debian/rules index 21fd96aa1..b6386b0d8 100755 --- 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 diff --git a/ubuntu/raring/defaultsettings/redmond-default-settings/debian/rules b/ubuntu/raring/defaultsettings/redmond-default-settings/debian/rules index 21fd96aa1..b6386b0d8 100755 --- 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 diff --git a/ubuntu/raring/metapackages/kubuntu-meta/debian/compat b/ubuntu/raring/metapackages/kubuntu-meta/debian/compat index b8626c4cf..7ed6ff82d 100644 --- a/ubuntu/raring/metapackages/kubuntu-meta/debian/compat +++ b/ubuntu/raring/metapackages/kubuntu-meta/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/ubuntu/raring/metapackages/kubuntu-meta/debian/rules b/ubuntu/raring/metapackages/kubuntu-meta/debian/rules index 172f9ec16..bd33ed27d 100755 --- 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 |