[SCM] mate-polkit Debian package branch, master, updated. 2890ffbaefe6f4a08eb2790d81ade35f9b111aef

[Stefano Karapetsas]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-polkit.git;a=commitdiff;h=ecfb29d

The following commit has been merged in the master branch:
commit ecfb29dee0a5b8b269599dd3d189e6d6614d4491
Author: Stefano Karapetsas <stefano at karapetsas.com>
Date:   Wed Oct 23 14:53:51 2013 +0200

    Merge changes from upstream MATE dev-gtk3 branch
---
 debian/compat                         |    2 +-
 debian/control                        |   50 ++++++++++++++++-----------------
 debian/libmatepolkit-dev.install      |    4 +--
 debian/libmatepolkit.install          |    1 -
 debian/libpolkit-gtk-mate-1-0.install |    1 +
 debian/rules                          |   20 ++++++-------
 6 files changed, 38 insertions(+), 40 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 687e799..7dcd237 100644
--- a/debian/control
+++ b/debian/control
@@ -3,40 +3,38 @@ Section: mate
 Priority: optional
 Maintainer: Stefano Karapetsas <stefano at karapetsas.com>
 Uploaders: Steve Zesch <stevezesch2 at gmail.com>
-Build-Depends: cdbs,
-         debhelper (>= 8),
-         autotools-dev,
-         pkg-config,
-         libdbus-glib-1-dev,
-         libgtk2.0-dev,
-         libpolkit-agent-1-dev,
-         libpolkit-gobject-1-dev,
-         gtk-doc-tools,
-         quilt,
-         libgirepository1.0-dev,
-         gobject-introspection,
-         mate-common
-Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 9),
+               autotools-dev,
+               pkg-config,
+               libdbus-glib-1-dev,
+               libgtk2.0-dev,
+               libpolkit-agent-1-dev,
+               libpolkit-gobject-1-dev,
+               gtk-doc-tools,
+               libgirepository1.0-dev,
+               gobject-introspection,
+               mate-common,
+Standards-Version: 3.9.4
 Homepage: http://www.mate-desktop.org/
 
 Package: mate-polkit
 Architecture: any
 Depends: ${shlibs:Depends},
-        ${misc:Depends},
-        libmatepolkit,
-        policykit-1
+         ${misc:Depends},
+         policykit-1,
 Description: MATE authentication agent for PolicyKit-1
  mate-polkit provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
 
-Package: libmatepolkit
+Package: libpolkit-gtk-mate-1-0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
-        ${misc:Depends},
-        policykit-1
-Breaks: mate-polkit (<< 1.1.0-1)
-Replaces: mate-polkit (<< 1.1.0-1)
+         ${misc:Depends},
+         policykit-1,
+Conflicts: libmatepolkit
+Replaces: libmatepolkit
+Provides: libmatepolkit
 Description: MATE authentication agent for PolicyKit-1 (library)
  mate-polkit provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
@@ -47,10 +45,10 @@ Package: libmatepolkit-dev
 Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends},
-        ${misc:Depends},
-        libmatepolkit (= ${binary:Version}),
-        mate-polkit,
-        policykit-1
+         ${misc:Depends},
+         libpolkit-gtk-mate-1-0 (= ${binary:Version}),
+         mate-polkit,
+         policykit-1,
 Description: MATE authentication agent for PolicyKit-1 (development files)
  mate-polkit provides a D-Bus session bus service that is used to
  bring up authentication dialogs used for obtaining privileges.
diff --git a/debian/libmatepolkit-dev.install b/debian/libmatepolkit-dev.install
index 6ddde9a..793f500 100644
--- a/debian/libmatepolkit-dev.install
+++ b/debian/libmatepolkit-dev.install
@@ -1,3 +1,3 @@
 usr/include/
-usr/lib/pkgconfig/
-usr/lib/*.so
+usr/lib/*/pkgconfig/
+usr/lib/*/*.so
diff --git a/debian/libmatepolkit.install b/debian/libmatepolkit.install
deleted file mode 100644
index 093956b..0000000
--- a/debian/libmatepolkit.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*.so.*
diff --git a/debian/libpolkit-gtk-mate-1-0.install b/debian/libpolkit-gtk-mate-1-0.install
new file mode 100644
index 0000000..3de3b10
--- /dev/null
+++ b/debian/libpolkit-gtk-mate-1-0.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/rules b/debian/rules
index d90d321..dd69ca3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/utils.mk
+%:
+	dh $@
 
-DEB_DH_INSTALL_ARGS += --list-missing
+override_dh_install:
+	dh_install --list-missing
 
-DEB_CONFIGURE_SCRIPT := ./autogen.sh
-
-DEB_CONFIGURE_EXTRA_FLAGS := --localstatedir=/var \
-							--libexecdir=/usr/lib/polkit-mate \
-							--disable-static \
-							--disable-introspection
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--localstatedir=/var \
+		--libexecdir=/usr/lib/polkit-mate \
+		--disable-static \
+		--disable-introspection
 
 get-orig-source:
 	uscan --noconf --force-download --rename --download-current-version --destdir=..

-- 
mate-polkit Debian package