[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.3-1-36-g3f24e4e

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/telepathy-qt4.git;a=commitdiff;h=6354edf

The following commit has been merged in the master branch:
commit 6354edfd4cdd7bb1a30b1a3d537020b4dbff2cad
Author: Diane Trout <diane at ghic.org>
Date:   Tue Jun 17 22:20:33 2014 -0700

    Add get-orig-source target to repack upstream to remove minified jquery.js
---
 debian/changelog       | 3 ++-
 debian/copyright       | 2 ++
 debian/get-orig-source | 8 ++++++++
 debian/rules           | 3 +++
 debian/watch           | 5 +++--
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb59743..47a5c27 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-telepathy-qt (0.9.4-1) UNRELEASED; urgency=medium
+telepathy-qt (0.9.4+repack-1) UNSTABLE; urgency=medium
 
   * New upstream release.
   * Verify upstream pgp signature.
@@ -6,6 +6,7 @@ telepathy-qt (0.9.4-1) UNRELEASED; urgency=medium
   * Remove create_moc_command.patch. Applied upstream.
   * Remove link-against-gobject.patch. Seems unnecessary.
   * Update libtelepathy-qt4-2 symbols file.
+  * Add get-orig-source target to repack upstream to remove minified jquery.js
 
  -- Diane Trout <diane at ghic.org>  Sat, 14 Jun 2014 10:17:26 -0700
 
diff --git a/debian/copyright b/debian/copyright
index ae20f7d..bc82cb6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,6 +5,8 @@ Upstream-Contact:
     irc://irc.freenode.net/telepathy
     http://telepathy.freedesktop.org/
 Upstream-Source: http://telepathy.freedesktop.org/releases/telepathy-qt/
+Files-Excluded:
+    doc/html/jquery.js
 
 Files: *
 Copyright: © 2008-2012 Collabora Ltd.
diff --git a/debian/get-orig-source b/debian/get-orig-source
new file mode 100755
index 0000000..091d734
--- /dev/null
+++ b/debian/get-orig-source
@@ -0,0 +1,8 @@
+#!/bin/sh
+if uscan --help | grep -q -- --repack-compression ; then
+    echo "Use new enhanced uscan"
+    uscan --verbose --force-download --repack-compression xz
+    exit
+fi
+
+uscan --verbose --force-download
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 80ac957..60fede0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,3 +34,6 @@ override_dh_installdocs:
 override_dh_auto_clean:
 	dh_auto_clean
 	find . -name '*.pyc' -exec rm {} \;
+
+get-orig-source:
+	. debian/get-orig-source
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index 6158770..3de8af7 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
 version=3
-opts=pgpsigurlmangle=s/$/.asc/ \
-http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-(.*).tar.gz
+opts=pgpsigurlmangle=s/$/.asc/,dversionmangle=s/[~\+]repack// \
+http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-(.*).tar.gz \
+    debian debian/get-orig-source

-- 
telepathy-qt4 packaging