r43943 - in /packages/kwwidgets/trunk/debian: changelog control patches/50_all_patches.diff

domibel at users.alioth.debian.org domibel at users.alioth.debian.org
Mon Oct 3 22:56:07 UTC 2011 

Author: domibel
Date: Mon Oct  3 22:56:07 2011
New Revision: 43943

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=43943
Log:
  * Fixed FTBFS if multiple python versions are installed, use default python
    Thanks to Jakub Wilk (Closes: #644062)
  * removed unnecessary dependencies


Modified:
    packages/kwwidgets/trunk/debian/changelog
    packages/kwwidgets/trunk/debian/control
    packages/kwwidgets/trunk/debian/patches/50_all_patches.diff

Modified: packages/kwwidgets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/changelog?rev=43943&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/changelog (original)
+++ packages/kwwidgets/trunk/debian/changelog Mon Oct  3 22:56:07 2011
@@ -1,3 +1,11 @@
+kwwidgets (1.0.0~cvs20100930-5) unstable; urgency=low
+
+  * Fixed FTBFS if multiple python versions are installed, use default python
+    Thanks to Jakub Wilk (Closes: #644062)
+  * removed unnecessary dependencies
+
+ -- Dominique Belhachemi <domibel at debian.org>  Sun, 02 Oct 2011 21:25:21 -0400
+
 kwwidgets (1.0.0~cvs20100930-4) unstable; urgency=low
 
   * Added patch for vtk5.8

Modified: packages/kwwidgets/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/control?rev=43943&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/control (original)
+++ packages/kwwidgets/trunk/debian/control Mon Oct  3 22:56:07 2011
@@ -5,7 +5,7 @@
 Uploaders: Dominique Belhachemi <domibel at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, cmake, quilt (>= 0.40),
  tcl-vtk (>= 5.6), libvtk5-dev (>= 5.6), tcl8.5-dev, tk8.5-dev,
- python-support, python-dev, python-vtk, libqt4-dev, libpq-dev, libmysqlclient-dev, mpi-default-dev
+ python-support, python-dev, python-vtk
 Build-Depends-Indep: doxygen, graphviz, vtk-doc
 Standards-Version: 3.9.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/?rev=0&sc=0

Modified: packages/kwwidgets/trunk/debian/patches/50_all_patches.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/50_all_patches.diff?rev=43943&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/50_all_patches.diff (original)
+++ packages/kwwidgets/trunk/debian/patches/50_all_patches.diff Mon Oct  3 22:56:07 2011
@@ -6,8 +6,8 @@
 
 Index: kwwidgets-1.0.0~cvs20100930/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/CMakeLists.txt	2011-09-11 21:50:26.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20100930/CMakeLists.txt	2011-09-11 21:51:52.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/CMakeLists.txt	2011-10-02 21:31:22.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/CMakeLists.txt	2011-10-02 21:31:45.000000000 -0400
 @@ -104,7 +104,7 @@
  endif(NOT KWWidgets_INSTALL_BIN_DIR)
  
@@ -50,6 +50,15 @@
    if(NOT KWWidgets_INSTALL_NO_LIBRARIES)
      install_targets(
        ${KWWidgets_INSTALL_LIB_DIR}
+@@ -700,7 +710,7 @@
+     VTK_USE_RENDERING OR VTK_USE_RENDERING_ISSET)
+ 
+   find_program(PYTHON_EXECUTABLE
+-    NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python
++    NAMES python
+     PATHS
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
+     [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
 @@ -781,6 +791,11 @@
    endif(HTML_HELP_INCLUDE_PATH AND HTML_HELP_LIBRARY)
  endif(WIN32)
@@ -104,8 +113,8 @@
 +
 Index: kwwidgets-1.0.0~cvs20100930/Utilities/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Utilities/CMakeLists.txt	2011-09-11 21:50:26.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Utilities/CMakeLists.txt	2011-09-11 21:50:26.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Utilities/CMakeLists.txt	2011-10-02 21:31:22.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Utilities/CMakeLists.txt	2011-10-02 21:31:22.000000000 -0400
 @@ -1,5 +1,5 @@
 -add_executable(KWConvertImageToHeader KWConvertImageToHeader.cxx)
 -target_link_libraries(KWConvertImageToHeader ${KWWidgets_LIBRARIES})
@@ -116,8 +125,8 @@
    Doxygen
 Index: kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/CMakeLists.txt	2011-09-11 21:50:26.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/CMakeLists.txt	2011-09-11 21:50:26.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/CMakeLists.txt	2011-10-02 21:31:22.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/CMakeLists.txt	2011-10-02 21:31:22.000000000 -0400
 @@ -7,7 +7,7 @@
  if (BUILD_DOCUMENTATION)
  
@@ -142,8 +151,8 @@
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
 Index: kwwidgets-1.0.0~cvs20100930/Wrapping/Tcl/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Wrapping/Tcl/CMakeLists.txt	2011-09-11 21:50:26.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Wrapping/Tcl/CMakeLists.txt	2011-09-11 21:50:26.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Wrapping/Tcl/CMakeLists.txt	2011-10-02 21:31:22.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Wrapping/Tcl/CMakeLists.txt	2011-10-02 21:31:22.000000000 -0400
 @@ -47,8 +47,8 @@
    ${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
    @ONLY IMMEDIATE)
@@ -157,8 +166,8 @@
  # Install kits
 Index: kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/doxyfile.in
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/doxyfile.in	2011-09-11 21:50:26.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/doxyfile.in	2011-09-11 21:50:26.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/Utilities/Doxygen/doxyfile.in	2011-10-02 21:31:22.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/Utilities/Doxygen/doxyfile.in	2011-10-02 21:31:22.000000000 -0400
 @@ -1,166 +1,307 @@
 -# -------------------------------------------------------------------------
 -# doxyfile for KWWidgets
@@ -635,7 +644,7 @@
 Index: kwwidgets-1.0.0~cvs20100930/CMake/FindMySQL.cmake
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ kwwidgets-1.0.0~cvs20100930/CMake/FindMySQL.cmake	2011-09-11 21:50:26.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/CMake/FindMySQL.cmake	2011-10-02 21:31:22.000000000 -0400
 @@ -0,0 +1,68 @@
 +#
 +# Find the MySQL client includes and library
@@ -707,8 +716,8 @@
 +
 Index: kwwidgets-1.0.0~cvs20100930/CMake/KWWidgetsPathsMacros.cmake
 ===================================================================
---- kwwidgets-1.0.0~cvs20100930.orig/CMake/KWWidgetsPathsMacros.cmake	2011-09-11 21:50:26.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20100930/CMake/KWWidgetsPathsMacros.cmake	2011-09-11 21:50:26.000000000 -0400
+--- kwwidgets-1.0.0~cvs20100930.orig/CMake/KWWidgetsPathsMacros.cmake	2011-10-02 21:31:22.000000000 -0400
++++ kwwidgets-1.0.0~cvs20100930/CMake/KWWidgetsPathsMacros.cmake	2011-10-02 21:31:22.000000000 -0400
 @@ -489,7 +489,7 @@
  
    if(VTK_USE_MYSQL)

More information about the debian-science-commits mailing list