[SCM] PyKDE4 packaging branch, master, updated. debian/4.7.4-4-1-gedd7277

Scott Kitterman kitterman at alioth.debian.org
Sun Jun 17 03:59:50 UTC 2012 

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/pykde4.git;a=commitdiff;h=edd7277

The following commit has been merged in the master branch:
commit edd7277610d0f6937c1d1c6e6ef18cc5b1ee71c1
Author: Scott Kitterman <scott at kitterman.com>
Date:   Sat Jun 16 23:53:09 2012 -0400

    pykde4 (4:4.8.4-1) unstable; urgency=low
    
      * Team upload
      * New upstream release
        - Drop debian/patches/python32_compile_fix.diff, incorporated upstream
        - Bump build-depends version for kde-sc-dev-latest to 4:4.8.3
      * Add python-dbg and python3-dbg to python-kde4-dbg and python3-kde4-dbg
        depends
      * Update debian/not-installed for python3 (change from Kubuntu)
    
     -- Scott Kitterman <scott at kitterman.com>  Sat, 16 Jun 2012 20:28:58 -0400
---
 debian/changelog                                   |   12 +++++++++++
 debian/control                                     |    6 ++--
 debian/not-installed                               |   19 ++++++++++++++++++
 debian/patches/make_pykde4_respect_sip_flags.diff  |   10 +++++---
 debian/patches/optional_install_sip_files.diff     |    8 ++++--
 debian/patches/python32_compile_fix.diff           |   21 --------------------
 ...python_modules_dont_link_against_libpython.diff |    8 ++++--
 debian/patches/series                              |    1 -
 8 files changed, 50 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ddb926e..a9527e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pykde4 (4:4.8.4-1) unstable; urgency=low
+
+  * Team upload
+  * New upstream release
+    - Drop debian/patches/python32_compile_fix.diff, incorporated upstream
+    - Bump build-depends version for kde-sc-dev-latest to 4:4.8.3
+  * Add python-dbg and python3-dbg to python-kde4-dbg and python3-kde4-dbg
+    depends
+  * Update debian/not-installed for python3 (change from Kubuntu)
+
+ -- Scott Kitterman <scott at kitterman.com>  Sat, 16 Jun 2012 20:28:58 -0400
+
 pykde4 (4:4.7.4-4) unstable; urgency=low
 
   * Team upload
diff --git a/debian/control b/debian/control
index bf0e15e..22939e7 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pykde4
 Section: python
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Build-Depends: kde-sc-dev-latest (>= 4:4.7.4),
+Build-Depends: kde-sc-dev-latest (>= 4:4.8.3),
  debhelper (>= 7.3), cmake, pkg-kde-tools (>= 0.12),
  kdelibs5-dev (>= 4:4.7.4-6),kdepimlibs5-dev (>= 4:4.7),
  libphonon-dev (>= 4:4.6.0really4.4.4), libsoprano-dev (>= 2.7.0),
@@ -80,7 +80,7 @@ Package: python-kde4-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, kdelibs5-dbg, python-kde4 (= ${binary:Version})
+Depends: ${misc:Depends}, kdelibs5-dbg, python-kde4 (= ${binary:Version}), python-dbg
 Recommends: python-qt4-dbg
 Breaks: kdebindings-dbg
 Replaces: kdebindings-dbg
@@ -126,7 +126,7 @@ Package: python3-pykde4-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Depends: ${misc:Depends}, kdelibs5-dbg, python3-pykde4 (= ${binary:Version})
+Depends: ${misc:Depends}, kdelibs5-dbg, python3-pykde4 (= ${binary:Version}), python3-dbg
 Recommends: python3-pyqt4-dbg
 Description: debugging symbols for PyKDE bindings for Python 3
  This package contains debugging files used to investigate problems with
diff --git a/debian/not-installed b/debian/not-installed
index b7a3a05..30a470a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -7,3 +7,22 @@
 ./usr/lib/python2.7/dist-packages/PyKDE4/pykdeconfig.pyc
 ./usr/lib/python2.7/dist-packages/PyQt4/uic/pykdeuic4.pyc
 ./usr/lib/python2.7/dist-packages/PyQt4/uic/widget-plugins/kde4.pyc
