mesa: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/rules | 40 ++++++++++++----------------------------
2 files changed, 19 insertions(+), 28 deletions(-)
New commits:
commit 8c5d381f8b2df522d9585e48ba3991c97033fd4c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 26 15:50:48 2011 +0200
Simplify dh_strip calls a bit using make variables.
diff --git a/debian/changelog b/debian/changelog
index b7ad2f4..db26705 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
mesa (7.11-4) UNRELEASED; urgency=low
* Use xz compression for dbg packages.
+ * Simplify dh_strip calls a bit using make variables.
-- Julien Cristau <jcristau@debian.org> Fri, 26 Aug 2011 15:38:29 +0200
diff --git a/debian/rules b/debian/rules
index 2314ea6..81e01fb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -276,8 +276,11 @@ clean: unpatch
# Build architecture-independent files here.
binary-indep: install
-dbgpkg = $(filter %-dbg, $(shell dh_listpackages -s))
-otherpkg = $(filter-out %-dbg, $(shell dh_listpackages -s))
+allpkg = $(shell dh_listpackages -s)
+dbgpkg = $(filter %-dbg, $(allpkg))
+otherpkg = $(filter-out %-dbg, $(allpkg))
+havedbgpkg = $(patsubst %-dbg,%,$(dbgpkg))
+nodbgpkg = $(filter-out $(havedbgpkg),$(otherpkg))
# Build architecture-dependent files here.
binary-arch: install
@@ -314,39 +317,17 @@ endif
dh_lintian -s
dh_link -s
# Install bug control and script:
- set -e; for p in `dh_listpackages -s`; do \
+ set -e; for p in $(allpkg); do \
install -d debian/$$p/usr/share/bug/$$p && \
install -m 644 debian/local/control debian/$$p/usr/share/bug/$$p && \
install -m 755 debian/local/script debian/$$p/usr/share/bug/$$p; \
done
- dh_strip -plibgl1-mesa-swx11 --dbg-package=libgl1-mesa-swx11-dbg
- dh_strip -plibgl1-mesa-glx --dbg-package=libgl1-mesa-glx-dbg
- dh_strip -plibgl1-mesa-dri --dbg-package=libgl1-mesa-dri-dbg
- dh_strip -plibgl1-mesa-dri-experimental --dbg-package=libgl1-mesa-dri-experimental-dbg
- dh_strip -plibopenvg1-mesa --dbg-package=libopenvg1-mesa-dbg
- dh_strip -plibgbm1 --dbg-package=libgbm1-dbg
- dh_strip -plibegl1-mesa --dbg-package=libegl1-mesa-dbg
- dh_strip -plibglapi-mesa --dbg-package=libglapi-mesa-dbg
- dh_strip -plibgles1-mesa --dbg-package=libgles1-mesa-dbg
- dh_strip -plibgles2-mesa --dbg-package=libgles2-mesa-dbg
- dh_strip -plibegl1-mesa-drivers --dbg-package=libegl1-mesa-drivers-dbg
+ set -e; for p in $(havedbgpkg); do \
+ dh_strip -p$${p} --dbg-package=$${p}-dbg; \
+ done
# dh_strip -s --remaining-packages doesn't work with resumed
# builds (see changelog for mesa 7.10-1):
- dh_strip \
- -plibegl1-mesa-dev \
- -plibgbm-dev \
- -plibgl1-mesa-dev \
- -plibgl1-mesa-swx11-dev \
- -plibgles1-mesa-dev \
- -plibgles2-mesa-dev \
- -plibglu1-mesa \
- -plibglu1-mesa-dev \
- -plibglw1-mesa \
- -plibglw1-mesa-dev \
- -plibopenvg1-mesa-dev \
- -plibosmesa6 \
- -plibosmesa6-dev \
- -pmesa-common-dev
+ dh_strip $(foreach p,$(nodbgpkg),-p$(p))
dh_compress -s
dh_fixperms -s
ifeq (,$(filter sparc sparc64,$(DEB_HOST_ARCH)))
commit 89ffd809f23eced88ff66d22b3aec1d6905b423c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 26 15:38:39 2011 +0200
Use xz compression for dbg packages.
diff --git a/debian/changelog b/debian/changelog
index be522ab..b7ad2f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mesa (7.11-4) UNRELEASED; urgency=low
+
+ * Use xz compression for dbg packages.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 26 Aug 2011 15:38:29 +0200
+
mesa (7.11-3) unstable; urgency=low
* Don't build libgbm on kfreebsd, it needs KMS/udev.
diff --git a/debian/rules b/debian/rules
index 5c54dd6..2314ea6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -276,6 +276,8 @@ clean: unpatch
# Build architecture-independent files here.
binary-indep: install
+dbgpkg = $(filter %-dbg, $(shell dh_listpackages -s))
+otherpkg = $(filter-out %-dbg, $(shell dh_listpackages -s))
# Build architecture-dependent files here.
binary-arch: install
@@ -357,7 +359,8 @@ endif
dh_shlibdeps -s
dh_gencontrol -s
dh_md5sums -s
- dh_builddeb -s
+ dh_builddeb $(foreach pkg,$(dbgpkg),-p$(pkg)) -- -Zxz
+ dh_builddeb $(foreach pkg,$(otherpkg),-p$(pkg))
binary: binary-indep binary-arch
.PHONY: configs build clean binary-indep binary-arch binary install
Reply to: