debian/changelog | 6 +++++- debian/clean | 3 +++ debian/rules | 9 +++++++++ 3 files changed, 17 insertions(+), 1 deletion(-)
New commits: commit 523d4960ff3594b07f498c47543e12b73f3bee5a Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> Date: Thu Aug 4 16:07:38 2011 +1000 Mark as UNRELEASED, to placate those who like the series to mean something ☺ diff --git a/debian/changelog b/debian/changelog index 78e1ab2..b9d7085 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (7.11-0ubuntu1) oneiric; urgency=low +mesa (7.11-0ubuntu1) UNRELEASED; urgency=low * Fake merge from Debian experimental, updating previous changelog entries. New upstream release fixes infrequent X crash (LP: #800778). commit e83bac95312fc178baf80758d90b2e7adf1438ee Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com> Date: Thu Aug 4 12:57:09 2011 +1000 Appease the great and powerful pkgbinarymangler translation-stripping gods diff --git a/debian/changelog b/debian/changelog index 45bc3f1..78e1ab2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -64,6 +64,10 @@ mesa (7.11-0ubuntu1) oneiric; urgency=low * debian/patches/118_fix_24bpp_software_rendering.diff: - Cherry pick upstream patch from master fixing graphical corruption when using a 24bpp framebuffer and software rendering. (LP: #810339) + * debian/rules: + * debian/clean: + - Generate xmlpool pot file and clean up other po files for + pkgbinarymangler's benefit (LP: #410264). -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 19 Jul 2011 09:15:22 +1000 diff --git a/debian/clean b/debian/clean index 34193d8..89386ce 100644 --- a/debian/clean +++ b/debian/clean @@ -32,3 +32,6 @@ debian/libgl1-mesa-swx11.postinst debian/libgl1-mesa-swx11.prerm debian/libgbm1.install debian/libgbm-dev.install + +# And for pkgstriptranslation's benefit… +src/mesa/drivers/dri/common/xmlpool/xmlpool.pot diff --git a/debian/rules b/debian/rules index 098fee4..2516c61 100755 --- a/debian/rules +++ b/debian/rules @@ -225,6 +225,10 @@ $(QUILT_STAMPFN): $(STAMP_DIR)/stamp build: build-stamp build-stamp: $(BUILD_STAMPS) + # Build pot file for pkgstriptranslations + # We do this only once, and outside the build trees, so that + # pkgstriptranslations doesn't get confused. + $(MAKE) -C src/mesa/drivers/dri/common/xmlpool pot >$@ $(STAMP)-build-%: configure @@ -240,6 +244,11 @@ $(STAMP)-build-%: configure --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --localstatedir=/var $(confflags) $(confflags-$*) cd $(DEB_BUILD_DIR)/$* && $(MAKE) + + # Remove extra po files. These confuse pkgstriptranslations + # and aren't shipped anyway. + rm $(DEB_BUILD_DIR)/$*/src/mesa/drivers/dri/common/xmlpool/*.po ; \ + >$@ install: build -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qor5y-0003lb...@vasks.debian.org