[SCM] mate-desktop Debian package branch, master, updated. debian/1.6.1-3-18-gb8b8587

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-desktop.git;a=commitdiff;h=199f96e

The following commit has been merged in the master branch:
commit 199f96e8f7ae9249f39b31316f50eae0df594d0f
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Mar 6 08:45:48 2014 +0100

    Repack upstream tarball and omit non-DFSG (GFDL-1.1) files.
---
 debian/changelog                                   |  2 +-
 .../2001_omit-gfdl-licensed-user-guide.patch       | 43 ++++++++++++++++++++++
 debian/patches/README                              |  3 ++
 debian/patches/series                              |  1 +
 debian/rules                                       | 29 ++++++++++++++-
 5 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b5a46b3..a0a052c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-desktop (1.8.0-1) UNRELEASED; urgency=low
+mate-desktop (1.8.0+dfsg1-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Repack upstream tarball and omit non-DFSG (GFDL-1.1) files.
diff --git a/debian/patches/2001_omit-gfdl-licensed-user-guide.patch b/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
new file mode 100644
index 0000000..4ad9177
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
@@ -0,0 +1,43 @@
+Description: Don't build non-DFSG (GFDL 1.1 licensed) user-guide files
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -6,9 +6,6 @@
+ if DESKTOP_DOCS_ENABLED
+ SUBDIRS += desktop-docs
+ endif
+-if USER_GUIDE_ENABLED
+-SUBDIRS += user-guide
+-endif
+ 
+ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+ 
+--- a/configure.ac
++++ b/configure.ac
+@@ -84,10 +84,6 @@
+ 	[AS_HELP_STRING([--disable-desktop-docs],[do not build desktop-wide help documents])],
+ 	[],[enable_desktop_docs=yes])
+ AM_CONDITIONAL(DESKTOP_DOCS_ENABLED, test "x$enable_desktop_docs" = "xyes")
+-AC_ARG_ENABLE([user-guide],
+-	[AS_HELP_STRING([--disable-user-guide],[do not build user guide])],
+-	[],[enable_user_guide=yes])
+-AM_CONDITIONAL(USER_GUIDE_ENABLED, test "x$enable_user_guide" = "xyes")
+ 
+ 
+ # Install tool to migrate 1.4 MateConf settings
+@@ -340,8 +336,6 @@
+ man/Makefile
+ tools/mate-conf-import.desktop.in
+ tools/Makefile
+-user-guide/Makefile
+-user-guide/mate-user-guide.desktop.in
+ ])
+ 
+ AC_OUTPUT
+--- a/po/POTFILES.in
++++ b/po/POTFILES.in
+@@ -29,4 +29,3 @@
+ schemas/org.mate.thumbnailers.gschema.xml.in.in
+ schemas/org.mate.typing-break.gschema.xml.in.in
+ tools/mate-conf-import.desktop.in.in
+-user-guide/mate-user-guide.desktop.in.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..c97dc73
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+2001_omit-gfdl-licensed-user-guide.patch
diff --git a/debian/rules b/debian/rules
index 898cd26..cca64fe 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))
+
 %:
 	dh $@
 
@@ -20,5 +26,24 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=mate-desktop-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 \
+	        user-guide
+	$(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)"
\ No newline at end of file

-- 
mate-desktop Debian package