[med-svn] r20730 - in trunk/packages/pythonqt/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2015-12-11 10:32:48 +0000 (Fri, 11 Dec 2015)
New Revision: 20730

Added:
   trunk/packages/pythonqt/trunk/debian/libpythonqt3.0.install
Removed:
   trunk/packages/pythonqt/trunk/debian/libpythonqt2.1.install
Modified:
   trunk/packages/pythonqt/trunk/debian/changelog
   trunk/packages/pythonqt/trunk/debian/control
   trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch
Log:
Adapt patches, Adapt package name to library version


Modified: trunk/packages/pythonqt/trunk/debian/changelog
===================================================================
--- trunk/packages/pythonqt/trunk/debian/changelog	2015-12-11 10:14:21 UTC (rev 20729)
+++ trunk/packages/pythonqt/trunk/debian/changelog	2015-12-11 10:32:48 UTC (rev 20730)
@@ -3,6 +3,7 @@
   * New upstream version
   * Add myself to uploaders
   * cme fix dpkg-control
+  * Adapt package name to library version
 
  -- Andreas Tille <tille at debian.org>  Fri, 11 Dec 2015 11:09:50 +0100
 

Modified: trunk/packages/pythonqt/trunk/debian/control
===================================================================
--- trunk/packages/pythonqt/trunk/debian/control	2015-12-11 10:14:21 UTC (rev 20729)
+++ trunk/packages/pythonqt/trunk/debian/control	2015-12-11 10:32:48 UTC (rev 20730)
@@ -15,7 +15,7 @@
 Homepage: http://pythonqt.sourceforge.net
 X-Python-Version: current
 
-Package: libpythonqt2.1
+Package: libpythonqt3.0
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}

Deleted: trunk/packages/pythonqt/trunk/debian/libpythonqt2.1.install
===================================================================
--- trunk/packages/pythonqt/trunk/debian/libpythonqt2.1.install	2015-12-11 10:14:21 UTC (rev 20729)
+++ trunk/packages/pythonqt/trunk/debian/libpythonqt2.1.install	2015-12-11 10:32:48 UTC (rev 20730)
@@ -1 +0,0 @@
-usr/lib/libPythonQt.so.*

Added: trunk/packages/pythonqt/trunk/debian/libpythonqt3.0.install
===================================================================
--- trunk/packages/pythonqt/trunk/debian/libpythonqt3.0.install	                        (rev 0)
+++ trunk/packages/pythonqt/trunk/debian/libpythonqt3.0.install	2015-12-11 10:32:48 UTC (rev 20730)
@@ -0,0 +1 @@
+usr/lib/libPythonQt.so.*

Modified: trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch
===================================================================
--- trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch	2015-12-11 10:14:21 UTC (rev 20729)
+++ trunk/packages/pythonqt/trunk/debian/patches/cmakebuildsystem.patch	2015-12-11 10:32:48 UTC (rev 20730)
@@ -1,29 +1,35 @@
---- pythonqt-2.1.0+svn244.orig/CMakeLists.txt
-+++ pythonqt-2.1.0+svn244/CMakeLists.txt
-@@ -199,6 +199,18 @@ qt4_add_resources(gen_qrc_sources ${qrc_
- #-----------------------------------------------------------------------------
- # Build the library
- 
-+set(PythonQt_MAJOR_VERSION 2)
-+set(PythonQt_MINOR_VERSION 1)
-+set(PythonQt_BUILD_VERSION 0)
-+set(PythonQt_VERSION
-+  "${PythonQt_MAJOR_VERSION}.${PythonQt_MINOR_VERSION}.${PythonQt_BUILD_VERSION}")
-+set(PythonQt_API_VERSION
-+  "${PythonQt_MAJOR_VERSION}.${PythonQt_MINOR_VERSION}")
-+set(PythonQt_LIBRARY_PROPERTIES ${PythonQt_LIBRARY_PROPERTIES}
-+  VERSION "${PythonQt_VERSION}"
-+  SOVERSION "${PythonQt_API_VERSION}"
-+)
-+
- include_directories(
-   ${CMAKE_CURRENT_SOURCE_DIR}/src
-   )
-@@ -210,6 +222,7 @@ add_library(PythonQt SHARED
-             ${gen_qrc_sources}
-   )
- set_target_properties(PythonQt PROPERTIES DEFINE_SYMBOL PYTHONQT_EXPORTS)
-+set_target_properties(PythonQt PROPERTIES ${PythonQt_LIBRARY_PROPERTIES})
- 
- #
- # That should solve linkage error on Mac when the project is used in a superbuild setup
+Author: Mathieu Malaterre <mathieu.malaterre at gmail.com>
+Date: Sat, 05 Mar 2011 16:34:12 +0100
+Last-Update: Fri, 11 Dec 2015 11:09:50 +0100
+Description: Inject proper versioning
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -205,6 +205,18 @@ qt4_add_resources(gen_qrc_sources ${qrc_
+ #-----------------------------------------------------------------------------
+ # Build the library
+ 
++set(PythonQt_MAJOR_VERSION 3)
++set(PythonQt_MINOR_VERSION 0)
++set(PythonQt_BUILD_VERSION 0)
++set(PythonQt_VERSION
++  "${PythonQt_MAJOR_VERSION}.${PythonQt_MINOR_VERSION}.${PythonQt_BUILD_VERSION}")
++set(PythonQt_API_VERSION
++  "${PythonQt_MAJOR_VERSION}.${PythonQt_MINOR_VERSION}")
++set(PythonQt_LIBRARY_PROPERTIES ${PythonQt_LIBRARY_PROPERTIES}
++  VERSION "${PythonQt_VERSION}"
++  SOVERSION "${PythonQt_API_VERSION}"
++)
++
+ include_directories(
+   ${CMAKE_CURRENT_SOURCE_DIR}/src
+   )
+@@ -215,7 +227,7 @@ add_library(PythonQt SHARED
+             ${gen_ui_sources}
+             ${gen_qrc_sources}
+   )
+-set_target_properties(PythonQt PROPERTIES DEFINE_SYMBOL PYTHONQT_EXPORTS)
++set_target_properties(PythonQt PROPERTIES ${PythonQt_LIBRARY_PROPERTIES})
+ 
+ #
+ # That should solve linkage error on Mac when the project is used in a superbuild setup