[SCM] telepathy-qt4 packaging branch, master, updated. debian/0.9.5+dfsg-2-8-gfe10d70

Diane Trout diane-guest at moszumanska.debian.org
Thu May 21 17:55:44 UTC 2015


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

The following commit has been merged in the master branch:
commit da13374ce87e8d23b325a23f9698a8a0765e9cd3
Author: Diane Trout <diane at ghic.org>
Date:   Thu May 7 13:10:19 2015 -0700

    Move uscan --repack command out of seperate script and into debian/rules
---
 debian/changelog       | 4 +++-
 debian/get-orig-source | 8 --------
 debian/rules           | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa2830b..62545ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,9 @@ telepathy-qt (0.9.5+dfsg-3) UNRELEASED; urgency=medium
   * Add myself and Michał Zając to the debian/copyright block
   * Disable python-dbus, python-gobject build-depends as they are
     for disabled tests.
-    
+  * Move uscan --repack command out of seperate script and into
+    debian/rules
+
  -- Diane Trout <diane at ghic.org>  Wed, 06 May 2015 20:29:53 -0700
 
 telepathy-qt (0.9.5+dfsg-2) unstable; urgency=medium
diff --git a/debian/get-orig-source b/debian/get-orig-source
deleted file mode 100755
index aa64036..0000000
--- a/debian/get-orig-source
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-if uscan --help | grep -q -- --repack ; 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 b124781..837065d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,4 +51,4 @@ override_dh_auto_clean:
 	rm -rf $(BUILD_QT5)
 
 get-orig-source:
-	. debian/get-orig-source
+	uscan --verbose --force-download --repack --compression xz

-- 
telepathy-qt4 packaging



More information about the pkg-kde-commits mailing list