rev 17366 - in trunk/packages/soprano/debian: . patches

Modestas Vainius modax at alioth.debian.org
Sat Mar 6 00:52:51 UTC 2010 

Author: modax
Date: 2010-03-06 00:52:51 +0000 (Sat, 06 Mar 2010)
New Revision: 17366

Added:
   trunk/packages/soprano/debian/patches/02_disable_usr_lib_install_rpath.diff
Removed:
   trunk/packages/soprano/debian/patches/02_build_with_visibility_hidden.diff
Modified:
   trunk/packages/soprano/debian/changelog
   trunk/packages/soprano/debian/control
   trunk/packages/soprano/debian/libsoprano-dev.install
   trunk/packages/soprano/debian/libsoprano4.symbols
   trunk/packages/soprano/debian/patches/series
   trunk/packages/soprano/debian/watch
Log:
* Make soprano-daemon suggest virtuoso-minimal.
* Add a note to soprano-daemon description that it is not intended to be used
  directly by end users (see thread in #546199).
* Drop 02_build_with_visibility_hidden.diff patch, merged upstream.
* Update symbol file.
* Add patch 02_disable_usr_lib_install_rpath.diff to get rid of /usr/lib
  RPATH.
* Upgrade libsoprano4 to soprano-dbg Depends.
* Fix debian/watch:
  - dversionmangle dfsg.1 suffix;
  - remove bogus excess lines.
* Update libsoprano-dev.install.

Modified: trunk/packages/soprano/debian/changelog
===================================================================
--- trunk/packages/soprano/debian/changelog	2010-03-06 00:29:49 UTC (rev 17365)
+++ trunk/packages/soprano/debian/changelog	2010-03-06 00:52:51 UTC (rev 17366)
@@ -1,9 +1,23 @@
-soprano (2.4.1+dfsg.1-1) UNRELEASED; urgency=low
+soprano (2.4.1+dfsg.1-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>>  Fri, 05 Mar 2010 08:56:00 +0100
+  [ Modestas Vainius ]
+  * Make soprano-daemon suggest virtuoso-minimal.
+  * Add a note to soprano-daemon description that it is not intended to be used
+    directly by end users (see thread in #546199).
+  * Drop 02_build_with_visibility_hidden.diff patch, merged upstream.
+  * Update symbol file.
+  * Add patch 02_disable_usr_lib_install_rpath.diff to get rid of /usr/lib
+    RPATH.
+  * Upgrade libsoprano4 to soprano-dbg Depends.
+  * Fix debian/watch:
+    - dversionmangle dfsg.1 suffix;
+    - remove bogus excess lines.
+  * Update libsoprano-dev.install.
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 06 Mar 2010 02:45:14 +0200
+
 soprano (2.4.0.1+dfsg.1-2) unstable; urgency=low
 
   * Downgrade libsoprano-doc to priority: extra.

Modified: trunk/packages/soprano/debian/control
===================================================================
--- trunk/packages/soprano/debian/control	2010-03-06 00:29:49 UTC (rev 17365)
+++ trunk/packages/soprano/debian/control	2010-03-06 00:52:51 UTC (rev 17366)
@@ -16,6 +16,7 @@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: libsoprano4
+Suggests: virtuoso-minimal
 Conflicts: libsoprano4 (<< 2.3.0+dfsg.1-1), libsoprano-dev (<< 2.3.0+dfsg.1-1)
 Replaces: libsoprano4 (<< 2.3.0+dfsg.1-1), libsoprano-dev (<< 2.3.0+dfsg.1-1)
 Description: daemon for the Soprano RDF framework
@@ -25,8 +26,10 @@
  modular structure allows it to use various different RDF storage
  implementations as its backend.
  .
- This package contains the Soprano daemon, D-Bus service, parser
- plugins, and a storage plugin for the Redland RDF Application Framework.
+ This package contains the Soprano daemon, D-Bus service, parser plugins, and a
+ storage plugin for the Redland RDF Application Framework. This package is not
+ intended to be neither directly installed nor used by end users. It will be
+ installed automatically whenever needed.
 
 Package: libsoprano4
 Section: libs
@@ -48,7 +51,7 @@
 Priority: extra
 Section: debug
 Architecture: any
-Suggests: libsoprano4 (= ${binary:Version})
+Depends: ${misc:Depends}, libsoprano4 (= ${binary:Version})
 Description: debugging symbols for the Soprano RDF framework
  Soprano is a pluggable RDF storage, parsing, and serialization framework based
  on Qt 4.  Soprano is targeted at desktop applications that need to store RDF

Modified: trunk/packages/soprano/debian/libsoprano-dev.install
===================================================================
--- trunk/packages/soprano/debian/libsoprano-dev.install	2010-03-06 00:29:49 UTC (rev 17365)
+++ trunk/packages/soprano/debian/libsoprano-dev.install	2010-03-06 00:52:51 UTC (rev 17366)
@@ -145,6 +145,9 @@
 usr/lib/libsopranoindex.so
 usr/lib/libsopranoserver.so
 usr/lib/pkgconfig/soprano.pc
+usr/lib/pkgconfig/sopranoclient.pc
+usr/lib/pkgconfig/sopranoindex.pc
+usr/lib/pkgconfig/sopranoserver.pc
 usr/share/dbus-1/interfaces/org.soprano.Model.xml
 usr/share/dbus-1/interfaces/org.soprano.NodeIterator.xml
 usr/share/dbus-1/interfaces/org.soprano.QueryResultIterator.xml

Modified: trunk/packages/soprano/debian/libsoprano4.symbols
===================================================================
--- trunk/packages/soprano/debian/libsoprano4.symbols	2010-03-06 00:29:49 UTC (rev 17365)
+++ trunk/packages/soprano/debian/libsoprano4.symbols	2010-03-06 00:52:51 UTC (rev 17366)
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 2.4.0.1 amd64 i386
+# SymbolsHelper-Confirmed: 2.4.1 armel sparc
 libsoprano.so.4 libsoprano4 #MINVER#
 * Build-Depends-Package: libsoprano-dev
  (optional=external)_Z5qHashRK4QUrl at Base 2.1.67
@@ -2273,7 +2273,9 @@
 * Build-Depends-Package: libsoprano-dev
  (optional=external)_Z6qDebugv at Base 2.1.1
  (optional=external)_ZN10QByteArrayD1Ev at Base 2.1.1
+ (optional=external)_ZN11QStringListD1Ev at Base 2.4.1
  (optional=external)_ZN12QMutexLockerD1Ev at Base 2.1.1
+ (optional=external|arch=sparc)_ZN15QBasicAtomicInt3refEv at Base 2.4.1
  (optional=templinst)_ZN18QSharedDataPointerIN7Soprano5Index8QueryHit7PrivateEED1Ev at Base 2.1.1
  (optional=templinst)_ZN18QSharedDataPointerIN7Soprano8IteratorINS0_5Index8QueryHitEE7PrivateEED1Ev at Base 2.1.1
  (optional=templinst)_ZN18QSharedDataPointerIN7TString7PrivateEED1Ev at Base 2.1.1
@@ -2291,6 +2293,7 @@
  (optional=templinst)_ZN5QListI7QStringE13detach_helperEv at Base 2.1.1
  (optional=templinst)_ZN5QListI7QStringE4freeEPN9QListData4DataE at Base 2.1.1
  (optional=templinst)_ZN5QListI7QStringE6appendERKS0_ at Base 2.1.1
+ (optional=templinst)_ZN5QListI7QStringED2Ev at Base 2.4.1
  (optional=external)_ZN6QDebugD1Ev at Base 2.1.1
  (optional=external)_ZN6QDebuglsEPKc at Base 2.1.1
  (optional=external)_ZN6QDebuglsERK7QString at Base 2.1.1
@@ -2381,13 +2384,12 @@
  _ZN7Soprano5Index8QueryHitaSERKS1_ at Base 2.1.1
  (optional=templinst)_ZN7Soprano8IteratorINS_10BindingSetEE4nextEv at Base 2.1.1
  (optional=templinst)_ZN7Soprano8IteratorINS_5Index8QueryHitEE4nextEv at Base 2.1.1
- (optional=templinst)_ZN7Soprano8IteratorINS_5Index8QueryHitEE5closeEv at Base 2.4.0.1
  (optional=templinst)_ZN7Soprano8IteratorINS_5Index8QueryHitEEC1EPNS_15IteratorBackendIS2_EE at Base 2.1.1
+ (optional=templinst)_ZN7Soprano8IteratorINS_5Index8QueryHitEEC1ERKS3_ at Base 2.4.1
  (optional=templinst)_ZN7Soprano8IteratorINS_5Index8QueryHitEEC1Ev at Base 2.1.1
  (optional=templinst)_ZN7Soprano8IteratorINS_5Index8QueryHitEED0Ev at Base 2.1.1
  (optional=templinst)_ZN7Soprano8IteratorINS_5Index8QueryHitEED1Ev at Base 2.1.1
  (optional=templinst)_ZN7Soprano8IteratorINS_9StatementEE4nextEv at Base 2.1.1
- (optional=templinst)_ZN7Soprano8IteratorINS_9StatementEE5closeEv at Base 2.4.0.1
  _ZN7TString8fromUtf8EPKc at Base 2.1.1
  _ZN7TStringC1EPKwb at Base 2.1.1
  _ZN7TStringC1ERK7QString at Base 2.1.1

Added: trunk/packages/soprano/debian/patches/02_disable_usr_lib_install_rpath.diff
===================================================================
--- trunk/packages/soprano/debian/patches/02_disable_usr_lib_install_rpath.diff	                        (rev 0)
+++ trunk/packages/soprano/debian/patches/02_disable_usr_lib_install_rpath.diff	2010-03-06 00:52:51 UTC (rev 17366)
@@ -0,0 +1,24 @@
+From: Modestas Vainius <modax at debian.org>
+Subject: Do not set install RPATH to /usr/lib by default
+ /usr/lib RPATH is disallowed on Debian systems and is a bad practise in
+  general
+Forwarded: not-needed
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -129,15 +129,6 @@
+ set(PKGCONFIG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig/" CACHE STRING "Base directory for pkgconfig files")
+ 
+ 
+-# 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,
+-# but then removes the RPATH when installing.
+-# These two options below make it set the RPATH of the installed targets to all
+-# RPATH directories outside the current CMAKE_BINARY_DIR and also the library
+-# install directory. Alex
+-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
+-set(CMAKE_INSTALL_RPATH                ${LIB_DESTINATION} )
+-
+ if(APPLE)
+    set(CMAKE_INSTALL_NAME_DIR ${LIB_DESTINATION})
+ endif(APPLE)

Modified: trunk/packages/soprano/debian/patches/series
===================================================================
--- trunk/packages/soprano/debian/patches/series	2010-03-06 00:29:49 UTC (rev 17365)
+++ trunk/packages/soprano/debian/patches/series	2010-03-06 00:52:51 UTC (rev 17366)
@@ -1,2 +1,2 @@
 01_x11_not_required.diff
-02_build_with_visibility_hidden.diff
+02_disable_usr_lib_install_rpath.diff

Modified: trunk/packages/soprano/debian/watch
===================================================================
--- trunk/packages/soprano/debian/watch	2010-03-06 00:29:49 UTC (rev 17365)
+++ trunk/packages/soprano/debian/watch	2010-03-06 00:52:51 UTC (rev 17366)
@@ -1,7 +1,4 @@
 version=3
 
-opts=dversionmangle=s/~/-/ \
+opts=dversionmangle=s/~/-/;s/\+dfsg.1// \
 http://sf.net/soprano/soprano-(.*)\.tar\.bz2
-
-ftp://upload.sourceforge.net/pub/sourceforge/s/so/soprano/ \
-  soprano-(.*)\.tar\.bz2

More information about the pkg-kde-commits mailing list