[med-svn] r2684 - in trunk/packages/gdcm/trunk/debian: . patches

Sat Nov 15 06:51:21 UTC 2008

Author: smr
Date: 2008-11-15 06:51:20 +0000 (Sat, 15 Nov 2008)
New Revision: 2684

Added:
   trunk/packages/gdcm/trunk/debian/patches/
   trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch
   trunk/packages/gdcm/trunk/debian/patches/series
Modified:
   trunk/packages/gdcm/trunk/debian/changelog
   trunk/packages/gdcm/trunk/debian/control
   trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
   trunk/packages/gdcm/trunk/debian/rules
Log:
Add support to use quilt for patch management.
Suppress version numbers on installed binaries.



Modified: trunk/packages/gdcm/trunk/debian/changelog
===================================================================

--- trunk/packages/gdcm/trunk/debian/changelog	2008-11-14 23:14:00 UTC (rev 2683)
+++ trunk/packages/gdcm/trunk/debian/changelog	2008-11-15 06:51:20 UTC (rev 2684)
@@ -6,12 +6,19 @@
     - debian/libgdcm-tools.install: Adapt to new upstream.
   
   * debian/rules: Set number of jobs based on "parallel=N" in
-    DEB_BUILD_OPTIONS, rather than hardcoding 4.
+    DEB_BUILD_OPTIONS, rather than hardcoding 4.  Use quilt for patch
+    handling.
   
-  * debian/control: Add build-dependencies for libjpeg62-dev,
+  * debian/control: Add build-dependencies for quilt, libjpeg62-dev,
     libtiff4-dev, libfreetype6-dev, and libxext-dev.
+  
+  * debian/patches/no-executable-properties.patch: New.  Add CMake option
+    to suppress appending version to binaries.  Based on patch from
+    Mathieu Malaterre.
+  * debian/libgdcm-tools.install: Don't install binaries with version
+    suffix.
 
- -- Steve M. Robbins <smr at debian.org>  Sun, 28 Sep 2008 23:23:46 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 15 Nov 2008 00:43:25 -0600
 
 gdcm (2.0.6) experimental; urgency=low
 

Modified: trunk/packages/gdcm/trunk/debian/control
===================================================================
--- trunk/packages/gdcm/trunk/debian/control	2008-11-14 23:14:00 UTC (rev 2683)
+++ trunk/packages/gdcm/trunk/debian/control	2008-11-15 06:51:20 UTC (rev 2684)
@@ -5,7 +5,7 @@
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>,
  Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11),
+Build-Depends: debhelper (>= 5.0.37.2), python-all-dev (>= 2.3.5-11), quilt,
  python-support (>= 0.3.9), uuid-dev, zlib1g-dev, libexpat1-dev,
  swig, cmake, libvtk5-dev, python-vtk, libpng12-dev | libpng-dev,
  libjpeg62-dev, libtiff4-dev, libfreetype6-dev, libxext-dev

Modified: trunk/packages/gdcm/trunk/debian/libgdcm-tools.install
===================================================================
--- trunk/packages/gdcm/trunk/debian/libgdcm-tools.install	2008-11-14 23:14:00 UTC (rev 2683)
+++ trunk/packages/gdcm/trunk/debian/libgdcm-tools.install	2008-11-15 06:51:20 UTC (rev 2684)
@@ -1,7 +1,7 @@
-usr/bin/gdcmdump*
-usr/bin/gdcmconv*
-usr/bin/gdcmimg*
-usr/bin/gdcminfo*
-usr/bin/gdcmraw*
-usr/bin/gdcmscanner*
-usr/bin/gdcmtar*
+usr/bin/gdcmdump
+usr/bin/gdcmconv
+usr/bin/gdcmimg
+usr/bin/gdcminfo
+usr/bin/gdcmraw
+usr/bin/gdcmscanner
+usr/bin/gdcmtar

