rev 19668 - kde-extras/strigi/trunk/debian

Pino Toscano pino at alioth.debian.org
Sun Aug 4 20:27:30 UTC 2013 

Author: pino
Date: 2013-08-04 20:27:29 +0000 (Sun, 04 Aug 2013)
New Revision: 19668

Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/control
   kde-extras/strigi/trunk/debian/libsearchclient-dev.install
   kde-extras/strigi/trunk/debian/libsearchclient0.install
   kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install
   kde-extras/strigi/trunk/debian/libstreamanalyzer0.install
   kde-extras/strigi/trunk/debian/libstreams-dev.install
   kde-extras/strigi/trunk/debian/libstreams0.install
   kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install
   kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install
   kde-extras/strigi/trunk/debian/libstrigiqtdbusclient-dev.install
   kde-extras/strigi/trunk/debian/libstrigiqtdbusclient0.install
   kde-extras/strigi/trunk/debian/rules
Log:
revert the m-a work, keeping the libdir as it was before

changing the library paths (and thus the module path) potentially breaks the
reference to strigi libs in other cmake config files, and surely it breaks
strigi modules installed by 3rd parties


Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/changelog	2013-08-04 20:27:29 UTC (rev 19668)
@@ -6,10 +6,8 @@
   * Remove upstream_gcc47-fix-unistd.h-header-required-unconditionally-
     f.patch, already applied upstream.
   * Remove id3_crash_fix.diff, already applied upstream.
-  * Update install files for m-a paths.
   * Bump Standards-Version to 3.9.4.
   * Add myself to uploaders.
-  * Add Pre-Depends for m-a.
   * Update vcs fields.
   * Add symbols files.
   * Avoid symbols for internal so files.
@@ -18,6 +16,10 @@
     http://www.forallsecure.com/bug-
     reports/18bb7c6dfe2b4ae87a2937f9678b812bb1bd5c8d/
 
+  [ Pino Toscano ]
+  * Force the libdir to the non-multiarch path, to keep compatibility with
+    what has been done so far.
+
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Tue, 02 Jul 2013 10:30:18 +0200
 
 strigi (0.7.7-3) unstable; urgency=low

Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/control	2013-08-04 20:27:29 UTC (rev 19668)
@@ -87,7 +87,6 @@
 Package: libstreams0
 Architecture: any
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: strigi-daemon (<< 0.3.11-1)
 Description: streams library for for Strigi Desktop Search
@@ -109,7 +108,6 @@
 Package: libstreamanalyzer0
 Architecture: any
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: kdegraphics-strigi-plugins (<< 4:4.0.0-2),
           libcluceneindex0 (<< 0.5.6-1),
@@ -139,7 +137,6 @@
 Package: libsearchclient0
 Architecture: any
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: strigi-daemon (<< 0.3.11-1)
 Description: searchclient library for Strigi Desktop Search
@@ -163,7 +160,6 @@
 Package: libstrigihtmlgui0
 Architecture: any
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for writing html clients for Strigi Desktop Search
  This package is part of Strigi Desktop Search, it contains a library for
@@ -186,7 +182,6 @@
 Package: libstrigiqtdbusclient0
 Architecture: any
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: library for writing D-Bus clients for Strigi Desktop Search
  This package is part of Strigi Desktop Search, it contains a library for

Modified: kde-extras/strigi/trunk/debian/libsearchclient-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libsearchclient-dev.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libsearchclient-dev.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -2,5 +2,5 @@
 usr/include/strigi/asyncsocketclient.h
 usr/include/strigi/clientinterface.h
 usr/include/strigi/socketclient.h
-usr/lib/*/libsearchclient.so
-usr/lib/*/cmake/LibSearchClient/LibSearchClientConfig.cmake
+usr/lib/libsearchclient.so
+usr/lib/cmake/LibSearchClient/LibSearchClientConfig.cmake

Modified: kde-extras/strigi/trunk/debian/libsearchclient0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libsearchclient0.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libsearchclient0.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -1 +1 @@
-usr/lib/*/libsearchclient.so.0*
+usr/lib/libsearchclient.so.0*

Modified: kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstreamanalyzer-dev.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -24,6 +24,6 @@
 usr/include/strigi/streamthroughanalyzer.h
 usr/include/strigi/strigi_thread.h
 usr/include/strigi/variant.h
-usr/lib/*/libstreamanalyzer.so
-usr/lib/*/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
-usr/lib/*/pkgconfig/libstreamanalyzer.pc
+usr/lib/libstreamanalyzer.so
+usr/lib/cmake/LibStreamAnalyzer/LibStreamAnalyzerConfig.cmake
+usr/lib/pkgconfig/libstreamanalyzer.pc

