r32096 - in /desktop/unstable/gconf/debian: changelog control control.in rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu Dec 15 00:21:02 2011
New Revision: 32096

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32096
Log:
Rely on cdbs to call dh_girepository. Bump Build-Depends accordingly.

Modified:
    desktop/unstable/gconf/debian/changelog
    desktop/unstable/gconf/debian/control
    desktop/unstable/gconf/debian/control.in
    desktop/unstable/gconf/debian/rules

Modified: desktop/unstable/gconf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/changelog?rev=32096&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/changelog [utf-8] (original)
+++ desktop/unstable/gconf/debian/changelog [utf-8] Thu Dec 15 00:21:02 2011
@@ -5,8 +5,9 @@
   * debian/control.in:
     - Remove obsolete Conflicts and Replaces.
     - Change section of gir1.2-gconf-2.0 to introspection.
-
- -- Michael Biebl <biebl at debian.org>  Thu, 15 Dec 2011 01:09:39 +0100
+  * Rely on cdbs to call dh_girepository. Bump Build-Depends accordingly.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 15 Dec 2011 01:20:34 +0100
 
 gconf (3.2.3-1) unstable; urgency=low
 

Modified: desktop/unstable/gconf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control?rev=32096&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control [utf-8] (original)
+++ desktop/unstable/gconf/debian/control [utf-8] Thu Dec 15 00:21:02 2011
@@ -9,7 +9,7 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: debhelper (>= 8),
-               cdbs (>= 0.4.41),
+               cdbs (>= 0.4.90),
                gnome-pkg-tools (>= 0.14),
                gtk-doc-tools (>= 1.0),
                libglib2.0-dev (>= 2.25.9),

Modified: desktop/unstable/gconf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/control.in?rev=32096&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/control.in [utf-8] (original)
+++ desktop/unstable/gconf/debian/control.in [utf-8] Thu Dec 15 00:21:02 2011
@@ -4,7 +4,7 @@
 Maintainer: Josselin Mouette <joss at debian.org>
 Uploaders: @GNOME_TEAM@
 Build-Depends: debhelper (>= 8),
-               cdbs (>= 0.4.41),
+               cdbs (>= 0.4.90),
                gnome-pkg-tools (>= 0.14),
                gtk-doc-tools (>= 1.0),
                libglib2.0-dev (>= 2.25.9),

Modified: desktop/unstable/gconf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gconf/debian/rules?rev=32096&op=diff
==============================================================================
--- desktop/unstable/gconf/debian/rules [utf-8] (original)
+++ desktop/unstable/gconf/debian/rules [utf-8] Thu Dec 15 00:21:02 2011
@@ -20,8 +20,12 @@
 		/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
 
 DEB_INSTALL_DOCS_gconf2 += doc/FAQ.txt NEWS README TODO
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libexecdir=/usr/lib/libgconf2-4 \
-  --with-gtk=3.0 --disable-orbit
+
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
+                             --libexecdir=/usr/lib/libgconf2-4 \
+                             --with-gtk=3.0 \
+                             --disable-orbit
+
 DEB_MAKE_INVOKE += pkglibdir=/usr/lib/libgconf2-4
 
 LDFLAGS += -Wl,-z,defs -Wl,--as-needed
@@ -34,6 +38,3 @@
 binary-predeb/gconf2::
 	dh_pysupport -p$(cdbs_curpkg)
 
-$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) ::
-	dh_girepository -p$(cdbs_curpkg)
-