[libkml] 01/07: Repack upstream tarball removing the IETF RFCs included by thirdparty uriparser documentation.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository libkml.

commit 02893f7b1dd83cb3af6590797eb742ad50e86df7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Apr 22 15:15:34 2014 +0200

    Repack upstream tarball removing the IETF RFCs included by thirdparty uriparser documentation.
---
 debian/changelog       |  6 ++++--
 debian/copyright       |  2 ++
 debian/get-orig-source | 24 ++++++++++++++++++++++++
 debian/rules           |  3 +++
 debian/watch           |  6 ++++--
 5 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0b513a1..980afc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-libkml (1.3.0~r864-3) UNRELEASED; urgency=low
+libkml (1.3.0~r864+dfsg-1) UNRELEASED; urgency=low
 
   * Bump Standards-Version to 3.9.5, no changes required.
+  * Repack upstream tarball removing the IETF RFCs included by thirdparty
+    uriparser documentation.
 
- -- Bas Couwenberg <sebastic at xs4all.nl>  Sat, 14 Dec 2013 18:13:56 +0100
+ -- Bas Couwenberg <sebastic at xs4all.nl>  Tue, 22 Apr 2014 15:14:13 +0200
 
 libkml (1.3.0~r864-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index b89a6d7..d9d5235 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,6 +3,8 @@ Upstream-Name: libxml
 Upstream-Contact: Google Inc. <opensource at google.com>
 Source: https://code.google.com/p/libkml/
 License: BSD-3-Clause
+Comment: The IETF RFCs are removed due to non-free restrictions.
+Files-Excluded: third_party/uriparser-*/doc/rfc*
 
 Files: *
 Copyright: 2008-2010, Google Inc.
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 0000000..9e06428
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,24 @@
+#!/bin/sh -x
+# Repack tarball because the IETF RFC license has non-free restrictions.
+
+set -e
+
+# Remark: A new uscan that enables easier handling of removing files can be
+#         obtained via
+#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
+#         and then copy scripts/uscan.pl as uscan at the beginning of your PATH
+if uscan --help | grep -q -- --repack-compression ; then
+    echo "Use new enhanced uscan"
+    uscan --verbose --force-download
+    exit
+fi
+
+# Falling back to manually removing files
+
+PACKAGE=`dpkg-parsechangelog | sed -n 's/^Source: //p'`
+VERSION=`dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//'`
+
+uscan --verbose --force-download --no-symlink
+
+gunzip -c ../${PACKAGE}_${VERSION}.orig.tar.gz | tar --delete --wildcards -vf - ${PACKAGE}-${VERSION}/third_party/uriparser-\*/doc/rfc\* | GZIP="--best --no-name" gzip -c > ../${PACKAGE}_${VERSION}+dfsg.orig.tar.gz
+
diff --git a/debian/rules b/debian/rules
index a295754..eee0c39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,3 +43,6 @@ override_dh_makeshlibs:
 override_dh_python:
 	dh_python2 -ppython-kml
 
+get-orig-source:
+	. debian/get-orig-source
+
diff --git a/debian/watch b/debian/watch
index f866043..e62ad8c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,10 +4,12 @@ version=3
 #
 #opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/" \
 #https://code.google.com/p/libkml/downloads/list?can=1 \
-#(?:.*/)?(?:rel|v|libkml)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))
+#(?:.*/)?(?:rel|v|libkml)[\-\_](\d[\d\-\.]+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz))) \
+#debian get-orig-source
 
 # subversion revisions
 #
 opts="dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/;s/^\d+$/1.3.0~r$&/" \
 https://code.google.com/p/libkml/source/list \
-(?:.*/)?detail\?r=(\d+)
+(?:.*/)?detail\?r=(\d+) \
+debian get-orig-source

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libkml.git