[SCM] qapt packaging branch, experimental, updated. debian/1.4.0-1-8-gc137efa

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Wed Jan 23 13:19:17 UTC 2013


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

The following commit has been merged in the experimental branch:
commit b1c965593cb2d2256a201544cba0a9d676081612
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed Jan 23 13:57:52 2013 +0100

    Don't call git-import-orig in debian/watch.
---
 debian/changelog |    3 +++
 debian/watch     |    3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93bd1f1..aaf8f90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ qapt (1.4.0-2) UNRELEASED; urgency=low
     because the patch freeze_with_apt-listbugs_and_apt-listchanges.diff in this
     package and apt-listbugs hang debconf-kde because some debconf commands were
     not implemented in debconf-kde.
+  * Don't call git-import-orig in debian/watch, it doesn't work properly with
+    branches, for instance if you have an 'experimental' branch with the latest
+    version of the software it will commit to the master branch anyway.
 
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Fri, 23 Nov 2012 18:04:08 +0100
 
diff --git a/debian/watch b/debian/watch
index 758bfe2..b76db5e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 version=3
 
 opts=pasv \
-  ftp://ftp.kde.org/pub/kde/stable/libqapt/([\d\.]+)/src/libqapt-([\d\.]+)\.tar\.bz2 \
-  debian git-import-orig
+  ftp://ftp.kde.org/pub/kde/stable/libqapt/([\d\.]+)/src/libqapt-([\d\.]+)\.tar\.bz2

-- 
qapt packaging



More information about the pkg-kde-commits mailing list