[SCM] mate-control-center Debian package branch, master, updated. 25f6150b846f0811b3bd52d74580bc4985e222d9

[Stefano Karapetsas]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-control-center.git;a=commitdiff;h=25f6150

The following commit has been merged in the master branch:
commit 25f6150b846f0811b3bd52d74580bc4985e222d9
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Sat Jan 25 12:35:01 2014 +0100

    Switch to debhelper with autoreconf
---
 debian/compat  |  2 +-
 debian/control |  5 +----
 debian/rules   | 39 ++++++++++++++++-----------------------
 3 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 81ed318..3dec327 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,8 @@ Uploaders: Mike Gabriel <sunweaver at debian.org>,
            John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>,
            Stefano Karapetsas <stefano at karapetsas.com>,
            Vangelis Mouhtsis <vangelis at gnugr.org>,
-Build-Depends: cdbs,
+Build-Depends: debhelper (>= 9),
                dh-autoreconf,
-               debhelper,
                mate-common,
                docbook-to-man,
                autotools-dev,
@@ -26,7 +25,6 @@ Build-Depends: cdbs,
                libdbus-glib-1-dev,
                libxml2-dev,
                libmarco-dev,
-               mate-settings-daemon,
                libxft-dev,
                libxrender-dev,
                libxrandr-dev,
@@ -37,7 +35,6 @@ Build-Depends: cdbs,
                libunique-dev,
                desktop-file-utils,
                shared-mime-info,
-               scrollkeeper,
                libgtop2-dev,
                xsltproc,
                libstartup-notification0-dev,
diff --git a/debian/rules b/debian/rules
index 4e9eea0..bddbf14 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,24 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/utils.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@ --with autoreconf
 
-DEB_DH_INSTALL_ARGS += --list-missing
+override_dh_install:
+	rm -rfv debian/tmp/usr/share/applications/mimeinfo.cache
+	rm -rfv debian/tmp/usr/lib/*/*.la
+	rm -rfv debian/tmp/usr/lib/*/*/*.la
+	dh_install --list-missing
 
-DEB_CONFIGURE_SCRIPT := ./autogen.sh
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--disable-scrollkeeper \
+		--localstatedir=/var \
+		--disable-static \
+		--disable-update-mimedb \
+		--with-gtk=2.0
 
-DEB_CONFIGURE_EXTRA_FLAGS += \
-						--disable-scrollkeeper \
-						--localstatedir=/var \
-						--disable-static \
-						--disable-update-mimedb
-
-# enable ubuntu hack only in oneiric (not needed in precise)
-ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
-    ifeq ($(shell lsb_release -cs),oneiric)
-        DEB_CONFIGURE_EXTRA_FLAGS += --enable-ubuntu
-    endif
-endif
-
-binary-post-install/mate-control-center::
-	rm -f debian/*/usr/share/applications/mimeinfo.cache
-	rm -f debian/*/usr/lib/*.la
-	rm -f debian/*/usr/lib/*/*.la
-	
+override_dh_strip:
+	dh_strip --dbg-package=mate-control-center-dbg
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..

-- 
mate-control-center Debian package