[SCM] Soprano RDF Framework packaging branch, master, updated. debian/2.9.2+dfsg.1-3-3-ga0e17ac

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit d1ad4d26a12b4b21bac328a799e345f4c6487efe
Author: Pino Toscano <pino at debian.org>
Date:   Tue Aug 6 15:54:15 2013 +0200

    remove last bits of multiarch
    
    soprano is not read for it and would require more work to also not
    break rdepends:
    - drop patch add_m-a_dirs_to_the_search_path.diff
    - remove Pre-Depends
---
 debian/changelog                                   |    5 +++
 debian/control                                     |    2 -
 .../patches/add_m-a_dirs_to_the_search_path.diff   |   47 --------------------
 debian/patches/series                              |    1 -
 debian/rules                                       |    2 -
 5 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa758f7..19c0952 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 soprano (2.9.2+dfsg.1-4) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Remove last bits of multiarch, since soprano is not read for it and
+    would require more work to also not break rdepends:
+    - drop patch add_m-a_dirs_to_the_search_path.diff
+    - remove Pre-Depends
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 06 Aug 2013 14:31:42 +0200
 
diff --git a/debian/control b/debian/control
index 068f0ab..12e304a 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-req/soprano.git
 Package: soprano-daemon
 Section: utils
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libsoprano4 (= ${binary:Version})
 Suggests: virtuoso-minimal
@@ -38,7 +37,6 @@ Description: daemon for the Soprano RDF framework
 
 Package: libsoprano4
 Architecture: any
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, soprano-daemon (= ${binary:Version})
 Conflicts: libsoprano3
 Replaces: libsoprano3
diff --git a/debian/patches/add_m-a_dirs_to_the_search_path.diff b/debian/patches/add_m-a_dirs_to_the_search_path.diff
deleted file mode 100644
index ae88428..0000000
--- a/debian/patches/add_m-a_dirs_to_the_search_path.diff
+++ /dev/null
@@ -1,47 +0,0 @@
-commit ae27fd59085fdddc1a167c2ce35f5be52e75ef35
-Author: Maximiliano Curia <maxy at debian.org>
-Date:   Fri Jun 7 12:36:07 2013 +0200
-
-    Add m-a dirs to the search path.
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f96c97..173a864 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -143,6 +143,21 @@ set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Li
- set(INCLUDE_INSTALL_DIR      "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "The subdirectory to the header prefix")
- set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
- 
-+find_program (
-+  DPKG_ARCHITECTURE
-+  NAMES dpkg-architecture
-+  )
-+if (DPKG_ARCHITECTURE)
-+    execute_process (
-+        COMMAND ${DPKG_ARCHITECTURE} -qDEB_HOST_MULTIARCH
-+        OUTPUT_VARIABLE DEB_HOST_MULTIARCH
-+    )
-+    if (DEB_HOST_MULTIARCH)
-+        string(REPLACE "
" "" DEB_HOST_MULTIARCH ${DEB_HOST_MULTIARCH})
-+        add_definitions(-DDEB_HOST_MULTIARCH="${DEB_HOST_MULTIARCH}")
-+    endif (DEB_HOST_MULTIARCH)
-+endif (DPKG_ARCHITECTURE)
-+
- 
- # Set up RPATH handling, so the libs are found if they are installed to a non-standard location.
- # By default cmake builds the targets with full RPATH to everything in the build directory,
-diff --git a/soprano/sopranodirs.cpp b/soprano/sopranodirs.cpp
-index e6292af..9f302b1 100644
---- a/soprano/sopranodirs.cpp
-+++ b/soprano/sopranodirs.cpp
-@@ -132,6 +132,10 @@ QStringList Soprano::libDirs()
- #else
-     paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX );
-     paths << QLatin1String( "/usr/local/lib"SOPRANO_LIB_SUFFIX );
-+#ifdef DEB_HOST_MULTIARCH
-+    paths << QLatin1String( "/usr/lib"SOPRANO_LIB_SUFFIX"/"DEB_HOST_MULTIARCH );
-+    paths << QLatin1String( "/usr/local/lib/"SOPRANO_LIB_SUFFIX"/"DEB_HOST_MULTIARCH );
-+#endif
-     paths += Soprano::envDirList( "LD_LIBRARY_PATH" );
- #endif
-     return paths;
diff --git a/debian/patches/series b/debian/patches/series
index c3eecb9..baed4bb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 redland_raptor2_support.h
-add_m-a_dirs_to_the_search_path.diff
diff --git a/debian/rules b/debian/rules
index 7e1f4fa..4ffbe85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,6 @@ builddir = Build
 
 dh = --builddirectory=$(builddir)
 
-DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
 override_dh_auto_configure:

-- 
Soprano RDF Framework packaging