[SCM] qapt packaging branch, master, updated. 660dae1439dada9395eaa525463c6ac52c4198f7

Kai Wasserbäch curan at alioth.debian.org
Sun Dec 11 12:30:27 UTC 2011


The following commit has been merged in the master branch:
commit bdaabec2ee2e0ca19299814e08e3102c2b830a81
Author: Kai Wasserbäch <curan at debian.org>
Date:   Sun Dec 11 12:54:18 2011 +0100

    debian/patches/Fix-FTBFS-due-to-symbol-collision.patch: Added.
---
 debian/changelog                                   |    1 +
 .../Fix-FTBFS-due-to-symbol-collision.patch        |   18 ++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9edb45e..f8903f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,5 +11,6 @@ qapt (1.2.2-1) UNRELEASED; urgency=low
   * debian/source.lintian-overrides: Added (temp. only).
   * debian/source/{local-,}options: Added.
   * debian/copyright: Added myself.
+  * debian/patches/Fix-FTBFS-due-to-symbol-collision.patch: Added.
 
  -- Kai Wasserbäch <curan at debian.org>  Sun, 27 Nov 2011 13:56:01 +0100
diff --git a/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch b/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch
new file mode 100644
index 0000000..120758b
--- /dev/null
+++ b/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch
@@ -0,0 +1,18 @@
+Subject: Fix FTBFS because Qt and Xapian both define "slots".
+From: Kai Wasserbäch <curan at debian.org>
+Last-Update: 2011-12-11
+Forwarded: no
+---
+ 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
new file mode 100644
index 0000000..42bba69
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Fix-FTBFS-due-to-symbol-collision.patch

-- 
qapt packaging



More information about the pkg-kde-commits mailing list