Modified: kde-extras/strigi/trunk/debian/libstreamanalyzer0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreamanalyzer0.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstreamanalyzer0.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -1,8 +1,8 @@
-usr/lib/*/libstreamanalyzer.so.0*
-usr/lib/*/strigi/strigiea_*
-usr/lib/*/strigi/strigiindex_*
-usr/lib/*/strigi/strigila_*
-usr/lib/*/strigi/strigita_*
+usr/lib/libstreamanalyzer.so.0*
+usr/lib/strigi/strigiea_*
+usr/lib/strigi/strigiindex_*
+usr/lib/strigi/strigila_*
+usr/lib/strigi/strigita_*
 usr/share/strigi/fieldproperties/homeless.rdfs
 usr/share/strigi/fieldproperties/nao_data.rdfs
 usr/share/strigi/fieldproperties/ncal_data.rdfs

Modified: kde-extras/strigi/trunk/debian/libstreams-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreams-dev.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstreams-dev.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -27,9 +27,9 @@
 usr/include/strigi/tarinputstream.h
 usr/include/strigi/textutils.h
 usr/include/strigi/zipinputstream.h
-usr/lib/*/libstreams.so
-usr/lib/*/cmake/LibStreams/LibStreamsConfig.cmake
-usr/lib/*/cmake/LibStreams/LibStreamsTargets-relwithdebinfo.cmake
-usr/lib/*/cmake/LibStreams/LibStreamsTargets.cmake
-usr/lib/*/pkgconfig/libstreams.pc
-usr/lib/*/cmake/Strigi/StrigiConfig.cmake
+usr/lib/libstreams.so
+usr/lib/cmake/LibStreams/LibStreamsConfig.cmake
+usr/lib/cmake/LibStreams/LibStreamsTargets-relwithdebinfo.cmake
+usr/lib/cmake/LibStreams/LibStreamsTargets.cmake
+usr/lib/pkgconfig/libstreams.pc
+usr/lib/cmake/Strigi/StrigiConfig.cmake

Modified: kde-extras/strigi/trunk/debian/libstreams0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreams0.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstreams0.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -1 +1 @@
-usr/lib/*/libstreams.so.0*
+usr/lib/libstreams.so.0*

Modified: kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstrigihtmlgui-dev.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -1,2 +1,2 @@
 usr/include/strigi/strigihtmlgui.h
-usr/lib/*/libstrigihtmlgui.so
+usr/lib/libstrigihtmlgui.so

Modified: kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstrigihtmlgui0.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -1 +1 @@
-usr/lib/*/libstrigihtmlgui.so.0*
+usr/lib/libstrigihtmlgui.so.0*

Modified: kde-extras/strigi/trunk/debian/libstrigiqtdbusclient-dev.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigiqtdbusclient-dev.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstrigiqtdbusclient-dev.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -2,4 +2,4 @@
 usr/include/strigi/qtdbus/strigiclient.h
 usr/include/strigi/qtdbus/strigidbus.h
 usr/include/strigi/qtdbus/strigitypes.h
-usr/lib/*/libstrigiqtdbusclient.so
+usr/lib/libstrigiqtdbusclient.so

Modified: kde-extras/strigi/trunk/debian/libstrigiqtdbusclient0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstrigiqtdbusclient0.install	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/libstrigiqtdbusclient0.install	2013-08-04 20:27:29 UTC (rev 19668)
@@ -1 +1 @@
-usr/lib/*/libstrigiqtdbusclient.so.0*
+usr/lib/libstrigiqtdbusclient.so.0*

Modified: kde-extras/strigi/trunk/debian/rules
===================================================================
--- kde-extras/strigi/trunk/debian/rules	2013-08-04 20:20:14 UTC (rev 19667)
+++ kde-extras/strigi/trunk/debian/rules	2013-08-04 20:27:29 UTC (rev 19668)
@@ -8,16 +8,16 @@
 URL := http://www.vandenoever.info/software/strigi/$(UPFILENAME)
 CURRENTVERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 LIBPKGS := $(filter-out %-dev,$(filter lib%,$(shell dh_listpackages)))
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 %:
 	dh $@ --parallel --list-missing --dbg-package=strigi-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON -DENABLE_REGENERATEXSD=OFF
+	dh_auto_configure -- -DCMAKE_SKIP_RPATH=ON -DENABLE_REGENERATEXSD=OFF \
+		-DCMAKE_INSTALL_LIBDIR=lib
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V -X/usr/lib/$(DEB_HOST_MULTIARCH)/strigi
+	dh_makeshlibs -V -Xusr/lib/strigi
 	for pkg in $(LIBPKGS); do \
 		sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$$pkg/DEBIAN/shlibs >> debian/shlibs.local; \
 	done

More information about the pkg-kde-commits mailing list