rev 17286 - trunk/packages/kdebindings/debian

Wed Mar 3 07:01:34 UTC 2010

Author: pusling-guest
Date: 2010-03-03 07:01:26 +0000 (Wed, 03 Mar 2010)
New Revision: 17286

Added:
   trunk/packages/kdebindings/debian/libsmokekde-dev.install
   trunk/packages/kdebindings/debian/libsmokesoprano-dev.install
Modified:
   trunk/packages/kdebindings/debian/changelog
   trunk/packages/kdebindings/debian/control
   trunk/packages/kdebindings/debian/not-installed
   trunk/packages/kdebindings/debian/rules
Log:
* Use Modestas' new dh_sodeps tool; add pkg-kde-tools build dep for this.
* Also consider various mono-required libs as monopackages in rules file

Modified: trunk/packages/kdebindings/debian/changelog
===================================================================

--- trunk/packages/kdebindings/debian/changelog	2010-03-03 01:07:18 UTC (rev 17285)
+++ trunk/packages/kdebindings/debian/changelog	2010-03-03 07:01:26 UTC (rev 17286)
@@ -34,6 +34,8 @@
   * Replace strict hardcoded shlib interdependencies with a shlibs.local hack
     as seen in Qt
   * Write ${misc:Depends} everywhere
+  * Use Modestas' new dh_sodeps tool; add pkg-kde-tools build dep for this.
+  * Also consider various mono-required libs as monopackages in rules file
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Feb 2010 01:19:23 +0200
 

Modified: trunk/packages/kdebindings/debian/control
===================================================================
--- trunk/packages/kdebindings/debian/control	2010-03-03 01:07:18 UTC (rev 17285)
+++ trunk/packages/kdebindings/debian/control	2010-03-03 07:01:26 UTC (rev 17286)
@@ -7,7 +7,7 @@
  kdelibs5-dev (>= 4:4.4), libqt4-opengl-dev (>= 4.6.2), libphonon-dev (>= 4:4.6.0really),
  libsoprano-dev (>= 2.3.0), libqimageblitz-dev,
  python, python-all-dev, sip4 (>= 4.10), python-sip4-dev (>= 4.10), python-qt4 (>> 4.7-2), python-qt4-dev (>> 4.7-2),
