[SCM] eom Debian package branch, master, updated. 7f13db3032007668f366c1eea390e5780644f31d

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/eom.git;a=commitdiff;h=902cecb

The following commit has been merged in the master branch:
commit 902cecb3d979d7bad86a338f83673dd08b761816
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Feb 25 19:14:35 2014 +0100

    Re-pack upstream sources, omit GFDL-1.1 licensed help files.
---
 debian/changelog                                   | 11 ++++++++
 debian/eom-common.install                          |  2 --
 .../2001_omit-gfdl-licensed-help-files.patch       | 32 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 29 ++++++++++++++++++--
 5 files changed, 71 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5fbf298..eff465e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+eom (1.6.2+dfsg1-1) UNRELEASED; urgency=low
+
+  * Re-pack upstream sources, omit GFDL-1.1 licensed help files.
+  * debian/copyright:
+    + The file m4/libtool.m4 has amorph+libtool exception.
+    + Fix license section for LGPL-2+.
+  * debian/watch:
+    + Fix file name mangling.
+
+ -- Mike Gabriel <sunweaver at debian.org>  Tue, 25 Feb 2014 19:14:03 +0100
+
 eom (1.6.2-1) unstable; urgency=low
 
   * Initial release. (Closes: #730320).
diff --git a/debian/eom-common.install b/debian/eom-common.install
index b7be9b2..5be1004 100644
--- a/debian/eom-common.install
+++ b/debian/eom-common.install
@@ -1,6 +1,4 @@
 usr/share/icons/hicolor/
 usr/share/locale/
 usr/share/MateConf/
-usr/share/omf/
 usr/share/eom/
-usr/share/mate/
\ No newline at end of file
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..9e91340
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -0,0 +1,32 @@
+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
+@@ -4,7 +4,7 @@
+ jpeg_DIRS = jpegutils
+ endif
+ 
+-SUBDIRS = $(jpeg_DIRS) cut-n-paste bindings src man plugins po help data doc
++SUBDIRS = $(jpeg_DIRS) cut-n-paste bindings src man plugins po data doc
+ 
+ EXTRA_DIST = 		\
+ 	AUTHORS			\
+@@ -27,7 +27,7 @@
+ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --disable-scrollkeeper --enable-gtk-doc
+ 
+ # Ignore scrollkeeper issues for now.  @#*$& scrollkeeper
+-distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v /share/mate/help/ | grep -v \.omf
++distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper | grep -v \.omf
+ 
+ MAINTAINERCLEANFILES = \
+ 	$(srcdir)/aclocal.m4 \
+--- a/configure.ac
++++ b/configure.ac
+@@ -460,7 +460,6 @@
+ cut-n-paste/Makefile
+ cut-n-paste/toolbar-editor/Makefile
+ cut-n-paste/totem-screensaver/Makefile
+-help/Makefile
+ po/Makefile.in
+ data/Makefile
+ data/eom.pc
diff --git a/debian/patches/series b/debian/patches/series
index fb344dc..995133f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 1001_change-application-name-to-eom.patch
 1002_add-keywords-to-eom-desktop-file.patch
+2001_omit-gfdl-licensed-help-files.patch
diff --git a/debian/rules b/debian/rules
index b4ca90d..26ad838 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/class/autotools.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
@@ -15,5 +21,24 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper --localstatedir=/var
 binary-install/eom::
 	rm -f debian/eom/usr/lib/eom/plugins/*.la
 
-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)"
\ No newline at end of file

-- 
eom Debian package