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

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Mon Dec 7 17:50:08 UTC 2009 

Author: domibel-guest
Date: Mon Dec  7 17:50:08 2009
New Revision: 36055

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36055
Log:
Debian release 1.0.0~cvs20090825 -3

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=36055&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/changelog (original)
+++ packages/kwwidgets/trunk/debian/changelog Mon Dec  7 17:50:08 2009
@@ -1,4 +1,4 @@
-kwwidgets (1.0.0~cvs20090825-3) UNRELEASED; urgency=low
+kwwidgets (1.0.0~cvs20090825-3) unstable; urgency=low
 
   * kwwidgets-doc: .png files downsized (Closes: #557818)
   * kwwidgets-doc: .md5 files removed (Closes: #552345)
@@ -9,8 +9,9 @@
                  debian/libkwwidgets1-dev.install
     moved to debian/rules
   * using default python version
+  * added ./CMake/FindMySQL.cmake
 
- -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Tue, 24 Nov 2009 13:35:57 -0500
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Mon, 07 Dec 2009 08:46:48 -0500
 
 kwwidgets (1.0.0~cvs20090825-2) unstable; urgency=low
 

Modified: packages/kwwidgets/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/control?rev=36055&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/control (original)
+++ packages/kwwidgets/trunk/debian/control Mon Dec  7 17:50:08 2009
@@ -6,7 +6,9 @@
 Build-Depends: debhelper (>= 7), cdbs, cmake, quilt (>= 0.40), vtk-tcl,
  libvtk5-dev (>= 5.2.1-10), tcl8.5-dev, tk8.5-dev, libpng-dev,
  libfreetype6-dev, libxext-dev, libjpeg-dev, libtiff-dev, libexpat1-dev,
- libxft-dev, python-support, python-dev, python-vtk
+ libxft-dev, python-support, python-dev, python-vtk, openjdk-6-jre-headless,
+ libgl2ps-dev, libmysqlclient-dev, libavcodec-dev, libavformat-dev, libswscale-dev,
+ mpi-default-dev, imagemagick
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.8.3
 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=36055&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/50_all_patches.diff (original)
+++ packages/kwwidgets/trunk/debian/patches/50_all_patches.diff Mon Dec  7 17:50:08 2009
@@ -6,8 +6,8 @@
 
 Index: kwwidgets-1.0.0~cvs20090825/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20090825.orig/CMakeLists.txt	2009-11-24 14:57:31.000000000 -0500
-+++ kwwidgets-1.0.0~cvs20090825/CMakeLists.txt	2009-11-24 14:57:39.000000000 -0500
+--- kwwidgets-1.0.0~cvs20090825.orig/CMakeLists.txt	2009-12-07 08:53:31.000000000 -0500
++++ kwwidgets-1.0.0~cvs20090825/CMakeLists.txt	2009-12-07 08:59:01.000000000 -0500
 @@ -107,7 +107,7 @@
  endif(NOT KWWidgets_INSTALL_BIN_DIR)
  
@@ -54,8 +54,8 @@
 +
 Index: kwwidgets-1.0.0~cvs20090825/Utilities/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20090825.orig/Utilities/CMakeLists.txt	2009-11-24 14:57:31.000000000 -0500
-+++ kwwidgets-1.0.0~cvs20090825/Utilities/CMakeLists.txt	2009-11-24 14:57:39.000000000 -0500
+--- kwwidgets-1.0.0~cvs20090825.orig/Utilities/CMakeLists.txt	2009-12-07 08:53:31.000000000 -0500
++++ kwwidgets-1.0.0~cvs20090825/Utilities/CMakeLists.txt	2009-12-07 08:59:01.000000000 -0500
 @@ -1,5 +1,5 @@
 -add_executable(KWConvertImageToHeader KWConvertImageToHeader.cxx)
 -target_link_libraries(KWConvertImageToHeader ${KWWidgets_LIBRARIES})
@@ -66,8 +66,8 @@
    Doxygen
 Index: kwwidgets-1.0.0~cvs20090825/Utilities/Doxygen/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20090825.orig/Utilities/Doxygen/CMakeLists.txt	2009-11-24 14:57:31.000000000 -0500
-+++ kwwidgets-1.0.0~cvs20090825/Utilities/Doxygen/CMakeLists.txt	2009-11-24 14:57:39.000000000 -0500
+--- kwwidgets-1.0.0~cvs20090825.orig/Utilities/Doxygen/CMakeLists.txt	2009-12-07 08:53:31.000000000 -0500
++++ kwwidgets-1.0.0~cvs20090825/Utilities/Doxygen/CMakeLists.txt	2009-12-07 08:59:01.000000000 -0500
 @@ -7,7 +7,7 @@
  if (BUILD_DOCUMENTATION)
  
@@ -92,8 +92,8 @@
      ${CMAKE_CURRENT_BINARY_DIR}/doc_makeall.sh)
 Index: kwwidgets-1.0.0~cvs20090825/Wrapping/Tcl/CMakeLists.txt
 ===================================================================
---- kwwidgets-1.0.0~cvs20090825.orig/Wrapping/Tcl/CMakeLists.txt	2009-11-24 14:57:31.000000000 -0500
-+++ kwwidgets-1.0.0~cvs20090825/Wrapping/Tcl/CMakeLists.txt	2009-11-24 14:57:39.000000000 -0500
+--- kwwidgets-1.0.0~cvs20090825.orig/Wrapping/Tcl/CMakeLists.txt	2009-12-07 08:53:31.000000000 -0500
++++ kwwidgets-1.0.0~cvs20090825/Wrapping/Tcl/CMakeLists.txt	2009-12-07 08:59:01.000000000 -0500
 @@ -47,8 +47,8 @@
    ${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
    @ONLY IMMEDIATE)
@@ -107,8 +107,8 @@
  # Install kits
 Index: kwwidgets-1.0.0~cvs20090825/Utilities/Doxygen/doxyfile.in
 ===================================================================
---- kwwidgets-1.0.0~cvs20090825.orig/Utilities/Doxygen/doxyfile.in	2009-11-24 14:57:42.000000000 -0500
-+++ kwwidgets-1.0.0~cvs20090825/Utilities/Doxygen/doxyfile.in	2009-11-24 15:01:34.000000000 -0500
+--- kwwidgets-1.0.0~cvs20090825.orig/Utilities/Doxygen/doxyfile.in	2009-12-07 08:53:31.000000000 -0500
++++ kwwidgets-1.0.0~cvs20090825/Utilities/Doxygen/doxyfile.in	2009-12-07 08:59:01.000000000 -0500
 @@ -1,166 +1,1559 @@
 -# -------------------------------------------------------------------------
 -# doxyfile for KWWidgets
@@ -1835,3 +1835,89 @@
 +# the various graphs.
 +
 +DOT_CLEANUP            = YES
+Index: kwwidgets-1.0.0~cvs20090825/CMake/FindMySQL.cmake
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ kwwidgets-1.0.0~cvs20090825/CMake/FindMySQL.cmake	2009-12-07 08:59:01.000000000 -0500
+@@ -0,0 +1,68 @@
++#
++# Find the MySQL client includes and library
++# 
++
++# This module defines
++# MYSQL_INCLUDE_DIRECTORIES, where to find mysql.h
++# MYSQL_LIBRARIES, the libraries to link against to connect to MySQL
++# MYSQL_FOUND, If false, you cannot build anything that requires MySQL.
++
++# also defined, but not for general use are
++# MYSQL_LIBRARY, where to find the MySQL library.
++
++# 
++# XXX NOTE: This is not yet for general use.  I'm pretty sure there
++# are other libraries I have to link against at the same time.
++#
++
++SET( MYSQL_FOUND 0 )
++
++FIND_PATH(MYSQL_INCLUDE_DIRECTORIES mysql.h
++  /usr/include
++  /usr/include/mysql
++  /usr/local/include
++  /usr/local/include/mysql
++  /usr/local/mysql/include
++  "C:/Program Files/MySQL/include"
++  "C:/MySQL/include"
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
++  DOC "Specify the directory containing mysql.h."
++)
++
++FIND_LIBRARY( MYSQL_LIBRARY 
++  NAMES mysql libmysql mysqlclient
++  PATHS
++  /usr/lib
++  /usr/lib/mysql
++  /usr/local/lib
++  /usr/local/lib/mysql
++  /usr/local/mysql/lib
++  "C:/Program Files/MySQL/lib"
++  "C:/MySQL/lib/debug"
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
++  "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt"
++  DOC "Specify the mysql library here."
++)
++
++# On Windows you typically don't need to include any extra libraries
++# to build MYSQL stuff.
++
++IF (NOT WIN32)
++  FIND_LIBRARY( MYSQL_EXTRA_LIBRARIES
++                NAMES z zlib
++                PATHS /usr/lib /usr/local/lib 
++                DOC "If more libraries are necessary to link in a MySQL client (typically zlib), specify them here.")
++ELSE (NOT WIN32)
++  SET( MYSQL_EXTRA_LIBRARIES "" )
++ENDIF (NOT WIN32)
++
++
++IF (MYSQL_LIBRARY)
++  IF (MYSQL_INCLUDE_DIRECTORIES)
++    SET( MYSQL_FOUND 1 )
++  ENDIF (MYSQL_INCLUDE_DIRECTORIES)
++ENDIF (MYSQL_LIBRARY)
++
++MARK_AS_ADVANCED( MYSQL_FOUND MYSQL_LIBRARY MYSQL_EXTRA_LIBRARIES MYSQL_INCLUDE_DIRECTORIES )
++
+Index: kwwidgets-1.0.0~cvs20090825/CMake/KWWidgetsPathsMacros.cmake
+===================================================================
+--- kwwidgets-1.0.0~cvs20090825.orig/CMake/KWWidgetsPathsMacros.cmake	2009-12-07 08:59:16.000000000 -0500
++++ kwwidgets-1.0.0~cvs20090825/CMake/KWWidgetsPathsMacros.cmake	2009-12-07 08:59:46.000000000 -0500
+@@ -489,7 +489,7 @@
+ 
+   if(VTK_USE_MYSQL)
+     if(NOT MYSQL_INCLUDE_DIRECTORIES AND NOT MYSQL_LIBRARY)
+-      include("${VTK_CMAKE_DIR}/FindMySQL.cmake")
++      include("${KWWidgets_CMAKE_DIR}/FindIncrTCL.cmake")
+     endif(NOT MYSQL_INCLUDE_DIRECTORIES AND NOT MYSQL_LIBRARY)
+     if(MYSQL_LIBRARY)
+       get_filename_component(path "${MYSQL_LIBRARY}" PATH)

More information about the debian-science-commits mailing list