r18928 - in /packages/unstable/gnome-python-extras/debian: changelog control control.in rules

[joss at users.alioth.debian.org]

Author: joss
Date: Mon Mar  9 17:50:46 2009
New Revision: 18928

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=18928
Log:
version 2.24, since it disappeared. Build-depend on gdl 2.24.
* Add build-dependency on libglade2-dev because of #518970.

Modified:
    packages/unstable/gnome-python-extras/debian/changelog
    packages/unstable/gnome-python-extras/debian/control
    packages/unstable/gnome-python-extras/debian/control.in
    packages/unstable/gnome-python-extras/debian/rules

Modified: packages/unstable/gnome-python-extras/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-python-extras/debian/changelog?rev=18928&op=diff
==============================================================================
--- packages/unstable/gnome-python-extras/debian/changelog (original)
+++ packages/unstable/gnome-python-extras/debian/changelog Mon Mar  9 17:50:46 2009
@@ -8,11 +8,12 @@
   * 01_xul19.patch: updated for the new version.
   * 03_gdl-icons.patch: removed, merged upstream.
   * 03_gdl-gnome.patch: new patch. Don't require gdl-gnome if we have 
-    version 2.24, since it disappeared.
+    version 2.24, since it disappeared. Build-depend on gdl 2.24.
   * 70_autotools.patch: refreshed.
   * Disable gda module building until gda4 is in the archive - nothing 
     in the archive uses it anyway.
   * Also disable gksu 1.X which must die.
+  * Add build-dependency on libglade2-dev because of #518970.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 08 Mar 2009 15:55:39 +0100
 

Modified: packages/unstable/gnome-python-extras/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-python-extras/debian/control?rev=18928&op=diff
==============================================================================
--- packages/unstable/gnome-python-extras/debian/control (original)
+++ packages/unstable/gnome-python-extras/debian/control Mon Mar  9 17:50:46 2009
@@ -19,7 +19,8 @@
                libbonoboui2-dev,
                libgnomeui-dev,
                libgtkspell-dev (>= 2.0.0),
-               libgdl-1-dev (>= 0.7.1),
+               libgdl-1-dev (>= 2.24),
+               libglade2-dev,
                python-all-dev (>= 2.3.5-11),
                python-support (>= 0.7.1)
 Standards-Version: 3.8.0

Modified: packages/unstable/gnome-python-extras/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-python-extras/debian/control.in?rev=18928&op=diff
==============================================================================
--- packages/unstable/gnome-python-extras/debian/control.in (original)
+++ packages/unstable/gnome-python-extras/debian/control.in Mon Mar  9 17:50:46 2009
@@ -19,7 +19,8 @@
                libbonoboui2-dev,
                libgnomeui-dev,
                libgtkspell-dev (>= 2.0.0),
-               libgdl-1-dev (>= 0.7.1),
+               libgdl-1-dev (>= 2.24),
+               libglade2-dev,
                python-all-dev (>= 2.3.5-11),
                python-support (>= 0.7.1)
 Standards-Version: 3.8.0

Modified: packages/unstable/gnome-python-extras/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-python-extras/debian/rules?rev=18928&op=diff
==============================================================================
--- packages/unstable/gnome-python-extras/debian/rules (original)
+++ packages/unstable/gnome-python-extras/debian/rules Mon Mar  9 17:50:46 2009
@@ -26,7 +26,6 @@
 
 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
@@ -37,7 +36,6 @@
 	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