[SCM] mate-panel Debian package branch, master, updated. 255755e616a6f6c37a3d4f75a5580426c96330f6

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-panel.git;a=commitdiff;h=f83e6b4

The following commit has been merged in the master branch:
commit f83e6b425456eedfe7de69739a75545ffb2e8a98
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 25 10:55:51 2014 +0100

    package contains non-DFSG files, repacking...
---
 debian/changelog |  2 +-
 debian/rules     | 29 +++++++++++++++++++++++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0f76ebe..92698b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-panel (1.6.1-1) UNRELEASED; urgency=low
+mate-panel (1.6.1+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #720230).
 
diff --git a/debian/rules b/debian/rules
index f818f1d..dee0cc1 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 $@ --with python2
 
@@ -20,5 +26,24 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=mate-panel-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-panel Debian package