[SCM] mate-power-manager Debian package branch, master, updated. 324a45a723c377765337900667ea385cbedddb8c

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit fc12f8f3aa4bfca267c0da3e136f0ed17ff40295
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 21 21:07:30 2014 +0200

    Convert package into non-DFSG package. Repack upstream sources via get-orig-source and fix build via 2001_omit-gfdl-licensed-help-files.patch.
---
 debian/changelog                                   |  2 +-
 debian/mate-power-manager-common.install           |  2 --
 .../2001_omit-gfdl-licensed-help-files.patch       | 22 +++++++++++++++++
 debian/patches/README                              |  3 +++
 debian/patches/series                              |  1 +
 debian/rules                                       | 28 ++++++++++++++++++++--
 6 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75dd192..4fc4edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-power-manager (1.8.0-1) UNRELEASED; urgency=low
+mate-power-manager (1.8.0+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #734868)
 
diff --git a/debian/mate-power-manager-common.install b/debian/mate-power-manager-common.install
index a44a53a..5fc584b 100644
--- a/debian/mate-power-manager-common.install
+++ b/debian/mate-power-manager-common.install
@@ -5,5 +5,3 @@ usr/share/MateConf/gsettings/
 usr/share/mate-2.0/
 usr/share/mate-panel/applets/
 usr/share/mate-power-manager/
-usr/share/mate/help/
-usr/share/omf/
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
new file mode 100644
index 0000000..bae98b0
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -0,0 +1,22 @@
+Description:  Don't build non-DFSG (GFDL 1.1 licensed) help files
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -7,7 +7,6 @@
+ 	docs						\
+ 	man						\
+ 	data						\
+-	help						\
+ 	policy						\
+ 	tools
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -363,7 +363,6 @@
+ applets/inhibit/Makefile
+ docs/Makefile
+ man/Makefile
+-help/Makefile
+ po/Makefile.in
+ tools/Makefile
+ policy/Makefile
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..83b110e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_omit-gfdl-licensed-help-files.patch
diff --git a/debian/rules b/debian/rules
index c1e8a98..329ba85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
+PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
+UVER  = $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};')
+DTYPE = +dfsg1
+VER  ?= $(subst $(DTYPE),,$(UVER))
+
 DHFLAGS=--parallel
 
 %:
@@ -18,5 +24,23 @@ override_dh_auto_configure:
 		--enable-applets \
 		--with-gtk=2.0
 
-get-orig-source:
-	uscan --noconf --force-download --rename --download-current-version --destdir=..
+get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz $(info I: $(PKG)_$(VER)$(DTYPE))
+	@
+
+$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
+	@echo "# Downloading..."
+	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(PKD)
+	$(if $(wildcard $(PKG)-$(VER)),$(error $(PKG)-$(VER) exist, aborting..))
+	@echo "# Extracting..."
+	mkdir $(PKG)-$(VER) \
+	    && tar -xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
+	    || $(RM) -r $(PKG)-$(VER)
+	@echo "# Cleaning-up..."
+	cd $(PKG)-$(VER) \
+	    && $(RM) -r -v \
+	        help/
+	$(RM) -v $(PKG)_$(VER).orig.tar.*
+	@echo "# Packing..."
+	find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
+	    | XZ_OPT="-6v" tar -caf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" -T- --owner=root --group=root --mode=a+rX \
+	    && $(RM) -r "$(PKG)-$(VER)"

-- 
mate-power-manager Debian package