+
+# dh_python3 renames them
+./usr/lib/python3/dist-packages/PyKDE4/akonadi.so
+./usr/lib/python3/dist-packages/PyKDE4/dnssd.so
+./usr/lib/python3/dist-packages/PyKDE4/kdecore.so
+./usr/lib/python3/dist-packages/PyKDE4/kdeui.so
+./usr/lib/python3/dist-packages/PyKDE4/khtml.so
+./usr/lib/python3/dist-packages/PyKDE4/kio.so
+./usr/lib/python3/dist-packages/PyKDE4/knewstuff.so
+./usr/lib/python3/dist-packages/PyKDE4/kparts.so
+./usr/lib/python3/dist-packages/PyKDE4/kterminal.so
+./usr/lib/python3/dist-packages/PyKDE4/ktexteditor.so
+./usr/lib/python3/dist-packages/PyKDE4/kutils.so
+./usr/lib/python3/dist-packages/PyKDE4/nepomuk.so
+./usr/lib/python3/dist-packages/PyKDE4/phonon.so
+./usr/lib/python3/dist-packages/PyKDE4/plasma.so
+./usr/lib/python3/dist-packages/PyKDE4/solid.so
+./usr/lib/python3/dist-packages/PyKDE4/soprano.so
+
diff --git a/debian/patches/make_pykde4_respect_sip_flags.diff b/debian/patches/make_pykde4_respect_sip_flags.diff
index 4107f58..107161f 100644
--- a/debian/patches/make_pykde4_respect_sip_flags.diff
+++ b/debian/patches/make_pykde4_respect_sip_flags.diff
@@ -7,9 +7,11 @@ Last-Update: 2009-04-15
 Corrects FTBFS on armel by making sure pykde4 properly parses the python-qt4
 flags passed from PythonQt4's cmake file.
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -85,6 +85,9 @@ INCLUDE_DIRECTORIES(
+Index: pykde4-4.8.4/CMakeLists.txt
+===================================================================
+--- pykde4-4.8.4.orig/CMakeLists.txt	2012-06-16 20:33:00.333497437 -0400
++++ pykde4-4.8.4/CMakeLists.txt	2012-06-16 20:33:11.781497615 -0400
+@@ -86,6 +86,9 @@
      ${KDEPIMLIBS_INCLUDE_DIRS}
  )
  
@@ -19,7 +21,7 @@ flags passed from PythonQt4's cmake file.
  SET(SIP_INCLUDES ${PYQT4_SIP_DIR} sip)
  SET(SIP_CONCAT_PARTS 8)
  IF (WIN32)
-@@ -92,7 +95,7 @@ IF (WIN32)
+@@ -93,7 +96,7 @@
  ELSE (WIN32)
      SET(SIP_TAGS ALL WS_X11 ${PYQT4_VERSION_TAG})
  ENDIF (WIN32)
diff --git a/debian/patches/optional_install_sip_files.diff b/debian/patches/optional_install_sip_files.diff
index d9de4ab..77259af 100644
--- a/debian/patches/optional_install_sip_files.diff
+++ b/debian/patches/optional_install_sip_files.diff
@@ -6,9 +6,11 @@ Last-Update: 2011-07-01
 
 Make it possible to only install the sip files under some conditions
 
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -251,15 +251,20 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DI
+Index: pykde4-4.8.4/CMakeLists.txt
+===================================================================
+--- pykde4-4.8.4.orig/CMakeLists.txt	2012-06-16 20:33:11.781497615 -0400
++++ pykde4-4.8.4/CMakeLists.txt	2012-06-16 20:34:06.585498468 -0400
+@@ -252,15 +252,20 @@
  
  # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
  # (Don't forget the / at the end of sip/.)
diff --git a/debian/patches/python32_compile_fix.diff b/debian/patches/python32_compile_fix.diff
deleted file mode 100644
index 5440477..0000000
--- a/debian/patches/python32_compile_fix.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Compile fix for Python 3.2 and higher
-Author: Simon Edwards <simon at simonzone.com>
-Origin: upstream, https://projects.kde.org/projects/kde/kdebindings/pykde4/repository/revisions/54bd6a7628e04efe5e1de53075227713f2526acf
-Last-Update: 2012-05-08
-
-Index: b/sip/kio/kfileitem.sip
-===================================================================
---- a/sip/kio/kfileitem.sip
-+++ b/sip/kio/kfileitem.sip
-@@ -236,7 +236,11 @@
-         
-         len = sipCpp->count();
-         
-+#if PY_VERSION_HEX >= 0x03020000
-+        if (PySlice_GetIndicesEx(a0, len, &start, &stop, &step, &slicelength) < 0)
-+#else
-         if (PySlice_GetIndicesEx((PySliceObject *)a0, len, &start, &stop, &step, &slicelength) < 0)
-+#endif
-             sipIsErr = 1;
-         else
-         {
diff --git a/debian/patches/python_modules_dont_link_against_libpython.diff b/debian/patches/python_modules_dont_link_against_libpython.diff
index d4929d1..1f3b4d5 100644
--- a/debian/patches/python_modules_dont_link_against_libpython.diff
+++ b/debian/patches/python_modules_dont_link_against_libpython.diff
@@ -8,9 +8,11 @@ Do not link python modules against -lpython2.X. Since KDE4's cmake file
 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/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -101,6 +101,9 @@ ENDIF (PYTHON_3)
+Index: pykde4-4.8.4/CMakeLists.txt
+===================================================================
+--- pykde4-4.8.4.orig/CMakeLists.txt	2011-07-27 14:37:12.549710782 -0400
++++ pykde4-4.8.4/CMakeLists.txt	2012-06-16 20:32:09.389496643 -0400
+@@ -102,6 +102,9 @@
  
  ADD_DEFINITIONS(-D_REENTRANT -DQT_CORE_LIB -DQT_GUI_LIB -DUSING_SOPRANO_NRLMODEL_UNSTABLE_API)
  
diff --git a/debian/patches/series b/debian/patches/series
index 2e6f47e..0474e82 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ fix_kpythonpluginfactory_build.diff
 make_pykde4_respect_sip_flags.diff
 pythonpluginfactory_use_versioned_python_lib.diff
 optional_install_sip_files.diff
-python32_compile_fix.diff

-- 
PyKDE4 packaging

More information about the pkg-kde-commits mailing list