[SCM] PyKDE4 packaging branch, master, updated. debian/4.10.5-1

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c117c0b79e6cc1009366ea7dfd9494eb3417ea03
Merge: e292bfa3234f08187583bf87550974ce34810005 adda50fcdc57d00b3f2106ed608c02802bda18f5
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Jun 13 14:43:34 2013 +0200

    Merge tag 'debian/4.8.4-2' into kde4.10
    
    4:4.8.4-2 unstable; urgency=low
    
    Conflicts:
    	debian/changelog
    	debian/not-installed
    	debian/patches/make_pykde4_respect_sip_flags.diff
    	debian/python-kde4-dev.install

 debian/changelog               |   22 ++++++++++++++++
 debian/control                 |    2 +-
 debian/copyright               |    3 +++
 debian/not-installed           |   55 +++++++++++++++++++++++++++-------------
 debian/patches/series          |    5 ++++
 debian/python-kde4-dev.install |    2 +-
 debian/python3-pykde4.install  |    1 +
 debian/rules                   |   21 ++++++++++++---
 8 files changed, 88 insertions(+), 23 deletions(-)

diff --cc debian/changelog
index 1e0d723,446d0ac..35f3c48
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,30 -1,25 +1,52 @@@
 +pykde4 (4:4.10.4-1) UNRELEASED; urgency=low
 +
 +  * New upstream release.
 +
 +  [ José Manuel Santamaría Lema ]
 +  * Bump kde-sc-dev-latest build dependency to 4:4.10.1.
 +  * Bump build dependencies on other KDE SC components to 4:4.10.
 +  * Add build depends on:
 +    - nepomuk-core-dev
 +    - pkg-config
 +  * Update patches:
 +    - update python_modules_dont_link_against_libpython.diff.
 +    - update add_qt_kde_definitions.diff.
 +    - update make_pykde4_respect_sip_flags.diff.
 +    - update optional_install_sip_files.diff.
 +    - refresh other patches to make them apply without any offset.
 +  * Update installed files and debian/not-installed.
 +  * Add watch file.
 +  * Add lintian overrides for hardening-no-fortify-functions.
 +
 +  [ Maximiliano Curia ]
 +  * Add myself to uploaders.
 +  * Revert most version dependencies changes reshuffling build-deps.
 +  * Bump kdepimlibs-dev build-dep to 4:4.10.4.
 +
 + -- Maximiliano Curia <maxy at debian.org>  Thu, 13 Jun 2013 12:11:58 +0200
 +
+ pykde4 (4:4.8.4-2) unstable; urgency=low
+ 
+   * Team upload
+   * Updates for sip4 transition and python multiarch (Closes: #708857)
+     - Bump minimum python-sip version to 4.14
+     - Add debian/patches/new_pyincludes.diff (based on Kubuntu patch) to
+       support multiple include directories for python3.3
+     - Add debian/patches/cmake_no_bytecode.diff to temporarily disable
+       byte compilation (which breaks python3 part of the build and is
+       not needed - upstream has a better solution for 4.9+)
+     - Add debian/patches/python3_sip_options.diff (from Kubuntu) to fix
+       duplicate typedef with current python-qt4
+       - Bump minimum python-qt4 and python-qt4-dev version to 4.9.4
+     - Add debian/patches/pythonpluginfactory_python3.diff and
+       kpythonpluginfactory_3.2support.diff, both from Kubuntu, to support
+       building kpythonpluginfactory for python3 too
+     - Adjust debian/rules to use the new include directories and to use
+       appropriate ABI tags for python3 (Closes: #707148)
+   * Add python-version-specific pykdeuic4 links to python-kde4-dev.install
+ 
+  -- Scott Kitterman <scott at kitterman.com>  Fri, 17 May 2013 18:38:28 -0400
+ 
  pykde4 (4:4.8.4-1) unstable; urgency=low
  
    * Team upload
diff --cc debian/python-kde4-dev.install
index 51851b2,c89b8ac..f7fb8af
--- a/debian/python-kde4-dev.install
+++ b/debian/python-kde4-dev.install
@@@ -1,5 -1,3 +1,5 @@@
  usr/bin/pykdeuic4
 +usr/bin/pykdeuic4-2.6
 +usr/bin/pykdeuic4-2.7
- usr/bin/pykdeuic4-3.2
+ usr/bin/pykdeuic4-3.*
  usr/share/sip/PyKDE4

-- 
PyKDE4 packaging