[SCM] mate-user-share Debian package branch, master, updated. 2fe71151a772f869c39d6aa2f0bc1839f82b94f6

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-user-share.git;a=commitdiff;h=f22191c

The following commit has been merged in the master branch:
commit f22191c05eead2f0f8ce99eaf13eabfff0dd0f65
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Apr 25 13:11:06 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 +-
 .../2001_omit-gfdl-licensed-help-files.patch       | 20 ++++++++++++++++
 debian/rules                                       | 28 ++++++++++++++++++++--
 debian/watch                                       |  1 +
 4 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e3fdf4..05070db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-user-share (1.8.0-1) UNRELEASED; urgency=low
+mate-user-share (1.8.0+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #734989).
 
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..28b0dbf
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -0,0 +1,20 @@
+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,4 +1,4 @@
+-SUBDIRS = data po src man help
++SUBDIRS = data po src man
+ 
+ EXTRA_DIST =			\
+ 	intltool-extract.in	\
+--- a/configure.ac
++++ b/configure.ac
+@@ -202,7 +202,6 @@
+ data/mate-user-share-webdav.desktop.in
+ data/mate-user-share-obexftp.desktop.in
+ data/mate-user-share-obexpush.desktop.in
+-help/Makefile
+ po/Makefile.in
+ src/Makefile
+ man/Makefile
diff --git a/debian/rules b/debian/rules
index 5ea4a07..e63fb64 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))
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
 
@@ -17,5 +23,23 @@ install/mate-user-share::
 	rm -f debian/mate-user-share/usr/share/mate-user-share/dav_user_2.0.conf
 	find debian/mate-user-share -name "*.la" -delete
 
-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)"
diff --git a/debian/watch b/debian/watch
index 26d2fa9..67d5987 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
+opts=dversionmangle=s/\+dfsg1// \
 http://git.mate-desktop.org/mate-user-share/ \
     snapshot/mate-user-share-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz

-- 
mate-user-share Debian package