r26122 - in /desktop/experimental/d-conf/debian: changelog compat control control.in rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Jan  4 00:29:09 2011
New Revision: 26122

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26122
Log:
* debian/control.in,
  debian/compat,
  debian/rules:
  + Switch to CDBS and debhelper 8.

Modified:
    desktop/experimental/d-conf/debian/changelog
    desktop/experimental/d-conf/debian/compat
    desktop/experimental/d-conf/debian/control
    desktop/experimental/d-conf/debian/control.in
    desktop/experimental/d-conf/debian/rules

Modified: desktop/experimental/d-conf/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/changelog?rev=26122&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/changelog [utf-8] (original)
+++ desktop/experimental/d-conf/debian/changelog [utf-8] Tue Jan  4 00:29:09 2011
@@ -4,6 +4,10 @@
     + Drop gir package, g-i support removed upstream.
     + debian/control.in:
       - Update build dependencies.
+  * debian/control.in,
+    debian/compat,
+    debian/rules:
+    + Switch to CDBS and debhelper 8.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 03 Jan 2011 23:43:21 +0000
 

Modified: desktop/experimental/d-conf/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/compat?rev=26122&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/compat [utf-8] (original)
+++ desktop/experimental/d-conf/debian/compat [utf-8] Tue Jan  4 00:29:09 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: desktop/experimental/d-conf/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control?rev=26122&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control [utf-8] Tue Jan  4 00:29:09 2011
@@ -8,7 +8,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8),
+               cdbs,
                autotools-dev,
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.14),

Modified: desktop/experimental/d-conf/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/control.in?rev=26122&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/control.in [utf-8] (original)
+++ desktop/experimental/d-conf/debian/control.in [utf-8] Tue Jan  4 00:29:09 2011
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8),
+               cdbs,
                autotools-dev,
                gnome-pkg-tools,
                gtk-doc-tools (>= 1.14),

Modified: desktop/experimental/d-conf/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/d-conf/debian/rules?rev=26122&op=diff
==============================================================================
--- desktop/experimental/d-conf/debian/rules [utf-8] (original)
+++ desktop/experimental/d-conf/debian/rules [utf-8] Tue Jan  4 00:29:09 2011
@@ -1,23 +1,11 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-%:
-	dh  $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- --enable-introspection --enable-gtk-doc
-
-override_dh_strip:
-	dh_strip -plibdconf0 --dbg-package=libdconf-dbg
-	dh_strip -pdconf-tools
-
-clean::
-	dh clean
-
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 GNOME_MODULE=dconf
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc