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

Fathi Boudra fabo at alioth.debian.org
Tue Aug 18 15:03:14 UTC 2009 

Author: fabo
Date: 2009-08-18 15:03:13 +0000 (Tue, 18 Aug 2009)
New Revision: 15678

Added:
   kde-extras/strigi/trunk/debian/README.source
   kde-extras/strigi/trunk/debian/deskbar-plugins-strigi.install
   kde-extras/strigi/trunk/debian/libstreams0.docs
Removed:
   kde-extras/strigi/trunk/debian/docs
Modified:
   kde-extras/strigi/trunk/debian/changelog
   kde-extras/strigi/trunk/debian/control
   kde-extras/strigi/trunk/debian/copyright
   kde-extras/strigi/trunk/debian/libstreamanalyzer0.install
   kde-extras/strigi/trunk/debian/rules
Log:
 * Update debian/control:
    - drop cdbs build dependency.
    - bump debhelper and pkg-kde-tools build dependencies version.
    - bump Standards-Version from 3.8.1 to 3.8.3 (no changes needed).
    - update strigi-dbg section: debug.
  * Add debian/deskbar-plugins-strigi.install file.
  * Update debian/libstreamanalyzer0.install:
    - add new rdfs files.
  * Add debian/README.source file.
  * Convert debian/rules to dh usage.


Added: kde-extras/strigi/trunk/debian/README.source
===================================================================
--- kde-extras/strigi/trunk/debian/README.source	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/README.source	2009-08-18 15:03:13 UTC (rev 15678)
@@ -0,0 +1,6 @@
+This package uses quilt for upstream source code patch management. Please read
+/usr/share/doc/quilt/README.source for more information how to apply, unapply,
+add, modify or remove patches.
+
+Please note that /usr/share/doc/quilt/README.source is only available in quilt
+version 0.46-4.1 or later.

Modified: kde-extras/strigi/trunk/debian/changelog
===================================================================
--- kde-extras/strigi/trunk/debian/changelog	2009-08-17 17:32:58 UTC (rev 15677)
+++ kde-extras/strigi/trunk/debian/changelog	2009-08-18 15:03:13 UTC (rev 15678)
@@ -1,11 +1,23 @@
-strigi (0.7.0~rc1-1) UNRELEASED; urgency=low
+strigi (0.7.0-1) unstable; urgency=low
 
   * New upstream release.
 
+  [ Fathi Boudra ]
+  * Update debian/control:
+    - drop cdbs build dependency.
+    - bump debhelper and pkg-kde-tools build dependencies version.
+    - bump Standards-Version from 3.8.1 to 3.8.3 (no changes needed).
+    - update strigi-dbg section: debug.
+  * Add debian/deskbar-plugins-strigi.install file.
+  * Update debian/libstreamanalyzer0.install:
+    - add new rdfs files.
+  * Add debian/README.source file.
+  * Convert debian/rules to dh usage.
+
   [ Sune Vuorela ]
   * Add libstreams-dev dependency to libstrigiqtdbusclient-dev.
 
- -- Fathi Boudra <fabo at debian.org>  Thu, 23 Jul 2009 19:39:42 +0200
+ -- Fathi Boudra <fabo at debian.org>  Sun, 16 Aug 2009 19:39:42 +0200
 
 strigi (0.6.5-1) unstable; urgency=low
 

Modified: kde-extras/strigi/trunk/debian/control
===================================================================
--- kde-extras/strigi/trunk/debian/control	2009-08-17 17:32:58 UTC (rev 15677)
+++ kde-extras/strigi/trunk/debian/control	2009-08-18 15:03:13 UTC (rev 15678)
@@ -3,10 +3,10 @@
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), cmake, quilt, pkg-kde-tools (>= 0.3.1), libbz2-dev,
- libclucene-dev, libdbus-1-dev, libexiv2-dev, libqt4-dev (>= 4.4.0), libxml2-dev,
+Build-Depends: debhelper (>= 7.3.12), cmake, quilt, pkg-kde-tools (>= 0.4.11), libbz2-dev,
+ libclucene-dev, libdbus-1-dev, libexiv2-dev, libqt4-dev (>= 4.4.3), libxml2-dev,
  zlib1g-dev, libxml2-utils, python-support, python
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://strigi.sourceforge.net
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/strigi/trunk
 Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/strigi/trunk

