[SCM] mate-dialogs Debian package branch, master, updated. 085473f94847ab26b39f5780e881b2ebc67d38c8

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit 86518de20264659d4cab5ff982d9ec2a0ea46d9d
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Mar 7 00:16:17 2014 +0100

    Repack upstream tarball and omit non-DFSG (GFDL-1.1) files.
---
 debian/changelog                                   |  2 +-
 debian/mate-dialogs-common.install                 |  2 --
 .../2001_omit-gfdl-licensed-user-guide.patch       | 24 ++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 29 ++++++++++++++++++++--
 5 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 032d3c9..4c9ca70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-dialogs (1.8.0-1) UNRELEASED; urgency=low
+mate-dialogs (1.8.0+dfsg1-1) UNRELEASED; urgency=low
 
   * New upstream release.
 
diff --git a/debian/mate-dialogs-common.install b/debian/mate-dialogs-common.install
index eddc206..8218e5e 100644
--- a/debian/mate-dialogs-common.install
+++ b/debian/mate-dialogs-common.install
@@ -1,5 +1,3 @@
 usr/share/locale/
 usr/share/man/
-usr/share/mate/
 usr/share/matedialog/
-usr/share/omf/
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..de682f3
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-user-guide.patch
@@ -0,0 +1,24 @@
+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,8 +1,7 @@
+ SUBDIRS = \
+ 	src	\
+ 	po	\
+-	data	\
+-	help
++	data
+ 
+ EXTRA_DIST = \
+ 	autogen.sh		\
+--- a/configure.ac
++++ b/configure.ac
+@@ -141,7 +141,6 @@
+ po/Makefile.in
+ src/Makefile
+ data/Makefile
+-help/Makefile
+ ])
+ 
+ AC_OUTPUT
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 a822f64..aa639ce 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 $@
 
@@ -15,5 +21,24 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip -pmate-dialogs --dbg-package=mate-dialogs-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-dialogs Debian package