[SCM] mate-power-manager Debian package branch, master, updated. 16954de75649340e485996399855b39b093498f1

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-power-manager.git;a=commitdiff;h=16954de

The following commit has been merged in the master branch:
commit 16954de75649340e485996399855b39b093498f1
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 21 20:51:26 2014 +0200

    clean-up last commits
---
 debian/changelog      |  4 +---
 debian/patches/series |  1 -
 debian/rules          | 10 +++-------
 debian/watch          |  3 ---
 4 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5b0076..75dd192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,5 @@
-mate-power-manager (1.8.0-1.1) UNRELEASED; urgency=low
+mate-power-manager (1.8.0-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #734868)
-  * debian/watch:
-    + Use tagged CGit tarball snapshots as upstream source.
 
  -- Vangelis Mouhtsis <vangelis at gnugr.org>  Mon, 21 Apr 2014 21:09:20 +0300
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8b13789..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/debian/rules b/debian/rules
index 8d09ab5..c1e8a98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/usr/bin/make -f
 
-DEB_BUILD_PARALLEL = 1
+DHFLAGS=--parallel
 
 %:
-	dh $@ --with quilt
+	dh $@ $(DHFLAGS) --with quilt
 
 override_dh_install:
 	dh_install --list-missing
@@ -11,11 +11,7 @@ override_dh_install:
 override_dh_auto_configure:
 	# ustream is without configure. autogen.sh will create it
 	NOCONFIGURE=1 ./autogen.sh
-	# We patched the configure.ac, rebuild configure
-	REQUIRED_AUTOMAKE_VERSION=1.9 USE_MATE2_MACROS=1 USE_COMMON_DOC_BUILD=yes \
-		PKG_NAME=mate-power-manager mate-autogen
-
-	dh_auto_configure -- \
+	dh_auto_configure $(DHFLAGS) -- \
 		--disable-silent-rules \
 		--libexecdir=/usr/lib/$(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)/mate-power-manager \
 		--disable-scrollkeeper \
diff --git a/debian/watch b/debian/watch
index 4330c8d..ff408d9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,4 @@
 version=3
-<<<<<<< HEAD
-=======
 opts=dversionmangle=s/\+dfsg1// \
->>>>>>> d01ec962a4ae8edfcf4bfc83ed869dce8a77a10d
 http://git.mate-desktop.org/mate-power-manager/ \
     snapshot/mate-power-manager-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz

-- 
mate-power-manager Debian package