[SCM] Soprano RDF Framework packaging branch, master, updated. debian/2.5.0+dfsg.1-1-11-g5f8e761

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 737cee2b520300ce70eead8a5333017b50ad1a60
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Mar 13 14:16:32 2011 +0200

    Switch debian/rules build engine to dhmk based qt-kde-team/2/*:
    
    * Switch debian/rules build engine to dhmk based qt-kde-team/2/*:
      - drop cdbs from Build-Depends;
      - bump pkg-kde-tools build dependency requirement to 0.11;
      - port debian/rules to dhmk;
      - set --builddirectory to Build/;
      - install libsoprano-doc files via libsoprano-doc.install.
---
 debian/changelog              |    8 ++++++++
 debian/control                |    8 +++-----
 debian/libsoprano-doc.install |    4 +++-
 debian/rules                  |   32 ++++++++++++++++----------------
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6fcefe6..ed7ae97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,14 @@ soprano (2.6.0+dfsg.1-0r1) UNRELEASED; urgency=low
   [ Didier Raboud ]
   * Add symbols for 2.5.63.
 
+  [ Modestas Vainius ]
+  * Switch debian/rules build engine to dhmk based qt-kde-team/2/*:
+    - drop cdbs from Build-Depends;
+    - bump pkg-kde-tools build dependency requirement to 0.11;
+    - port debian/rules to dhmk;
+    - set --builddirectory to Build/;
+    - install libsoprano-doc files via libsoprano-doc.install.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 26 Nov 2010 14:43:25 +0100
 
 soprano (2.5.0+dfsg.1-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0da522e..a28ff30 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,9 @@ Section: libs
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <debian at pusling.com>, Armin Berres <armin+debian at space-based.de>, Fathi Boudra <fabo at debian.org>, Modestas Vainius <modax at debian.org>
-Build-Depends: cdbs (>= 0.4.51), debhelper (>= 7.4.15), cmake (>= 2.6.2),
- pkg-kde-tools (>= 0.9), dpkg-dev (>= 1.15.5),
- libclucene-dev (>= 0.9.21b), libqt4-dev (>= 4.5.3), librdf0-dev,
- doxygen (>= 1.7.1),
- graphviz, libiodbc2-dev
+Build-Depends: debhelper (>= 7.4.15), cmake (>= 2.6.2), pkg-kde-tools (>= 0.11),
+ dpkg-dev (>= 1.15.5), libclucene-dev (>= 0.9.21b), libqt4-dev (>= 4.5.3), librdf0-dev,
+ doxygen (>= 1.7.1), graphviz, libiodbc2-dev
 Standards-Version: 3.9.1
 Homepage: http://soprano.sourceforge.net
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-req/soprano.git
diff --git a/debian/libsoprano-doc.install b/debian/libsoprano-doc.install
index 15a07a0..32feb7b 100644
--- a/debian/libsoprano-doc.install
+++ b/debian/libsoprano-doc.install
@@ -1 +1,3 @@
-usr/share/soprano/doc
+docs/html/*.html usr/share/soprano/doc/html/
+docs/html/*.css usr/share/soprano/doc/html/
+docs/html/*.png usr/share/soprano/doc/html/
diff --git a/debian/rules b/debian/rules
index 34c75bf..eab3900 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,27 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+builddir = Build
 
-DEB_CMAKE_EXTRA_FLAGS += -DSOPRANO_BUILD_API_DOCS=ON
+dh = --builddirectory=$(builddir)
 
-DEB_DH_MAKESHLIBS_ARGS_libsoprano4 = -V
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-DEB_DH_SHLIBDEPS_ARGS_soprano-daemon = -- -xlibsoprano4
+override_dh_auto_configure:
+	$(overriden_command) -- -DSOPRANO_BUILD_API_DOCS=ON
 
-#build/libsoprano-doc::
-#	cp qt4.tag $(DEB_BUILDDIR)/qt4.tag
-# 	cd $(DEB_BUILDDIR) && $(MAKE) apidox
+override_dh_install:
+	$(overriden_command) -plibsoprano-doc --sourcedir=$(builddir)
+	$(overriden_command) --remaining-packages
 
-install/libsoprano-doc::
-	mkdir -p $(DEB_DESTDIR)/usr/share/soprano/doc/html
-	cp $(DEB_BUILDDIR)/docs/html/*.css \
-	$(DEB_BUILDDIR)/docs/html/*.html \
-	$(DEB_BUILDDIR)/docs/html/*.png \
-	$(DEB_DESTDIR)/usr/share/soprano/doc/html/
+override_dh_makeshlibs:
+	$(overriden_command) -V
 
-binary-post-install/libsoprano-dev::
-	doxytag -t debian/$(cdbs_curpkg)/usr/share/soprano/doc/soprano.tag \
-		$(DEB_DESTDIR)/usr/share/soprano/doc/html
+override_dh_shlibdeps:
+	$(overriden_command) -psoprano-daemon -- -xlibsoprano4
+	$(overriden_command) --remaining-packages
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=libsoprano-dbg
 
 prune-nonfree:
 	# Deleting binary blobs

-- 
Soprano RDF Framework packaging