r35580 - in /packages/kwwidgets/trunk/debian: ./ patches/

domibel-guest at users.alioth.debian.org domibel-guest at users.alioth.debian.org
Sun Mar 15 21:53:01 UTC 2009


Author: domibel-guest
Date: Sun Mar 15 21:53:00 2009
New Revision: 35580

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=35580
Log:
Slicer-3-4 branch point

Added:
    packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch   (with props)
Removed:
    packages/kwwidgets/trunk/debian/patches/05_slicer-3-2.dpatch
    packages/kwwidgets/trunk/debian/patches/12_path.dpatch
    packages/kwwidgets/trunk/debian/patches/35_tcl.dpatch
    packages/kwwidgets/trunk/debian/patches/66_soname.dpatch
    packages/kwwidgets/trunk/debian/patches/77_doxygen.dpatch
    packages/kwwidgets/trunk/debian/patches/kw_doxygen.dpatch
Modified:
    packages/kwwidgets/trunk/debian/changelog
    packages/kwwidgets/trunk/debian/control
    packages/kwwidgets/trunk/debian/get-orig-source
    packages/kwwidgets/trunk/debian/patches/00list
    packages/kwwidgets/trunk/debian/rules

Modified: packages/kwwidgets/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/changelog?rev=35580&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/changelog (original)
+++ packages/kwwidgets/trunk/debian/changelog Sun Mar 15 21:53:00 2009
@@ -1,3 +1,9 @@
+kwwidgets (1.0.0~cvs20090209-1) experimental; urgency=low
+
+  * new upstream snapshot
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Sun, 15 Mar 2009 14:46:09 -0400
+
 kwwidgets (1.0.0~cvs20080526-3) experimental; urgency=low
 
   * removed debian/libkwwidgets1.symbols

Modified: packages/kwwidgets/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/control?rev=35580&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/control (original)
+++ packages/kwwidgets/trunk/debian/control Sun Mar 15 21:53:00 2009
@@ -3,8 +3,8 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
-Build-Depends: debhelper (>= 7), cmake, dpatch, libvtk5-dev, tcl8.4-dev, vtk-tcl,
- tk8.4-dev, libpng-dev, libfreetype6-dev, libxext-dev, libjpeg-dev, libtiff-dev,
+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
 Build-Depends-Indep: doxygen, graphviz, vtk-doc
 Standards-Version: 3.8.0

Modified: packages/kwwidgets/trunk/debian/get-orig-source
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/get-orig-source?rev=35580&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/get-orig-source (original)
+++ packages/kwwidgets/trunk/debian/get-orig-source Sun Mar 15 21:53:00 2009
@@ -1,7 +1,7 @@
 PACKAGE=kwwidgets
 
-VERSION=1.0.0~cvs20080526
-CVSDATE="2008-05-26 23:59:59"
+VERSION=1.0.0~cvs20090209
+CVSDATE="2009-02-09 23:59:59"
 
 FOLDER=$PACKAGE-$VERSION
 TARFILE=kwwidgets_$VERSION.orig.tar.gz
@@ -27,4 +27,3 @@
 
 tar cvzf $TARFILE $FOLDER
 rm -rf $FOLDER
-

Modified: packages/kwwidgets/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/patches/00list?rev=35580&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/00list (original)
+++ packages/kwwidgets/trunk/debian/patches/00list Sun Mar 15 21:53:00 2009
@@ -1,6 +1,1 @@
-05_slicer-3-2.dpatch
-12_path.dpatch
-35_tcl.dpatch
-66_soname.dpatch
-77_doxygen.dpatch
-kw_doxygen.dpatch
+30_all_patches.dpatch

Added: 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=35580&op=file
==============================================================================
--- packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch (added)
+++ packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch Sun Mar 15 21:53:00 2009
@@ -1,0 +1,65 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_all_patches.dpatch by  <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Install libraries to /usr/lib/
+## DP: Change tcl path
+## DP: Sets the SONAME
+## DP: KWWidgetsDoxygenDoc requires some .pl scripts at some particular places
+
+ at 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
+@@ -107,7 +107,7 @@
+ endif(NOT KWWidgets_INSTALL_BIN_DIR)
+ 
+ if(NOT KWWidgets_INSTALL_LIB_DIR)
+-  set(KWWidgets_INSTALL_LIB_DIR "/lib/${PROJECT_NAME}")
++  set(KWWidgets_INSTALL_LIB_DIR "/lib")
+ endif(NOT KWWidgets_INSTALL_LIB_DIR)
+ 
+ if(NOT KWWidgets_INSTALL_DATA_DIR)
+@@ -901,3 +901,17 @@
+     endif(NOT SQUISH_FOUND)
+   endif(KWWidgets_USE_Squish)
+ endif(BUILD_TESTING AND KWWidgets_BUILD_TESTING)
++
++
++IF (NOT DEFINED KWWidgets_SHAREDLIB_VERSION)
++  SET ( KWWidgets_SHAREDLIB_VERSION ${KWWidgets_VERSION} )
++  STRING ( REGEX MATCH "^[0-9]+" KWWidgets_SHAREDLIB_SOVERSION ${KWWidgets_SHAREDLIB_VERSION})
++ENDIF (NOT DEFINED KWWidgets_SHAREDLIB_VERSION)
++
++
++IF(KWWidgets_BUILD_SHARED_LIBS)
++  SET_TARGET_PROPERTIES(KWWidgetsPythonD KWWidgets PROPERTIES 
++     SOVERSION ${KWWidgets_SHAREDLIB_SOVERSION}
++     VERSION ${KWWidgets_SHAREDLIB_VERSION}
++  )
++ENDIF (KWWidgets_BUILD_SHARED_LIBS)
+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
+@@ -37,6 +37,7 @@
+     ${CMAKE_CURRENT_SOURCE_DIR}/doxyfile.in
+     ${CMAKE_CURRENT_BINARY_DIR}/doxyfile)
+ 
++  set(VTK_DOXYGEN_HOME /usr/share/doc/vtk-doc/html)
+   configure_file(
+     ${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
+@@ -47,8 +47,8 @@
+   ${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl
+   @ONLY IMMEDIATE)
+ if(NOT KWWidgets_INSTALL_NO_RUNTIME)
+-  install_files(${KWWidgets_INSTALL_LIB_DIR}/tcl FILES
+-    ${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl)
++  install_files(${KWWidgets_INSTALL_LIB_DIR}/KWWidgets/tcl FILES
++${KWWidgets_BINARY_DIR}/Wrapping/Tcl/Install/Hide/pkgIndex.tcl)
+ endif(NOT KWWidgets_INSTALL_NO_RUNTIME)
+ 
+ # Install kits

Propchange: packages/kwwidgets/trunk/debian/patches/30_all_patches.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/kwwidgets/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/kwwidgets/trunk/debian/rules?rev=35580&op=diff
==============================================================================
--- packages/kwwidgets/trunk/debian/rules (original)
+++ packages/kwwidgets/trunk/debian/rules Sun Mar 15 21:53:00 2009
@@ -32,8 +32,7 @@
               -DBUILD_DOCUMENTATION:BOOL=ON \
               -DKWWidgets_BUILD_EXAMPLES:BOOL=OFF \
               -DKWWidgets_BUILD_TESTING:BOOL=OFF \
-              -DVTK_DIR="/usr/lib/vtk-5.0"
-
+              -DVTK_DIR="/usr/lib/vtk-5.2"
 
 get-orig-source:
 	. debian/get-orig-source




More information about the debian-science-commits mailing list