r18269 - in /packages/lenny/gnome-python-extras/debian: changelog rules

[joss at users.alioth.debian.org]

Author: joss
Date: Thu Jan 22 15:52:08 2009
New Revision: 18269

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18269
Log:
* Non-maintainer upload.
* Only apply 03_gdl-icons.patch if gdl-icons.h does not exist,
  this fixes building the package in Lenny (Closes: #511265).

Modified:
    packages/lenny/gnome-python-extras/debian/changelog
    packages/lenny/gnome-python-extras/debian/rules

Modified: packages/lenny/gnome-python-extras/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/lenny/gnome-python-extras/debian/changelog?rev=18269&op=diff
==============================================================================
--- packages/lenny/gnome-python-extras/debian/changelog (original)
+++ packages/lenny/gnome-python-extras/debian/changelog Thu Jan 22 15:52:08 2009
@@ -1,3 +1,11 @@
+gnome-python-extras (2.19.1-3.1~lenny1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Only apply 03_gdl-icons.patch if gdl-icons.h does not exist,
+    this fixes building the package in Lenny (Closes: #511265).
+
+ -- Bernd Zeimetz <bzed at debian.org>  Thu, 22 Jan 2009 14:15:46 +0100
+
 gnome-python-extras (2.19.1-3) unstable; urgency=low
 
   * 03_gdl-icons.patch: new patch. Fixes build with gdl 2.24 by removing 

Modified: packages/lenny/gnome-python-extras/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/lenny/gnome-python-extras/debian/rules?rev=18269&op=diff
==============================================================================
--- packages/lenny/gnome-python-extras/debian/rules (original)
+++ packages/lenny/gnome-python-extras/debian/rules Thu Jan 22 15:52:08 2009
@@ -26,6 +26,7 @@
 
 apply-patches: debian/stamp-patched
 debian/stamp-patched:
+	if [ -r /usr/include/libgdl-1.0/gdl/gdl-icons.h ]; then sed -i '/03_gdl-icons.patch/s,^,#,'  debian/patches/series; fi
 	QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null push -a || test $$? = 2
 	# This file is not removed by the patch
 	mv gtkmozembed/gtkmozembedmodule.c gtkmozembed/gtkmozembedmodule.c.save
@@ -36,6 +37,7 @@
 	test -f gtkmozembed/gtkmozembedmodule.c.save && mv gtkmozembed/gtkmozembedmodule.c.save gtkmozembed/gtkmozembedmodule.c || true
 	rm -rf .pc
 	rm -f debian/stamp-patched
+	sed -i '/#03_gdl-icons.patch/s,^#,,'  debian/patches/series
 
 build-%/configure-stamp: configure apply-patches
 	dh_testdir