r35581 - in /packages/kwwidgets/trunk/debian: control patches/30_all_patches.dpatch

[domibel-guest at users.alioth.debian.org]

Author: domibel-guest
Date: Sun Mar 15 23:59:56 2009
New Revision: 35581

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35581
Log:
updated patches

Modified:
    packages/kwwidgets/trunk/debian/control
    packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch

Modified: packages/kwwidgets/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/control?rev=35581&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/control (original)
+++ packages/kwwidgets/trunk/debian/control Sun Mar 15 23:59:56 2009
@@ -5,9 +5,9 @@
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
 Build-Depends: debhelper (>= 7), cmake, dpatch, libvtk5-dev, tcl8.5-dev, vtk-tcl,
  tk8.5-dev, libpng-dev, libfreetype6-dev, libxext-dev, libjpeg-dev, libtiff-dev,
- libexpat1-dev, python-vtk, python2.5-dev
+ libexpat1-dev, python-vtk, python2.5-dev, libxft-dev
 Build-Depends-Indep: doxygen, graphviz, vtk-doc
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/kwwidgets/trunk/
 Section: libs

Modified: packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch?rev=35581&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch (original)
+++ packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch Sun Mar 15 23:59:56 2009
@@ -9,8 +9,8 @@
 
 @DPATCH@
 diff -urNad kwwidgets-1.0.0~cvs20090209~/CMakeLists.txt kwwidgets-1.0.0~cvs20090209/CMakeLists.txt
---- kwwidgets-1.0.0~cvs20090209~/CMakeLists.txt	2009-03-15 16:23:42.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20090209/CMakeLists.txt	2009-03-15 16:27:54.000000000 -0400
+--- kwwidgets-1.0.0~cvs20090209~/CMakeLists.txt	2009-03-15 23:50:02.000000000 +0000
++++ kwwidgets-1.0.0~cvs20090209/CMakeLists.txt	2009-03-15 23:52:19.000000000 +0000
 @@ -107,7 +107,7 @@
  endif(NOT KWWidgets_INSTALL_BIN_DIR)
  
@@ -20,6 +20,15 @@
  endif(NOT KWWidgets_INSTALL_LIB_DIR)
  
  if(NOT KWWidgets_INSTALL_DATA_DIR)
+@@ -120,7 +120,7 @@
+ endif(NOT KWWidgets_INSTALL_INCLUDE_DIR)
+ 
+ if(NOT KWWidgets_INSTALL_PACKAGE_DIR)
+-  set(KWWidgets_INSTALL_PACKAGE_DIR ${KWWidgets_INSTALL_LIB_DIR}
++  set(KWWidgets_INSTALL_PACKAGE_DIR "${KWWidgets_INSTALL_LIB_DIR}/${PROJECT_NAME}"
+     CACHE INTERNAL "")
+ endif(NOT KWWidgets_INSTALL_PACKAGE_DIR)
+ 
 @@ -901,3 +901,17 @@
      endif(NOT SQUISH_FOUND)
    endif(KWWidgets_USE_Squish)
@@ -38,9 +47,20 @@
 +     VERSION ${KWWidgets_SHAREDLIB_VERSION}
 +  )
 +ENDIF (KWWidgets_BUILD_SHARED_LIBS)
+diff -urNad kwwidgets-1.0.0~cvs20090209~/Utilities/CMakeLists.txt kwwidgets-1.0.0~cvs20090209/Utilities/CMakeLists.txt
+--- kwwidgets-1.0.0~cvs20090209~/Utilities/CMakeLists.txt	2009-03-15 23:50:02.000000000 +0000
++++ kwwidgets-1.0.0~cvs20090209/Utilities/CMakeLists.txt	2009-03-15 23:50:05.000000000 +0000
+@@ -1,5 +1,5 @@
+-add_executable(KWConvertImageToHeader KWConvertImageToHeader.cxx)
+-target_link_libraries(KWConvertImageToHeader ${KWWidgets_LIBRARIES})
++#add_executable(KWConvertImageToHeader KWConvertImageToHeader.cxx)
++#target_link_libraries(KWConvertImageToHeader ${KWWidgets_LIBRARIES})
+ 
+ subdirs(
+   Doxygen
 diff -urNad kwwidgets-1.0.0~cvs20090209~/Utilities/Doxygen/CMakeLists.txt kwwidgets-1.0.0~cvs20090209/Utilities/Doxygen/CMakeLists.txt
---- kwwidgets-1.0.0~cvs20090209~/Utilities/Doxygen/CMakeLists.txt	2009-03-15 16:23:42.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20090209/Utilities/Doxygen/CMakeLists.txt	2009-03-15 16:29:36.000000000 -0400
+--- kwwidgets-1.0.0~cvs20090209~/Utilities/Doxygen/CMakeLists.txt	2009-03-15 23:50:02.000000000 +0000
++++ kwwidgets-1.0.0~cvs20090209/Utilities/Doxygen/CMakeLists.txt	2009-03-15 23:50:05.000000000 +0000
 @@ -37,6 +37,7 @@
      ${CMAKE_CURRENT_SOURCE_DIR}/doxyfile.in
      ${CMAKE_CURRENT_BINARY_DIR}/doxyfile)
@@ -50,8 +70,8 @@
      ${CMAKE_CURRENT_SOURCE_DIR}/doc_makeall.sh.in
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
 diff -urNad kwwidgets-1.0.0~cvs20090209~/Wrapping/Tcl/CMakeLists.txt kwwidgets-1.0.0~cvs20090209/Wrapping/Tcl/CMakeLists.txt
---- kwwidgets-1.0.0~cvs20090209~/Wrapping/Tcl/CMakeLists.txt	2009-03-15 16:23:42.000000000 -0400
-+++ kwwidgets-1.0.0~cvs20090209/Wrapping/Tcl/CMakeLists.txt	2009-03-15 16:27:10.000000000 -0400
+--- kwwidgets-1.0.0~cvs20090209~/Wrapping/Tcl/CMakeLists.txt	2009-03-15 23:50:02.000000000 +0000
++++ kwwidgets-1.0.0~cvs20090209/Wrapping/Tcl/CMakeLists.txt	2009-03-15 23:50:05.000000000 +0000
 @@ -47,8 +47,8 @@
    ${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
    @ONLY IMMEDIATE)