[SCM] mate-file-manager Debian package branch, master, updated. 959eb43842e4a729c24c27ef13d32f88083b76bd

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/caja.git;a=commitdiff;h=67fffce

The following commit has been merged in the master branch:
commit 67fffcec2e62a99f035cdeb248db9d4ca81baf50
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 10 11:40:22 2014 +0100

    Strip-off non-DFSG documentation files from orig tarball
---
 debian/changelog                          |  3 +--
 debian/patches/2001_dfsg-non-gnufdl.patch | 29 +++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 debian/rules                              | 36 +++++++++++++++++++++++++++++--
 4 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0022504..84858b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
-caja (1.6.3-1) UNRELEASED; urgency=low
+caja (1.6.3+dfsg1-1) UNRELEASED; urgency=low
 
   * Initial release. (Closes: #727061).
 
  -- Stefano Karapetsas <stefano at karapetsas.com>  Wed, 16 Oct 2013 14:33:43 +0200
- 
diff --git a/debian/patches/2001_dfsg-non-gnufdl.patch b/debian/patches/2001_dfsg-non-gnufdl.patch
new file mode 100644
index 0000000..4defaa6
--- /dev/null
+++ b/debian/patches/2001_dfsg-non-gnufdl.patch
@@ -0,0 +1,29 @@
+Description: Omit non-DFSG files during build
+Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -1,7 +1,5 @@
+ NULL = 
+ 
+-SUBDIRS = reference
+-
+ man_MANS = \
+ 	caja.1 \
+ 	caja-autorun-software.1 \
+@@ -11,16 +9,4 @@
+ 
+ EXTRA_DIST = \
+ 	$(man_MANS) \
+-	architecture.txt \
+-	dnd.txt \
+-	load-states.dia \
+-	caja-internals.sxw \
+-	caja-internals.pdf \
+-	caja-io.txt \
+-	caja.faq \
+-	recommended-books.html \
+-	smoketests.html \
+-	state-machines.txt \
+-	style-guide.html \
+-	key_mouse_navigation.txt \
+ 	$(NULL)
diff --git a/debian/patches/series b/debian/patches/series
index 79d4cd5..f5f0d10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001_add-manpage-for-caja-autorun-software.patch
 1001_add-keywords-to-desktop-files.patch
+2001_dfsg-non-gnufdl.patch
diff --git a/debian/rules b/debian/rules
index 19b08e5..3bc4b89 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,11 @@
 #!/usr/bin/make -f
 
+PKD   = $(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 autoreconf
 
@@ -27,5 +33,31 @@ override_dh_strip:
 	dh_strip -pcaja --dbg-package=caja-dbg
 	dh_strip -plibcaja-extension1 --dbg-package=libcaja-extension1-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 \
+	        docs/*.txt \
+	        docs/*.pdf \
+	        docs/*.sxw \
+	        docs/*.faq \
+	        docs/*.dia \
+	        docs/*.html \
+	        docs/reference \
+	        COPYING-DOCS
+	$(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-file-manager Debian package