Added: trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/no-executable-properties.patch	2008-11-15 06:51:20 UTC (rev 2684)
@@ -0,0 +1,39 @@
+--- gdcm-2.0.9.orig/CMakeLists.txt
++++ gdcm-2.0.9/CMakeLists.txt
+@@ -54,6 +54,10 @@
+   VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
+ )
+ 
++IF(GDCM_NO_EXECUTABLE_PROPERTIES)
++  SET(GDCM_EXECUTABLE_PROPERTIES)
++ENDIF(GDCM_NO_EXECUTABLE_PROPERTIES)
++
+ #-----------------------------------------------------------------------------
+ INCLUDE(${GDCM_SOURCE_DIR}/CMake/UseCopyright.cmake)
+ CREATE_COPYRIGHT_FILE(${CMAKE_CURRENT_BINARY_DIR}/Copyright.txt)
+--- gdcm-2.0.9.orig/Applications/Cxx/CMakeLists.txt
++++ gdcm-2.0.9/Applications/Cxx/CMakeLists.txt
+@@ -48,7 +48,9 @@
+   ADD_EXECUTABLE(${exename} ${exename}.cxx)
+   ENDIF(${exename} STREQUAL "gdcminfo")
+     TARGET_LINK_LIBRARIES(${exename} gdcmMSFF)
+-  SET_TARGET_PROPERTIES(${exename} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
++  IF(GDCM_EXECUTABLE_PROPERTIES)
++    SET_TARGET_PROPERTIES(${exename} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
++  ENDIF(GDCM_EXECUTABLE_PROPERTIES)
+   IF(WIN32 AND NOT CYGWIN)
+     TARGET_LINK_LIBRARIES(${exename} gdcmgetopt)
+   ENDIF(WIN32 AND NOT CYGWIN)
+--- gdcm-2.0.9.orig/Utilities/VTK/Applications/CMakeLists.txt
++++ gdcm-2.0.9/Utilities/VTK/Applications/CMakeLists.txt
+@@ -17,7 +17,9 @@
+ 
+ FOREACH(app ${GDCM_VTK_APPS})
+   ADD_EXECUTABLE(${app} ${app}.cxx)
+-  SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
++  IF(GDCM_EXECUTABLE_PROPERTIES)
++    SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
++  ENDIF(GDCM_EXECUTABLE_PROPERTIES)
+   TARGET_LINK_LIBRARIES(${app} vtkgdcm vtkRendering)
+   IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
+     TARGET_LINK_LIBRARIES(${app} vtkgdcm vtkWidgets)

Added: trunk/packages/gdcm/trunk/debian/patches/series
===================================================================
--- trunk/packages/gdcm/trunk/debian/patches/series	                        (rev 0)
+++ trunk/packages/gdcm/trunk/debian/patches/series	2008-11-15 06:51:20 UTC (rev 2684)
@@ -0,0 +1 @@
+no-executable-properties.patch

Modified: trunk/packages/gdcm/trunk/debian/rules
===================================================================
--- trunk/packages/gdcm/trunk/debian/rules	2008-11-14 23:14:00 UTC (rev 2683)
+++ trunk/packages/gdcm/trunk/debian/rules	2008-11-15 06:51:20 UTC (rev 2684)
@@ -8,6 +8,8 @@
 # of the binary packages independantly, via binary-<package> targets.
 # ---
 
+include /usr/share/quilt/quilt.make
+
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
@@ -41,7 +43,7 @@
 debian/configure-stamp: $(PYVERS:%=debian/configure-python%-stamp) 
 	touch $@
 
-debian/configure-python%-stamp: 
+debian/configure-python%-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	[ -d $(BUILD)-python$* ] || mkdir $(BUILD)-python$*
 	cd $(BUILD)-python$* && cmake $(CURDIR) -DCMAKE_INSTALL_PREFIX="/usr" \
@@ -74,7 +76,7 @@
 	-(cd $(BUILD)-python$* && LD_LIBRARY_PATH=$(BUILD)-python$*/gdcm ctest --force-new-ctest-process -V)
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f debian/configure*stamp debian/build*stamp 


