[SCM] mate-control-center Debian package branch, master, updated. 421f3a0bba678f03974cb81521c7f6915f8f4e05

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit 7b54321369a547871b3beb2e70e2f5895974f5d3
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Apr 17 22:04:58 2014 +0200

    Package is not DFSG-compliant: strip off help subfolder from upstream tarball and repack for Debian.
---
 debian/changelog                                   |  2 +-
 .../2001_omit-gfdl-licensed-help-files.patch       | 22 ++++++++++++++++
 debian/patches/README                              |  3 +++
 debian/patches/series                              |  1 +
 debian/rules                                       | 29 ++++++++++++++++++++--
 5 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df91df8..3306614 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-control-center (1.8.1-1) UNRELEASED; urgency=low
+mate-control-center (1.8.1+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #734663).
 
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..c72a1a4
--- /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
+@@ -1,5 +1,5 @@
+-SUBDIRS = po libwindow-settings capplets font-viewer help
+-DIST_SUBDIRS = po libwindow-settings capplets font-viewer help libslab shell typing-break
++SUBDIRS = po libwindow-settings capplets font-viewer
++DIST_SUBDIRS = po libwindow-settings capplets font-viewer libslab shell typing-break
+ 
+ if HAVE_LIBSLAB
+ SUBDIRS += libslab
+--- a/configure.ac
++++ b/configure.ac
+@@ -367,7 +367,6 @@
+ capplets/windows/mate-window-properties.desktop.in
+ font-viewer/Makefile
+ font-viewer/mate-font-viewer.desktop.in
+-help/Makefile
+ libwindow-settings/Makefile
+ libwindow-settings/mate-window-settings-2.0.pc
+ po/Makefile.in
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 2eab74b..0abf821 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
 
 %:
@@ -25,5 +31,24 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=mate-control-center-dbg
 
-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) \
+	    && find . -depth -type d -name 'windows' -exec $(RM) -r {} \; -printf 'removed %p
' \
+	    && $(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-control-center Debian package