Control: tags -1 patch

Hi,

the attached debdiff changes debian/rules to make sure all the Qt
wrappers are built. Note the patch also contains a fix for #755849.

Two new build deps are required to make opengl and qtwebkit work, so
debian/control has some relevant changes as well. *.install and
cmakebuildsystem.patch changes aren't relevant for this bug.

Cheers,
Florian
diff -Nru pythonqt-2.1.0~svn247/debian/changelog pythonqt-2.1.0~svn247/debian/changelog
--- pythonqt-2.1.0~svn247/debian/changelog	2013-11-04 04:40:34.000000000 +0100
+++ pythonqt-2.1.0~svn247/debian/changelog	2014-07-24 14:35:19.000000000 +0200
@@ -1,3 +1,10 @@
+pythonqt (2.1.0~svn247-2) UNRELEASED; urgency=medium
+
+  * build wrapper for every supported Qt class
+  * install gui/PythonQtScriptingConsole.h
+
+ -- Florian Will <florian.w...@gmail.com>  Thu, 24 Jul 2014 14:19:52 +0200
+
 pythonqt (2.1.0~svn247-1) unstable; urgency=low
 
   * new snapshot based on svn r247
diff -Nru pythonqt-2.1.0~svn247/debian/control pythonqt-2.1.0~svn247/debian/control
--- pythonqt-2.1.0~svn247/debian/control	2013-11-04 04:30:10.000000000 +0100
+++ pythonqt-2.1.0~svn247/debian/control	2014-07-24 14:47:53.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packag...@lists.alioth.debian.org>
 Uploaders: Mathieu Malaterre <mathieu.malate...@gmail.com>, Dominique Belhachemi <domi...@debian.org>
-Build-Depends: debhelper (>= 9), cmake, quilt (>= 0.46-7~), python-dev, qt4-qmake, libqt4-dev
+Build-Depends: debhelper (>= 9), cmake, quilt (>= 0.46-7~), python-dev, qt4-qmake, libqt4-dev, libqt4-opengl-dev, libqtwebkit-dev
 Standards-Version: 3.9.4
 XS-Python-Version: current
 Homepage: http://pythonqt.sourceforge.net
diff -Nru pythonqt-2.1.0~svn247/debian/libpythonqt-dev.install pythonqt-2.1.0~svn247/debian/libpythonqt-dev.install
--- pythonqt-2.1.0~svn247/debian/libpythonqt-dev.install	2013-11-04 04:38:53.000000000 +0100
+++ pythonqt-2.1.0~svn247/debian/libpythonqt-dev.install	2014-07-24 14:25:50.000000000 +0200
@@ -1,2 +1,3 @@
 usr/lib/libPythonQt.so
 usr/include/PythonQt/*.h
+usr/include/PythonQt/*/*.h
diff -Nru pythonqt-2.1.0~svn247/debian/patches/cmakebuildsystem.patch pythonqt-2.1.0~svn247/debian/patches/cmakebuildsystem.patch
--- pythonqt-2.1.0~svn247/debian/patches/cmakebuildsystem.patch	2013-11-04 02:46:45.000000000 +0100
+++ pythonqt-2.1.0~svn247/debian/patches/cmakebuildsystem.patch	2014-07-24 15:26:26.000000000 +0200
@@ -1,6 +1,6 @@
---- 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_
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,6 +199,18 @@
  #-----------------------------------------------------------------------------
  # Build the library
  
@@ -19,7 +19,7 @@
  include_directories(
    ${CMAKE_CURRENT_SOURCE_DIR}/src
    )
-@@ -210,6 +222,7 @@ add_library(PythonQt SHARED
+@@ -210,6 +222,7 @@
              ${gen_qrc_sources}
    )
  set_target_properties(PythonQt PROPERTIES DEFINE_SYMBOL PYTHONQT_EXPORTS)
@@ -27,3 +27,8 @@
  
  #
  # That should solve linkage error on Mac when the project is used in a superbuild setup
+@@ -232,3 +245,4 @@
+         LIBRARY DESTINATION lib
+         ARCHIVE DESTINATION lib)
+ install(FILES ${headers} DESTINATION include/PythonQt)
++install(FILES src/gui/PythonQtScriptingConsole.h DESTINATION include/PythonQt/gui)
diff -Nru pythonqt-2.1.0~svn247/debian/rules pythonqt-2.1.0~svn247/debian/rules
--- pythonqt-2.1.0~svn247/debian/rules	2013-11-04 03:05:48.000000000 +0100
+++ pythonqt-2.1.0~svn247/debian/rules	2014-07-24 14:19:46.000000000 +0200
@@ -12,5 +12,8 @@
 %:
 	dh $@ --parallel --with quilt --buildsystem=cmake
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DPythonQt_Wrap_QtAll=ON
+
 get-orig-source:
 	uscan --verbose --force-download --repack --rename

Reply via email to