Fix moving distribution specific data in metapackages on Debian and Ubuntu

pull/3/head
Slávek Banko 11 years ago
parent 5181f56366
commit 68a2f23896

@ -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/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 # needed for usplash
CFLAGS += -fPIC CFLAGS += -fPIC

@ -2,8 +2,21 @@
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 CFLAGS=-g -Wall -fPIC

@ -2,8 +2,21 @@
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 CFLAGS=-g -Wall -fPIC

@ -2,8 +2,21 @@
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 CFLAGS=-g -Wall -fPIC

@ -5,20 +5,25 @@
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
pre-build:: debian/stamp-distrospecific:
mv debian/distrospecific/* . || true 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: clean:
mv debian/distrospecific/* . || true
dh_testdir 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 dh_clean
rm -rf build-stamp *.old debootstrap-dir rm -rf build-stamp *.old debootstrap-dir
DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
build: build-stamp build: debian/stamp-distrospecific build-stamp
build-stamp: desktop-$(DEB_BUILD_ARCH) build-stamp: desktop-$(DEB_BUILD_ARCH)
dh_clean dh_clean

@ -5,20 +5,25 @@
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
pre-build:: debian/stamp-distrospecific:
mv debian/distrospecific/* . || true 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: clean:
mv debian/distrospecific/* . || true
dh_testdir 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 dh_clean
rm -rf build-stamp *.old debootstrap-dir rm -rf build-stamp *.old debootstrap-dir
DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
build: build-stamp build: debian/stamp-distrospecific build-stamp
build-stamp: desktop-$(DEB_BUILD_ARCH) build-stamp: desktop-$(DEB_BUILD_ARCH)
dh_clean dh_clean

@ -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/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 # needed for usplash
CFLAGS += -fPIC CFLAGS += -fPIC

@ -2,8 +2,21 @@
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 CFLAGS=-g -Wall -fPIC

@ -2,8 +2,21 @@
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 CFLAGS=-g -Wall -fPIC

@ -2,8 +2,21 @@
include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/debhelper.mk
pre-build:: pre-build:: debian/stamp-distrospecific
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::
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 CFLAGS=-g -Wall -fPIC

@ -5,20 +5,25 @@
DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \ DEB_DH_BUILDDEB_ARGS += -- -Z$(shell dpkg-deb --help | grep -q ":.* xz[,.]" \
&& echo xz || echo bzip2) && echo xz || echo bzip2)
pre-build:: debian/stamp-distrospecific:
mv debian/distrospecific/* . || true 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: clean:
mv debian/distrospecific/* . || true
dh_testdir 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 dh_clean
rm -rf build-stamp *.old debootstrap-dir rm -rf build-stamp *.old debootstrap-dir
DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) DEB_BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
build: build-stamp build: debian/stamp-distrospecific build-stamp
build-stamp: desktop-$(DEB_BUILD_ARCH) build-stamp: desktop-$(DEB_BUILD_ARCH)
dh_clean dh_clean

Loading…
Cancel
Save