rev 12175 - in branches/kde4/packages/kdebindings/debian: . patches
Sune Vuorela
pusling-guest at alioth.debian.org
Sat Sep 13 23:08:33 UTC 2008
Author: pusling-guest
Date: 2008-09-13 23:08:32 +0000 (Sat, 13 Sep 2008)
New Revision: 12175
Added:
branches/kde4/packages/kdebindings/debian/libqtruby4shared1d.install
branches/kde4/packages/kdebindings/debian/libqyotoshared1d.install
branches/kde4/packages/kdebindings/debian/packaging-notes
branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff
branches/kde4/packages/kdebindings/debian/patches/07_qtrubyshared_soname.diff
Removed:
branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff
Modified:
branches/kde4/packages/kdebindings/debian/changelog
branches/kde4/packages/kdebindings/debian/control
branches/kde4/packages/kdebindings/debian/not-installed
branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
branches/kde4/packages/kdebindings/debian/patches/series
branches/kde4/packages/kdebindings/debian/rules
Log:
more fixes, proper sonaming, following CLI policy better
Modified: branches/kde4/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4/packages/kdebindings/debian/changelog 2008-09-13 23:03:29 UTC (rev 12174)
+++ branches/kde4/packages/kdebindings/debian/changelog 2008-09-13 23:08:32 UTC (rev 12175)
@@ -1,4 +1,4 @@
-kdebindings (4:4.1.0-1) UNRELEASED; urgency=low
+kdebindings (4:4.1.1-1) UNRELEASED; urgency=low
* Initial upload.
@@ -18,7 +18,6 @@
* Fix target link libraries
* Fix ruby build
* Fix pykde seperate build
- - For now, disable nepomuk - it doesn't build.
* Reimplement a shell construct in make to have it be more reliable
* Add cdbs for utils.mk
Modified: branches/kde4/packages/kdebindings/debian/control
===================================================================
--- branches/kde4/packages/kdebindings/debian/control 2008-09-13 23:03:29 UTC (rev 12174)
+++ branches/kde4/packages/kdebindings/debian/control 2008-09-13 23:08:32 UTC (rev 12175)
@@ -156,7 +156,7 @@
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Description: qt4 bindings for CLI
+Description: Qt4 bindings for CLI
This package provides the qt-dotnet assembly that
allows CLI based software to use the QT library
@@ -164,23 +164,74 @@
Section: libdevel
Depends: ${shlibs:Depends}, libqt-dotnet4.4-cil (= ${binary:Version}), ${cli:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
-Description: development tools for qt CLI bindings
+Description: development tools for Qt CLI bindings
This package provides csuic and other tools to help building
CLI apps with Qt and KDE
Package: libkimono4.1-cil
Section: libs
-Depends: libqt-dotnet4.4-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Description: kde4 bindings for CLI
This package provides the kde-dotnet assembly that
- allows CLI based software to use the QT library
+ allows CLI based software to use the kde libraries
Package: libkhtml2.0-cil
Section: libs
-Depends: libqt-dotnet4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}
+Depends: libyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}
Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
Description: kde4 bindings for CLI, khtml edition
This package provides the khtml assembly that
- allows CLI based software to use the QT library
+ allows CLI based software to use the KHTML library
+Package: libnepomuk2.2-cil
+Section: libs
+Depends: libqyoto4.4-cil (= ${binary:Version}), libkimono4.1-cil (= ${binary:Version}), ${cli:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Description: kde4 bindings for CLI, Nepomuk-edition
+ This package provides the nepomuk assembly that allows
+ CLI based software to use the Nepomuk library
+
+Package: libqtscript2.2-cil
+Section: libs
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Description: Qt4 bindings for CLI, QtScript edition
+ This package provides the QtSCript assemply that allows
+ CLI based software to use the qtscript library.
+
+Package: libqtuitools2.2-cil
+Section: libs
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Description: Qt4 bindings for CLI, QtUiTools edition
+ This package provides the QtUiTools assembly, that allows
+ CLI based software to use the QtUiTools library.
+
+Package: libqtwebkit2.2-cil
+Section: libs
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Description: Qt4 bindings for CLI, QtWebkit edition
+ This package provides the QtWebkit assembly, that allows
+ CLI based software to use the QtWebkit library
+
+Package: libsoprano2.0-cil
+Section: libs
+Depends: libqyoto4.4-cil (= ${binary:Version}), ${cli:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Description: Soprano bindings for CLI
+ This package provides the soprano assembly, that allows CLI based
+ software to use the soprano library.
+
+Package: libqtruby4shared1d
+Section: libs
+Depends: ${shlibs:Depends}
+Architecture: any
+Description: shared library for Qt4 ruby bindings
+
+Package: libqyotoshared1d
+Section: libs
+Depends: ${shlibs:Depends}
+Architecture: i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390
+Description: shared library for Qt4 CLI bindings
Added: branches/kde4/packages/kdebindings/debian/libqtruby4shared1d.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libqtruby4shared1d.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libqtruby4shared1d.install 2008-09-13 23:08:32 UTC (rev 12175)
@@ -0,0 +1 @@
+usr/lib/libqtruby4shared.so.1d*
Added: branches/kde4/packages/kdebindings/debian/libqyotoshared1d.install
===================================================================
--- branches/kde4/packages/kdebindings/debian/libqyotoshared1d.install (rev 0)
+++ branches/kde4/packages/kdebindings/debian/libqyotoshared1d.install 2008-09-13 23:08:32 UTC (rev 12175)
@@ -0,0 +1 @@
+usr/lib/libqyotoshared.so.1d*
Modified: branches/kde4/packages/kdebindings/debian/not-installed
===================================================================
--- branches/kde4/packages/kdebindings/debian/not-installed 2008-09-13 23:03:29 UTC (rev 12174)
+++ branches/kde4/packages/kdebindings/debian/not-installed 2008-09-13 23:08:32 UTC (rev 12175)
@@ -3,19 +3,60 @@
#no dev stuff yet
-./usr/include/qyoto/emitsignal.h
-./usr/include/qyoto/invokeslot.h
-./usr/include/qyoto/marshall.h
-./usr/include/qyoto/methodcall.h
-./usr/include/qyoto/methodreturnvalue.h
-./usr/include/qyoto/qyoto.h
-./usr/include/qyoto/qyotosmokebinding.h
-./usr/include/qyoto/signalreturnvalue.h
-./usr/include/qyoto/slotreturnvalue.h
-./usr/include/qyoto/smokeqyoto.h
-./usr/include/qyoto/virtualmethodcall.h
-./usr/include/qyoto/virtualmethodreturnvalue.h
-./usr/include/smoke.h
+./usr/include/qtruby/marshall_basetypes.h
+./usr/include/qtruby/marshall_complex.h
+./usr/include/qtruby/marshall.h
+./usr/include/qtruby/marshall_macros.h
+./usr/include/qtruby/marshall_primitives.h
+./usr/include/qtruby/marshall_types.h
+./usr/include/qtruby/qtruby.h
+./usr/include/qtruby/smokeruby.h
+./usr/include/qyoto/emitsignal.h
+./usr/include/qyoto/invokeslot.h
+./usr/include/qyoto/marshall.h
+./usr/include/qyoto/methodcall.h
+./usr/include/qyoto/methodreturnvalue.h
+./usr/include/qyoto/qyoto.h
+./usr/include/qyoto/qyotosmokebinding.h
+./usr/include/qyoto/signalreturnvalue.h
+./usr/include/qyoto/slotreturnvalue.h
+./usr/include/qyoto/smokeqyoto.h
+./usr/include/qyoto/virtualmethodcall.h
+./usr/include/qyoto/virtualmethodreturnvalue.h
+./usr/include/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/phonon_smoke.h
+./usr/include/smoke/plasma_smoke.h
+./usr/include/smoke/qtscript_smoke.h
+./usr/include/smoke/qt_smoke.h
+./usr/include/smoke/qtuitools_smoke.h
+./usr/include/smoke/qtwebkit_smoke.h
+./usr/include/smoke/solid_smoke.h
+./usr/include/smoke/soprano_smoke.h
+
+
+./usr/lib/libqyotoshared.so
+./usr/lib/libsmokekde.so
+./usr/lib/libsmokekhtml.so
+./usr/lib/libsmokektexteditor.so
+./usr/lib/libsmokenepomuk.so
+./usr/lib/libsmokeokular.so
+./usr/lib/libsmokephonon.so
+./usr/lib/libsmokeplasma.so
+./usr/lib/libsmokeqtscript.so
+./usr/lib/libsmokeqt.so
+./usr/lib/libsmokeqtuitools.so
+./usr/lib/libsmokeqtwebkit.so
+./usr/lib/libsmokesolid.so
+./usr/lib/libsmokesoprano.so
+
+
./usr/share/applications/kde4/dbpedia_references.desktop
./usr/share/kde4/apps/dbpedia_references/dbpedia_references.rb
+
+
Added: branches/kde4/packages/kdebindings/debian/packaging-notes
===================================================================
--- branches/kde4/packages/kdebindings/debian/packaging-notes (rev 0)
+++ branches/kde4/packages/kdebindings/debian/packaging-notes 2008-09-13 23:08:32 UTC (rev 12175)
@@ -0,0 +1,5 @@
+Mono:
+
+"monodis --assemly foo.dll | grep Version" reveals the abi version, which is used in several places.
+"monodis --moduleref foo.dll" reveals the name of the binary glue lib to be used. There might be a need for dll-map files
+
Property changes on: branches/kde4/packages/kdebindings/debian/packaging-notes
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff 2008-09-13 23:03:29 UTC (rev 12174)
+++ branches/kde4/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff 2008-09-13 23:08:32 UTC (rev 12175)
@@ -1,3 +1,6 @@
+The qyotoshared is more of a real library than a basic glue library and sholud be treated as such.
+This at least builds, but is not runtime tested yet.
+
--- a/csharp/qyoto/core/QObjectExtras.cs
+++ b/csharp/qyoto/core/QObjectExtras.cs
@@ -21,7 +21,7 @@
Deleted: branches/kde4/packages/kdebindings/debian/patches/03_disable_python-nepomuk_the_hard_way.diff
Added: branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/06_qyotoshared_needs_soname.diff 2008-09-13 23:08:32 UTC (rev 12175)
@@ -0,0 +1,11 @@
+We are currently treating this as a real library and sonaming it appropriately
+--- a/csharp/qyoto/CMakeLists.txt
++++ b/csharp/qyoto/CMakeLists.txt
+@@ -42,6 +42,7 @@
+ LINK_DIRECTORIES (${LIBRARY_OUTPUT_PATH})
+
+ ADD_LIBRARY (qyotoshared SHARED ${SRC_QYOTO_SHARED})
++set_target_properties(qyotoshared PROPERTIES VERSION 1d.0.0 SOVERSION 1d)
+ TARGET_LINK_LIBRARIES (qyotoshared smokeqt ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+
+ ADD_LIBRARY (qyoto MODULE ${SRC_QYOTO})
Added: branches/kde4/packages/kdebindings/debian/patches/07_qtrubyshared_soname.diff
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/07_qtrubyshared_soname.diff (rev 0)
+++ branches/kde4/packages/kdebindings/debian/patches/07_qtrubyshared_soname.diff 2008-09-13 23:08:32 UTC (rev 12175)
@@ -0,0 +1,12 @@
+qtrubyshared is a real library and sholud be SONAMED. patch backported from trunk with the change that
+we use 1d instead of 2.
+--- a/ruby/qtruby/src/CMakeLists.txt
++++ b/ruby/qtruby/src/CMakeLists.txt
+@@ -32,6 +32,7 @@
+ # target_link_libraries(qtrubyinternal ${QT_QTCORE_LIBRARY} ${RUBY_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+
+ set_target_properties(qtruby4 PROPERTIES PREFIX "")
++set_target_properties(qtruby4shared PROPERTIES VERSION 1d.0.0 SOVERSION 1d)
+
+ install(TARGETS qtruby4shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} )
+ install(TARGETS qtruby4 DESTINATION ${CUSTOM_RUBY_SITE_ARCH_DIR})
Modified: branches/kde4/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebindings/debian/patches/series 2008-09-13 23:03:29 UTC (rev 12174)
+++ branches/kde4/packages/kdebindings/debian/patches/series 2008-09-13 23:08:32 UTC (rev 12175)
@@ -1,6 +1,9 @@
01_python_modules_dont_link_against_libpython.diff
02_include_default_settings_in_python_cmakelist.diff
+03_csharp_dont_use_qyotoshared_directly.diff
04_fix_ruby_requires.diff
05_static_class_constructor.diff
+06_qyotoshared_needs_soname.diff
+07_qtrubyshared_soname.diff
97_fix_target_link_libraries.diff
99_enable_okular_plasma.diff
Modified: branches/kde4/packages/kdebindings/debian/rules
===================================================================
--- branches/kde4/packages/kdebindings/debian/rules 2008-09-13 23:03:29 UTC (rev 12174)
+++ branches/kde4/packages/kdebindings/debian/rules 2008-09-13 23:08:32 UTC (rev 12175)
@@ -7,6 +7,9 @@
MONOARCHS= "i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390"
export MONO_DISABLE_SHM = 1
+DEST=$(CURDIR)/debian/tmp
+DEST_USR_LIB=$(DEST)/usr/lib
+
ifneq (,$(findstring $(ARCH),$(MONOARCHS)))
MONOFLAGS=-DENABLE_KHTML_SHARP=ON
MONOTARGET=monospecific
@@ -129,20 +132,49 @@
install: dh_install $(MONOTARGET)
monospecific:
+ #khtml
install -d debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/khtml.dll debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
+ install -D -m 644 $(DEST_USR_LIB)/libkhtml-sharp.so debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
+ install -D -m 644 $(CURDIR)/debian/csharp/khtml.dll.config debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
+ #qyoto
+ install -d debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qt-dotnet.dll debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
+ install -D -m 644 $(DEST_USR_LIB)/libqyoto.so debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
+ install -D -m 644 $(CURDIR)/debian/csharp/qt-dotnet.dll.config debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
+ #kimono
install -d debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1
- install -d debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4
- install -D -m 644 $(objdir)/lib/khtml.dll debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
- install -D -m 644 $(objdir)/lib/libkhtml-sharp.so debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
- install -D -m 644 $(CURDIR)/debian/csharp/khtml.dll.config debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
- install -D -m 644 $(objdir)/lib/kde-dotnet.dll debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
- install -D -m 644 $(objdir)/lib/libkimono.so debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/kde-dotnet.dll debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
+ install -D -m 644 $(DEST_USR_LIB)/libkimono.so debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
install -D -m 644 $(CURDIR)/debian/csharp/kde-dotnet.dll.config debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/
- install -D -m 644 $(objdir)/lib/qt-dotnet.dll debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
- install -D -m 644 $(objdir)/lib/libqyoto.so debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
- install -D -m 644 $(objdir)/lib/libqyotoshared.so debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
- install -D -m 644 $(CURDIR)/debian/csharp/qt-dotnet.dll.config debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/
- dh_makeclilibs -V
+ #nepomuk
+ install -d debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/nepomuk.dll debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/libnepomuk-sharp.so debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(CURDIR)/debian/csharp/nepomuk.dll.config debian/libnepomuk2.2-cil/usr/lib/cli/kdebindings-2.2
+ #qtscript
+ install -d debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qtscript.dll debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/libqtscript-sharp.so debian/libqtscript2.2-cil/usr/lib/cli/kdebinding-2.2
+ install -D -m 644 $(CURDIR)/debian/csharp/qtscript.dll.config debian/libqtscript2.2-cil/usr/lib/cli/kdebindings-2.2
+ #soprano
+ install -d debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/soprano.dll debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
+ install -D -m 644 $(DEST_USR_LIB)/libsoprano-sharp.so debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
+ install -D -m 644 $(CURDIR)/debian/csharp/soprano.dll.config debian/libsoprano2.0-cil/usr/lib/cli/kdebindings-2.0
+ #qtuitools
+ install -d debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qtuitools.dll debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/libqtuitools-sharp.so debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(CURDIR)/debian/csharp/qtuitools.dll.config debian/libqtuitools2.2-cil/usr/lib/cli/kdebindings-2.2
+ #qtwebkit
+ install -d debian/libqtwebkit2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/mono/2.0/qtwebkit.dll debian/libqtwebkit2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(DEST_USR_LIB)/libqtwebkit-sharp.so debian/libqtwebkit2.2-cil/usr/lib/cli/kdebindings-2.2
+ install -D -m 644 $(CURDIR)/debian/csharp/qtwebkit.dll.config debian/libqtwebkit2.2-cil/usr/lib/kdebindings-2.2
+ #end manual installs
+ #setting MONOPATH is a hack to hack around a bug in dh_mkaeclilibs
+ MONO_PATH=$(CURDIR)/debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/ dh_makeclilibs -V
dh_installcligac
dh_clideps -l debian/libqyoto4.4-cil/usr/lib/cli/kdebindings-4.4/:debian/libkimono4.1-cil/usr/lib/cli/kdebindings-4.1/:debian/libkhtml2.0-cil/usr/lib/cli/kdebindings-2.0/
dh_clistrip
More information about the pkg-kde-commits
mailing list