- ruby1.8-dev, ruby1.8, python-support (>= 0.6),
+ ruby1.8-dev, ruby1.8, python-support (>= 0.6), pkg-kde-tools (>= 0.6.8),
  mono-devel (>= 2.0.1) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
  cli-common-dev (>= 0.5.4) [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
  monodoc-base [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
@@ -238,8 +238,7 @@
 
 Package: libsmokeqt4-dev
 Section: libdevel
-Depends: libsmokeqt4-3 (= ${binary:Version}), libsmokephonon3 (= ${binary:Version}), libsmokeqtcore4-3 (= ${binary:Version}), libsmokeqtxmlpatterns4-3 (= ${binary:Version}), libsmokeqtxml4-3 (= ${binary:Version}),
- libsmokeqtwebkit4-3 (= ${binary:Version}), libsmokeqtuitools4-3 (= ${binary:Version}), libsmokeqttest4-3 (= ${binary:Version}), libsmokeqtsvg4-3 (= ${binary:Version})
+Depends: ${so:Depends}, ${shlibs:Depends}
 Architecture: any
 Description: development files for Qt 4 Smoke libraries
  Smoke libraries are part of the bindings used for Qt and KDE. This package
@@ -463,9 +462,7 @@
 
 Package: libsmokekde-dev
 Section: libdevel
-Depends: libsmokeqt4-dev (= ${binary:Version}), libsmokesoprano-dev (= ${binary:Version}), libsmokekde4-3 (= ${binary:Version}), libsmokeattica3 (= ${binary:Version}), libsmokeplasma3 (= ${binary:Version}), 
- libsmokeplasma3 (= ${binary:Version}), libsmokekhtml3 (= ${binary:Version}), libsmokeknewstuff3 (= ${binary:Version}), libsmokekio3 (= ${binary:Version}), libsmokesolid3 (= ${binary:Version}), 
- libsmokektexteditor3 (= ${binary:Version}), ${misc:Depends}
+Depends: libsmokeqt4-dev (= ${binary:Version}), ${so:Depends}, ${misc:Depends}
 Architecture: any
 Description: development files for soprano smoke libraries
  Smoke libraries are part of the bindings used for Qt and KDE. This package
@@ -522,7 +519,7 @@
 
 Package: libsmokesoprano-dev
 Section: libdevel
-Depends: libsmokeqt4-dev (= ${binary:Version}), libsmokesoprano3 (= ${binary:Version}), libsmokesopranoclient3 (= ${binary:Version}), ${misc:Depends}
+Depends: libsmokeqt4-dev (= ${binary:Version}), ${so:Depends}, ${misc:Depends}
 Architecture: any
 Description: development files for soprano smoke libraries
  Smoke libraries are part of the bindings used for Qt and KDE. This package

Added: trunk/packages/kdebindings/debian/libsmokekde-dev.install
===================================================================
--- trunk/packages/kdebindings/debian/libsmokekde-dev.install	                        (rev 0)
+++ trunk/packages/kdebindings/debian/libsmokekde-dev.install	2010-03-03 07:01:26 UTC (rev 17286)
@@ -0,0 +1,15 @@
+./usr/include/smoke/akonadi_smoke.h
+./usr/include/smoke/khtml_smoke.h
+./usr/include/smoke/ktexteditor_smoke.h
+./usr/include/smoke/nepomuk_smoke.h
+./usr/include/smoke/okular_smoke.h
+./usr/include/smoke/plasma_smoke.h
+./usr/include/smoke/qimageblitz_smoke.h
+./usr/lib/libsmokeakonadi.so
+./usr/lib/libsmokekhtml.so
+./usr/lib/libsmokektexteditor.so
+./usr/lib/libsmokenepomuk.so
+./usr/lib/libsmokeokular.so
+./usr/lib/libsmokeplasma.so
+./usr/lib/libsmokeqimageblitz.so
+./usr/lib/libsmokesolid.so

Added: trunk/packages/kdebindings/debian/libsmokesoprano-dev.install
===================================================================
--- trunk/packages/kdebindings/debian/libsmokesoprano-dev.install	                        (rev 0)
+++ trunk/packages/kdebindings/debian/libsmokesoprano-dev.install	2010-03-03 07:01:26 UTC (rev 17286)
@@ -0,0 +1,2 @@
+./usr/include/smoke/soprano_smoke.h
+./usr/lib/libsmokesoprano.so

Modified: trunk/packages/kdebindings/debian/not-installed
===================================================================
--- trunk/packages/kdebindings/debian/not-installed	2010-03-03 01:07:18 UTC (rev 17285)
+++ trunk/packages/kdebindings/debian/not-installed	2010-03-03 07:01:26 UTC (rev 17286)
@@ -26,33 +26,12 @@
 ./usr/include/qyoto/smokeqyoto.h
 ./usr/include/qyoto/virtualmethodcall.h
 ./usr/include/qyoto/virtualmethodreturnvalue.h
-./usr/include/smoke/akonadi_smoke.h
-./usr/include/smoke/kde_smoke.h
-./usr/include/smoke/khtml_smoke.h
-./usr/include/smoke/ktexteditor_smoke.h
-./usr/include/smoke/nepomuk_smoke.h
-./usr/include/smoke/okular_smoke.h
-./usr/include/smoke/plasma_smoke.h
-./usr/include/smoke/qimageblitz_smoke.h
 ./usr/include/smoke/qttest_smoke.h
 ./usr/include/smoke/solid_smoke.h
-./usr/include/smoke/soprano_smoke.h
 
 ./usr/lib/libqtruby4shared.so
 ./usr/lib/libqyotoshared.so
-./usr/lib/libsmokeakonadi.so
-./usr/lib/libsmokekde.so
-./usr/lib/libsmokekhtml.so
-./usr/lib/libsmokektexteditor.so
-./usr/lib/libsmokenepomuk.so
-./usr/lib/libsmokeokular.so
-./usr/lib/libsmokeplasma.so
-./usr/lib/libsmokeqimageblitz.so
-./usr/lib/libsmokesolid.so
-./usr/lib/libsmokesoprano.so
-./usr/lib/libsoprano-sharp.so
 
-
 ./usr/share/applications/kde4/dbpedia_references.desktop
 ./usr/share/kde4/apps/dbpedia_references/dbpedia_references.rb
 

Modified: trunk/packages/kdebindings/debian/rules
===================================================================
--- trunk/packages/kdebindings/debian/rules	2010-03-03 01:07:18 UTC (rev 17285)
+++ trunk/packages/kdebindings/debian/rules	2010-03-03 07:01:26 UTC (rev 17286)
@@ -4,7 +4,7 @@
 
 ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 MONOARCHS := "i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 lpia ia64 arm armeb armel sparc s390"
-MONOPACKAGES := $(shell dh_listpackages | grep '\-cil$$') plasma-scriptengine-kimono kio-monodoc
+MONOPACKAGES := $(shell dh_listpackages | grep '\-cil$$') plasma-scriptengine-kimono kio-monodoc libkimono-cil-dev libqyoto-cil-dev libqyotoshared1 qyoto-dev
 DH_MONOPACKAGES := $(patsubst %,-p%,$(MONOPACKAGES))
 DH_NO_MONOPACKAGES := $(patsubst %,-N%,$(MONOPACKAGES))
 MONO_L_PATHS = $(shell find $(patsubst %,debian/%,$(MONOPACKAGES)) -path '*/usr/lib/cli/*' -name '*.dll' -type f -printf '%h:') 
@@ -203,6 +203,7 @@
 			sed 's/>=[^)]*/= $(current_version)/' debian/$${pkg}/DEBIAN/shlibs >> debian/shlibs.local ;\
 		fi \
 	done
+	dh_sodeps
 	dh_shlibdeps
 	dh_installdeb
 	dh_gencontrol


