[SCM] Soprano RDF Framework packaging branch, experimental, updated. debian/2.9.3+dfsg-1-6-gfda9285

Maximiliano Curia maxy at alioth.debian.org
Mon Nov 4 13:05:36 UTC 2013


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/soprano.git;a=commitdiff;h=2f0be5b

The following commit has been merged in the experimental branch:
commit 2f0be5b3fa757fe77203a1beac1b9f9a4b45ef13
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Nov 4 13:16:33 2013 +0100

    Remove obsolete patch: x11_not_required.diff.
---
 debian/changelog                     |    1 +
 debian/patches/x11_not_required.diff |   15 ---------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cdd5b5e..60fea17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ soprano (2.9.4+dfsg-1) UNRELEASED; urgency=low
   * Update patch: add_library_architecture_to_libDirs.patch.
   * Remove patch: upstream_find-clucene-shared.diff, already applied by
     upstream.
+  * Remove obsolete patch: x11_not_required.diff.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 04 Nov 2013 12:54:35 +0100
 
diff --git a/debian/patches/x11_not_required.diff b/debian/patches/x11_not_required.diff
deleted file mode 100644
index 0354185..0000000
--- a/debian/patches/x11_not_required.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix wrong check. X11 isn't required.
-Author: Fathi Boudra <fabo at debian.org>
-Forwarded: not-needed
-
---- a/cmake/modules/FindQt4.cmake
-+++ b/cmake/modules/FindQt4.cmake
-@@ -1211,7 +1211,7 @@ QT4_ADD_DBUS_INTERFACES(<srcList> <files
-   IF(UNIX)
-     # on OS X X11 may not be required
-     IF (Q_WS_X11)
--      FIND_PACKAGE(X11 REQUIRED)
-+      FIND_PACKAGE(X11)
-     ENDIF (Q_WS_X11)
-     FIND_PACKAGE(Threads)
-     SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})

-- 
Soprano RDF Framework packaging



More information about the pkg-kde-commits mailing list