rev 12844 - in branches/kde4.2/packages/kdebindings/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Fri Dec 5 11:06:09 UTC 2008 

Author: modax-guest
Date: 2008-12-05 11:06:09 +0000 (Fri, 05 Dec 2008)
New Revision: 12844

Added:
   branches/kde4.2/packages/kdebindings/debian/README.source
Removed:
   branches/kde4.2/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff
Modified:
   branches/kde4.2/packages/kdebindings/debian/changelog
   branches/kde4.2/packages/kdebindings/debian/control
   branches/kde4.2/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
   branches/kde4.2/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
   branches/kde4.2/packages/kdebindings/debian/patches/series
Log:
Initial dirty kdebindings snapshot packaging. Not finished yet

Added: branches/kde4.2/packages/kdebindings/debian/README.source
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/README.source	                        (rev 0)
+++ branches/kde4.2/packages/kdebindings/debian/README.source	2008-12-05 11:06:09 UTC (rev 12844)
@@ -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: branches/kde4.2/packages/kdebindings/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/changelog	2008-12-05 10:24:27 UTC (rev 12843)
+++ branches/kde4.2/packages/kdebindings/debian/changelog	2008-12-05 11:06:09 UTC (rev 12844)
@@ -1,3 +1,24 @@
+kdebindings (4:4.1.82+svn892615-0r1) UNRELEASED; urgency=low
+
+  * New upstream development snapshot.
+
+  +++ Changes by Modestas Vainius:
+
+  * Resync patches:
+    - 01_python_modules_dont_l~k_against_libpython.diff - adapt to upstream
+      changes;
+    - 03_csharp_dont_use_qyotoshared_directly.diff - fix offsets;
+    - 97_fix_target_link_libraries.diff - remove, merged upstream;
+    - 99_enable_okular_plasma.diff - disable for now.
+  * Build depend on libplasma-dev to build plasma bindings.
+  * Bump KDE build depends to 4.1.81.
+  * Remove explicit cmake from build depends.
+  * Build depend on monodoc to build kio_monodoc.
+  * Bump SIP build dependencies to >= 4.7.8.
+  * Bump python-qt4 dependencies to 4.4.4.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 05 Dec 2008 12:57:11 +0200
+
 kdebindings (4:4.1.3-2) experimental; urgency=low
 
   [ Vincent Fourmond ]

Modified: branches/kde4.2/packages/kdebindings/debian/control
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/control	2008-12-05 10:24:27 UTC (rev 12843)
+++ branches/kde4.2/packages/kdebindings/debian/control	2008-12-05 11:06:09 UTC (rev 12844)
@@ -2,15 +2,15 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: debhelper (>= 6.0.7~), cmake (>= 2.4.5), quilt,
- kdelibs5-dev (>= 4:4.1.3), libphonon-dev, libqt4-opengl-dev,
- python, python-all-dev, sip4, python-sip4-dev, python-qt4-dev,
+Build-Depends: debhelper (>= 6.0.7~), quilt,
+ kdelibs5-dev (>= 4:4.1.81), libplasma-dev (>= 4:4.1.81), libphonon-dev, libqt4-opengl-dev,
+ python, python-all-dev, sip4 (>= 4.7.8), python-sip4-dev (>= 4.7.8), python-qt4-dev (>= 4.4.4),
  ruby1.8-dev, ruby1.8 , python-central,
  mono-gac [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
  mono-gmcs [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390], libmono-dev [i386 kfreebsd-i386 powerpc amd64 kfreebsd-amd64 ia64 arm armeb armel sparc s390],
- cdbs, 
+ cdbs, monodoc [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],
- okular-dev (>= 4:4.1.3), kdebase-workspace-dev (>=4.1.3)
+ okular-dev (>= 4:4.1.81), kdebase-workspace-dev (>= 4.1.81)
 Uploaders: Vincent Fourmond <fourmond at debian.org>, Torsten Marek <shlomme at debian.org>, Sune Vuorela <debian at pusling.com>, David Palacio <dpalacio at uninorte.edu.co>
 XS-Python-Version: >= 2.4
 Standards-Version: 3.8.0
@@ -194,7 +194,7 @@
 Section: python
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Depends: ${python:Depends}, python-qt4
+Depends: ${python:Depends}, python-qt4 (>= 4.4.4)
 Recommends: python-kde4
 Description: UIC compiler and SIP files for PyKDE
  This package contains pykdeuic4, a wrapper around PyQt's own UIC (user

Modified: branches/kde4.2/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2008-12-05 10:24:27 UTC (rev 12843)
+++ branches/kde4.2/packages/kdebindings/debian/patches/01_python_modules_dont_link_against_libpython.diff	2008-12-05 11:06:09 UTC (rev 12844)
@@ -2,16 +2,6 @@
 uses --no-undefined by default, we have to remove that from the default
 CMAKE_SHARED_LINKER_FLAGS variable, but only for the pykde4 subdirectory.
 
---- a/python/pykde4/cmake/modules/SIPMacros.cmake
-+++ b/python/pykde4/cmake/modules/SIPMacros.cmake
-@@ -106,7 +106,6 @@
-     )
-     
-     ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} )
--    TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY})
-     TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES})
-     SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name})
- 
 --- a/python/pykde4/CMakeLists.txt
 +++ b/python/pykde4/CMakeLists.txt
 @@ -66,6 +66,9 @@
@@ -21,6 +11,6 @@
 +# Do not use --no-undefined for python modules.
 +STRING(REPLACE -Wl,--no-undefined "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}")
 +
+ FILE(GLOB kdecore_files_sip sip/kdecore/*.sip)
+ set(SIP_EXTRA_FILES_DEPEND ${kdecore_files_sip})
  ADD_SIP_PYTHON_MODULE(PyKDE4.kdecore sip/kdecore/kdecoremod.sip ${KDE4_KDECORE_LIBS} ${KDE4_KPTY_LIBS} ${QT_QTNETWORK_LIBRARY})
- ADD_SIP_PYTHON_MODULE(PyKDE4.solid sip/solid/solidmod.sip ${KDE4_SOLID_LIBS} ${QT_QTCORE_LIBRARY})
- ADD_SIP_PYTHON_MODULE(PyKDE4.kdeui sip/kdeui/kdeuimod.sip ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})

Modified: branches/kde4.2/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff	2008-12-05 10:24:27 UTC (rev 12843)
+++ branches/kde4.2/packages/kdebindings/debian/patches/03_csharp_dont_use_qyotoshared_directly.diff	2008-12-05 11:06:09 UTC (rev 12844)
@@ -30,7 +30,7 @@
  		public static extern void InstallInvokeDelegate(InvokeDelegateFn callback);
  		
  		[DllImport("libqyoto", CharSet=CharSet.Ansi)]
-@@ -879,4 +879,4 @@
+@@ -888,4 +888,4 @@
  #endregion
  
  	}

Deleted: branches/kde4.2/packages/kdebindings/debian/patches/97_fix_target_link_libraries.diff

Modified: branches/kde4.2/packages/kdebindings/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebindings/debian/patches/series	2008-12-05 10:24:27 UTC (rev 12843)
+++ branches/kde4.2/packages/kdebindings/debian/patches/series	2008-12-05 11:06:09 UTC (rev 12844)
@@ -3,5 +3,4 @@
 03_csharp_dont_use_qyotoshared_directly.diff
 04_fix_ruby_requires.diff
 05_rbqtapi_ruby1.8.diff
-97_fix_target_link_libraries.diff
-99_enable_okular_plasma.diff
+#99_enable_okular_plasma.diff

More information about the pkg-kde-commits mailing list