Modified: kde-extras/strigi/trunk/debian/copyright
===================================================================
--- kde-extras/strigi/trunk/debian/copyright	2009-08-17 17:32:58 UTC (rev 15677)
+++ kde-extras/strigi/trunk/debian/copyright	2009-08-18 15:03:13 UTC (rev 15678)
@@ -1,8 +1,11 @@
-This package was debianized by Fathi Boudra <fboudra at free.fr> on
-Wed,  5 Jul 2006 11:57:10 +0200.
+This package was debianized by:
 
-It was downloaded from http://strigi.sourceforge.net
+    Fathi Boudra <fboudra at free.fr> on Wed,  5 Jul 2006 11:57:10 +0200.
 
+It was downloaded from:
+
+    http://strigi.sourceforge.net
+
 Upstream Authors:
 
     Jos van den Oever <jos at vandenoever.info>
@@ -92,5 +95,8 @@
 On Debian systems, the complete text of the GNU Lesser General
 Public License can be found in `/usr/share/common-licenses/LGPL'.
 
-The Debian packaging is © 2006, Fathi Boudra <fboudra at free.fr> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is:
+
+    © 2006-2009 Fathi Boudra <fabo at debian.org>
+
+and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Added: kde-extras/strigi/trunk/debian/deskbar-plugins-strigi.install
===================================================================
--- kde-extras/strigi/trunk/debian/deskbar-plugins-strigi.install	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/deskbar-plugins-strigi.install	2009-08-18 15:03:13 UTC (rev 15678)
@@ -0,0 +1 @@
+src/searchclient/strigi.py usr/lib/deskbar-applet/handlers/

Modified: kde-extras/strigi/trunk/debian/libstreamanalyzer0.install
===================================================================
--- kde-extras/strigi/trunk/debian/libstreamanalyzer0.install	2009-08-17 17:32:58 UTC (rev 15677)
+++ kde-extras/strigi/trunk/debian/libstreamanalyzer0.install	2009-08-18 15:03:13 UTC (rev 15678)
@@ -1,10 +1,15 @@
 usr/lib/libstreamanalyzer.so.*
+usr/lib/strigi/strigiea_*
 usr/lib/strigi/strigiindex_*
-usr/lib/strigi/strigiea_*
 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
+usr/share/strigi/fieldproperties/nco_data.rdfs
+usr/share/strigi/fieldproperties/nexif_data.rdfs
+usr/share/strigi/fieldproperties/nfo_data.rdfs
+usr/share/strigi/fieldproperties/nid3_data.rdfs
+usr/share/strigi/fieldproperties/nie_data.rdfs
+usr/share/strigi/fieldproperties/nmo_data.rdfs
 usr/share/strigi/fieldproperties/strigi.rdfs
-usr/share/strigi/fieldproperties/xesam-convenience.rdfs
-usr/share/strigi/fieldproperties/xesam.rdfs
-

Added: kde-extras/strigi/trunk/debian/libstreams0.docs
===================================================================
--- kde-extras/strigi/trunk/debian/libstreams0.docs	                        (rev 0)
+++ kde-extras/strigi/trunk/debian/libstreams0.docs	2009-08-18 15:03:13 UTC (rev 15678)
@@ -0,0 +1,2 @@
+README
+TODO

Modified: kde-extras/strigi/trunk/debian/rules
===================================================================
--- kde-extras/strigi/trunk/debian/rules	2009-08-17 17:32:58 UTC (rev 15677)
+++ kde-extras/strigi/trunk/debian/rules	2009-08-18 15:03:13 UTC (rev 15678)
@@ -1,53 +1,54 @@
 #!/usr/bin/make -f
 
-FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~/-/').tar.bz2
-URL = http://www.vandenoever.info/software/strigi/$(UPFILENAME)
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
-include /usr/share/cdbs/1/class/cmake.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include /usr/share/cdbs/1/rules/utils.mk
+FILENAME := $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+UPFILENAME := $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~/-/').tar.bz2
+URL := http://www.vandenoever.info/software/strigi/$(UPFILENAME)
+CURRENTVERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+LIBPKGS := $(shell dh_listpackages | grep libs | sed -e '/dev/d;')
 
-CURRENTVERSION := $(shell head -1 debian/changelog | sed 's/[^(]*(\([^)]*\)).*/\1/')
+%:
+	dh --with quilt $@
 
-DEB_CMAKE_EXTRA_FLAGS += \
-	-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-	-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
-	-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
-DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		-DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \
+		-DCMAKE_LD_FLAGS="-Wl,-z,defs" \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+		-DCMAKE_MODULE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed" \
+		-DCMAKE_EXE_LINKER_FLAGS="-Wl,--no-undefined -Wl,--as-needed"
 
-binary-install/deskbar-plugins-strigi::
-	install -D -p -m644 src/searchclient/strigi.py \
-		debian/deskbar-plugins-strigi/usr/lib/deskbar-applet/handlers/strigi.py
+override_dh_pysupport:
 	dh_pysupport /usr/lib/deskbar-applet/handlers
 
-clean::
-	# generate on build
+override_dh_clean:
+	dh_clean
 	rm -f debian/shlibs.local
+#	rm -f debian/libstreams0.symbols.$(DEB_HOST_ARCH)
+#	rm -f debian/libstreamanalyzer0.symbols.$(DEB_HOST_ARCH)
 
+override_dh_makeshlibs:
+	dh_makeshlibs -V
+	for pkg in $(LIBPKGS); do \
+		sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$$pkg/DEBIAN/shlibs >> debian/shlibs.local; \
+	done
+
+override_dh_strip:
+	dh_strip --dbg-package=strigi-dbg
+#	for pkg in libstreams0 libstreamanalyzer0; do \
+		pkgkde-symbolshelper symbolfile -p $$pkg -o debian/$${pkg}.symbols.$(DEB_HOST_ARCH); \
+		pkgkde-symbolshelper postgensymbols -p $$pkg -v; \
+	done
+
 get-orig-source:
 	@@dh_testdir
-	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@[ -d ../tarballs/. ] || mkdir -p ../tarballs
 	@@echo Downloading $(UPFILENAME) from $(URL) ...
 	@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
 	@@echo Converting $(UPFILENAME) to $(FILENAME)
 	@@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME)
 
-# Generate shlibs local files
-$(patsubst %,binary-fixup/%,$(DEB_ALL_PACKAGES)) :: binary-fixup/%: binary-strip/%
-	if test -e debian/$(cdbs_curpkg)/DEBIAN/shlibs ; then \
-		sed 's/>=[^)]*/= $(CURRENTVERSION)/' debian/$(cdbs_curpkg)/DEBIAN/shlibs >> debian/shlibs.local ;\
-	fi
-
-# Symbol files
-binary-strip/libstreamanalyzer0 binary-strip/libstreams0::
-	pkgkde-symbolshelper symbolfile -p $(cdbs_curpkg) -o debian/$(cdbs_curpkg).symbols.$(DEB_HOST_ARCH)
-
-binary-fixup/libstreamanalyzer0 binary-fixup/libstreams0::
-	pkgkde-symbolshelper postgensymbols -p $(cdbs_curpkg) -v
-
-clean::
-	rm -f debian/libstreamanalyzer0.symbols.$(DEB_HOST_ARCH)
-	rm -f debian/libstreams0.symbols.$(DEB_HOST_ARCH)
+.PHONY: override_dh_auto_test

More information about the pkg-kde-commits mailing list