Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-utils.git;a=commitdiff;h=1b6157f
The following commit has been merged in the master branch:
commit 1b6157ff0db0f971e54c0adeec677d8891647d32
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Apr 25 12:19:30 2014 +0200
Convert package into non-DFSG package. Repack upstream sources via get-orig-source and fix build via 2001_omit-gfdl-licensed-help-files.patch.
---
debian/changelog | 2 +-
.../2001_omit-gfdl-licensed-help-files.patch | 71 ++++++++++++++++++++++
debian/rules | 29 ++++++++-
debian/watch | 1 +
4 files changed, 100 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b7e8da9..f73452c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mate-utils (1.8.0-1) UNRELEASED; urgency=low
+mate-utils (1.8.0+dfsg1-1) UNRELEASED; urgency=low
* Initial release. (Closes: #734990).
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..a2fe598
--- /dev/null
+++ b/debian/patches/2001_omit-gfdl-licensed-help-files.patch
@@ -0,0 +1,71 @@
+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
+@@ -35,8 +35,7 @@
+ autogen.sh \
+ omf.make \
+ xmldocs.make \
+- COPYING.libs \
+- COPYING.docs
++ COPYING.libs
+
+ DISTCLEANFILES = \
+ gtk-doc.make
+--- a/baobab/Makefile.am
++++ b/baobab/Makefile.am
+@@ -1 +1 @@
+-SUBDIRS = src data pixmaps help
++SUBDIRS = src data pixmaps
+--- a/configure.ac
++++ b/configure.ac
+@@ -385,16 +385,13 @@
+ baobab/pixmaps/24x24/Makefile
+ baobab/pixmaps/scalable/Makefile
+ baobab/src/Makefile
+-baobab/help/Makefile
+
+ logview/Makefile
+ logview/data/Makefile
+ logview/tests/Makefile
+-logview/help/Makefile
+
+ gsearchtool/Makefile
+ gsearchtool/data/Makefile
+-gsearchtool/help/Makefile
+ gsearchtool/libmateui-deprecated/Makefile
+
+ mate-dictionary/Makefile
+@@ -406,7 +403,6 @@
+ mate-dictionary/docs/reference/Makefile
+ mate-dictionary/docs/reference/gdict/Makefile
+ mate-dictionary/docs/reference/gdict/version.xml
+-mate-dictionary/help/Makefile
+ mate-dictionary/src/Makefile
+
+ mate-screenshot/Makefile
+--- a/gsearchtool/Makefile.am
++++ b/gsearchtool/Makefile.am
+@@ -1,6 +1,6 @@
+ Utilitiesdir = $(datadir)/applications
+
+-SUBDIRS = data help libmateui-deprecated
++SUBDIRS = data libmateui-deprecated
+
+ AM_CPPFLAGS = \
+ -I$(srcdir)/libmateui-deprecated \
+--- a/logview/Makefile.am
++++ b/logview/Makefile.am
+@@ -1,4 +1,4 @@
+-SUBDIRS = data help tests
++SUBDIRS = data tests
+
+ AM_CPPFLAGS = \
+ -DG_LOG_DOMAIN=\"mate-system-log\" \
+--- a/mate-dictionary/Makefile.am
++++ b/mate-dictionary/Makefile.am
+@@ -1,3 +1,3 @@
+-SUBDIRS = libgdict src data docs help
++SUBDIRS = libgdict src data docs
+
+ EXTRA_DIST = TODO README AUTHORS
diff --git a/debian/rules b/debian/rules
index 96b500f..311077f 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/rules/debhelper.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/autotools.mk
@@ -14,5 +20,24 @@ DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
DEB_CONFIGURE_SCRIPT := ./autogen.sh
-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) \
+ && $(RM) -r -v \
+ */help/ \
+ 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)"
diff --git a/debian/watch b/debian/watch
index 2e5e503..d5ed995 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
version=3
+opts=dversionmangle=s/\+dfsg1// \
http://git.mate-desktop.org/mate-utils/ \
snapshot/mate-utils-(\d\.(?:[0-9]+|)[24680]\.\d)\.tar\.xz
--
mate-utils Debian package