From 68a2f23896b2dfd53c80fff69f3663b76b1b73e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 15 Jan 2014 18:52:57 +0100 Subject: Fix moving distribution specific data in metapackages on Debian and Ubuntu --- .../maverick/defaultsettings/desktop-base/debian/rules | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'ubuntu/maverick/defaultsettings/desktop-base') diff --git a/ubuntu/maverick/defaultsettings/desktop-base/debian/rules b/ubuntu/maverick/defaultsettings/desktop-base/debian/rules index b9aec371b..67ba1f7f8 100755 --- 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 -- cgit v1.2.1