[SCM] qapt packaging branch, master, updated. debian/1.2.2-1-7-gebc3bfc

Kai Wasserbäch curan at alioth.debian.org
Fri Dec 16 13:08:13 UTC 2011


The following commit has been merged in the master branch:
commit ebc3bfc29d9f88a4a19c0a8705e014aaac5750ff
Author: Kai Wasserbäch <curan at debian.org>
Date:   Fri Dec 16 14:07:37 2011 +0100

    The same patch has been applied upstream, reference that.
---
 .../Fix-FTBFS-due-to-symbol-collision.patch        |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch b/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch
index 120758b..b55c10a 100644
--- a/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch
+++ b/debian/patches/Fix-FTBFS-due-to-symbol-collision.patch
@@ -1,7 +1,7 @@
 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
+Forwarded: http://commits.kde.org/libqapt/88a1292e56cfaf72e417fcbca5ee6efaa31388af
 ---
  src/backend.cpp |    1 +
  1 file changed, 1 insertion(+)

-- 
qapt packaging



More information about the pkg-kde-commits mailing list