[SCM] qapt packaging branch, master, updated. debian/1.3.0-1

Kai Wasserbäch curan at alioth.debian.org
Sun Mar 18 19:42:37 UTC 2012


The following commit has been merged in the master branch:
commit bb693063009be802395d9cb66635c516e8315a76
Author: Kai Wasserbäch <curan at debian.org>
Date:   Sun Mar 18 19:22:40 2012 +0100

    New upstream release (release to unstable).
    
    Changes required after merge:
    * debian/patches/Fix-FTBFS-due-to-symbol-collision.patch: Deleted, merged
      upstream.
---
 debian/changelog                                   |    7 +++++--
 .../Fix-FTBFS-due-to-symbol-collision.patch        |   18 ------------------
 debian/patches/series                              |    1 -
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 75a98eb..67a02f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,19 @@
-qapt (1.2.2-2) UNRELEASED; urgency=low
+qapt (1.3.0-1) UNRELEASED; urgency=low
 
+  * New upstream release (release to unstable).
   * debian/gbp.conf: Added to ensure pristine-tar usage and signed tags.
   * debian/watch: use git-import-orig.
   * debian/control: Added Vcs-{Git,Browser} fields.
   * debian/rules:
     - Remove override for dh_strip, not needed.
     - Added .PHONY line.
+  * debian/patches/Fix-FTBFS-due-to-symbol-collision.patch: Deleted, merged
+    upstream.
 
   [ Pino Toscano ]
   * Drop patch Fix-spelling-errors.patch, which breaks translations.
 
- -- Kai Wasserbäch <curan at debian.org>  Wed, 14 Dec 2011 18:56:08 +0100
+ -- Kai Wasserbäch <curan at debian.org>  Sun, 18 Mar 2012 19:18:59 +0100
 
 qapt (1.2.2-1) experimental; urgency=low
 
diff --git a/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch b/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch
deleted file mode 100644
index b55c10a..0000000
--- a/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Subject: Fix FTBFS because Qt and Xapian both define "slots".
-From: Kai Wasserbäch <curan at debian.org>
-Last-Update: 2011-12-11
-Forwarded: http://commits.kde.org/libqapt/88a1292e56cfaf72e417fcbca5ee6efaa31388af
----
- src/backend.cpp |    1 +
- 1 file changed, 1 insertion(+)
-
---- a/src/backend.cpp
-+++ b/src/backend.cpp
-@@ -40,6 +40,7 @@
- #include <apt-pkg/tagfile.h>
- 
- // Xapian includes
-+#undef slots
- #include <xapian.h>
- 
- // QApt includes
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 42bba69..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-Fix-FTBFS-due-to-symbol-collision.patch

-- 
qapt packaging



More information about the pkg-kde-commits mailing list