[SCM] mate-terminal Debian package branch, master, updated. 4b4470b786e5215bae0279fd0bbecc60fed66e8a

[Mike Gabriel]

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

The following commit has been merged in the master branch:
commit a46acaec777cd857f0677b0299bb87a765d0ce2c
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Sun Feb 23 16:05:19 2014 +0100

    debian/rules: drop non-DFSG help files
---
 debian/changelog |  4 ++--
 debian/rules     | 33 +++++++++++++++++++++++++++++----
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 738289f..225c701 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-mate-terminal (1.6.2-1) unstable; urgency=low
+mate-terminal (1.6.2+dfsg1-1) UNRELEASED; urgency=low
 
-  * New upstream release
+  * Initial release. (Closes: #734963).
 
  -- Wences Arana <aranax at debian.org.gt>  Mon, 17 Feb 2014 23:22:49 -0600
diff --git a/debian/rules b/debian/rules
index 62d9de5..bc8a77e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,16 @@
 #!/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, autoreconf
+	dh $@ --with python2 --with autoreconf
 
 override_dh_install:
-	rm -rfv debian/tmp/usr/share/omf/	
+	rm -rfv debian/tmp/usr/share/omf/
 	dh_install --list-missing
 
 override_dh_auto_configure:
@@ -19,5 +25,24 @@ override_dh_auto_configure:
 override_dh_strip:
 	dh_strip --dbg-package=mate-terminal-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-terminal Debian package