[med-svn] r7849 - trunk/packages/insighttoolkit/trunk/debian

Steven Michael Robbins smr at alioth.debian.org
Sat Sep 17 17:32:04 UTC 2011 

Author: smr
Date: 2011-09-17 17:32:04 +0000 (Sat, 17 Sep 2011)
New Revision: 7849

Removed:
   trunk/packages/insighttoolkit/trunk/debian/itkwish.1
Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/compat
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/control.in
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Rewrite using debhelper instead of cdbs.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-17 14:49:37 UTC (rev 7848)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2011-09-17 17:32:04 UTC (rev 7849)
@@ -1,10 +1,12 @@
 insighttoolkit (3.20.0-16) unstable; urgency=low
 
   * Remove language wrappings.  New source packages, one per wrapped
-    language will be introduced to build the wrappings.  Build in Release
-    mode for full -O3 optimization.  Build in parallel.
+    language will be introduced to build the wrappings.  
+  * Build in Release mode for full -O3 optimization.  
+  * Build in parallel.
+  * Use debhelper instead of cdbs.
 
- -- Steve M. Robbins <smr at debian.org>  Sat, 17 Sep 2011 09:31:10 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 17 Sep 2011 12:31:22 -0500
 
 insighttoolkit (3.20.0-15) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/compat
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/compat	2011-09-17 14:49:37 UTC (rev 7848)
+++ trunk/packages/insighttoolkit/trunk/debian/compat	2011-09-17 17:32:04 UTC (rev 7849)
@@ -1 +1 @@
-7
+8

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2011-09-17 14:49:37 UTC (rev 7848)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2011-09-17 17:32:04 UTC (rev 7849)
@@ -4,14 +4,14 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
-Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 7), 
+Build-Depends: debhelper (>= 8), 
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev,
  libfftw3-dev,
  uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
 X-Python-Version: 2.6
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/insighttoolkit/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/insighttoolkit/trunk/
 

Modified: trunk/packages/insighttoolkit/trunk/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control.in	2011-09-17 14:49:37 UTC (rev 7848)
+++ trunk/packages/insighttoolkit/trunk/debian/control.in	2011-09-17 17:32:04 UTC (rev 7849)
@@ -4,14 +4,14 @@
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Steve M. Robbins <smr at debian.org>
-Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 7), 
+Build-Depends: debhelper (>= 8), 
  cmake, cableswig (>= 0.1.0+cvs20110226), gccxml (>= 0.9.0+cvs20110723),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev,
  libfftw3-dev,
  uuid-dev, libgdcm2-dev,
  libvtk5-dev, python-vtk
 X-Python-Version: 2.6
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/insighttoolkit/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/insighttoolkit/trunk/
 

Deleted: trunk/packages/insighttoolkit/trunk/debian/itkwish.1
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/itkwish.1	2011-09-17 14:49:37 UTC (rev 7848)
+++ trunk/packages/insighttoolkit/trunk/debian/itkwish.1	2011-09-17 17:32:04 UTC (rev 7849)
@@ -1,49 +0,0 @@
-.TH ITKWISH 1
-.\" NAME should be all caps, SECTION should be 1-8, maybe w/ subsection
-.\" other parms are allowed: see man(7), man(1)
-.SH NAME
-itkwish \- Insight Segmentation & Registration Toolkit
-.SH SYNOPSIS
-.B itkwish
-.I foo.tcl
-
-.SH "DESCRIPTION"
-This manual page documents briefly the
-.B itkwish
-command.
-
-.PP
-.B itkwish
-This program is like the Tcl/Tk interpreter 
-.I wish
-but is linked with The
-Insight Segmentation & Registration Toolkit (http://www.itk.org)
-
-.SH OPTIONS
-Hopefully, it accepts the same arguments as
-.I wish
-
-.SH EXAMPLE COMMANDS
-.B itkwish
-Provides a tcl prompt "%" from which ITK scripts can be written
-interactively.
-
-.B itkwish 
-.I myITKScript.tcl
-Runs the myITKScript.tcl script in the ITK Tcl interpreter.
-
-.B itkwish
-.I --run wish
-Runs wish in an environment in which the ITK packages can be
-loaded with "package require InsightToolkit".
-
-
-.SH "SEE ALSO"
-wish(1)
-
-.SH AUTHORS
-Ken Martin, Will Schroeder, and Bill Lorensen
-
-
-This manual page was written by Mathieu Malaterre
-<mathieu.malaterre at gmail.com> for the Debian GNU/Linux system (but may be used by others).

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-17 14:49:37 UTC (rev 7848)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2011-09-17 17:32:04 UTC (rev 7849)
@@ -1,35 +1,10 @@
 #!/usr/bin/make -f
 
-# If set, honour "parallel=N" option of DEB_BUILD_OPTIONS.  Comment
-# out to never build in parallel, regardless of DEB_BUILD_OPTIONS.
-DEB_BUILD_PARALLEL = true
-
-# Using install/fast bypasses the install->all dependency,
-# avoiding a complete rebuild by "make install".
-# See http://www.itk.org/pipermail/insight-users/2010-August/037827.html
-#
-# Override variable set in cmake.mk:
-DEB_MAKE_INSTALL_TARGET = install/fast DESTDIR=$(DEB_DESTDIR)
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/cmake.mk
-
 VER_MAJOR = 3
 VER_MINOR = 20
 VER_PATCH = 0
 
-VER_FULL = $(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
-SOVERSION = $(VER_MAJOR).$(VER_MINOR)
-
-UPSTREAM_SRC = InsightToolkit-$(VER_FULL)
-DEBIAN_SRC_DIR = insighttoolkit-$(VER_FULL)
-DEBIAN_SRC_TAR = insighttoolkit_$(VER_FULL).orig.tar.gz
-
-pkg_lib = libinsighttoolkit$(SOVERSION)
-pkg_dev = libinsighttoolkit$(VER_MAJOR)-dev
-pkg_examples = insighttoolkit$(VER_MAJOR)-examples
-
-DEB_CMAKE_EXTRA_FLAGS = \
+CMAKE_FLAGS = \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
 	-DBUILD_EXAMPLES:BOOL=OFF \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -53,16 +28,23 @@
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
 	-DUSE_WRAP_ITK:BOOL=OFF
 
-pre-build::
+%:
+	dh $@ --parallel
+
+override_dh_auto_configure: pre-build
+	dh_auto_configure -- $(CMAKE_FLAGS)
+
+pre-build:
 	echo "Available disk space:"
 	df -h .
 	test -d Code/Review || mv review Code/Review
 
-build/$(pkg_dev)::
+override_dh_auto_install:
+	dh_auto_install
 	sed -i -e "s#/usr/lib/\(`dpkg-architecture -qDEB_HOST_MULTIARCH`/\)\?lib\([^;]*\)\.so#\2#g" \
-		$(DEB_BUILDDIR)/ITKLibraryDepends.cmake
+		debian/tmp/usr/lib/InsightToolkit/ITKLibraryDepends.cmake
 
-common-build-arch::
+override_dh_lintian:
 	echo "$(pkg_lib): package-name-doesnt-match-sonames" > debian/$(pkg_lib).lintian-overrides
 	echo "$(pkg_lib): embedded-library usr/lib/libitkjpeg8.so.3.20.0: libjpeg" >> debian/$(pkg_lib).lintian-overrides
 	echo "$(pkg_lib): embedded-library usr/lib/libitkjpeg12.so.3.20.0: libjpeg" >> debian/$(pkg_lib).lintian-overrides
@@ -70,24 +52,28 @@
 	echo "$(pkg_lib): embedded-library usr/lib/libitkopenjpeg.so.3.20.0: openjpeg" >> debian/$(pkg_lib).lintian-overrides
 	dh_lintian
 
-install/$(pkg_lib)::
+override_dh_install: 
+	# pkg_lib
 	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
 	cp CMake/InsightValgrind.supp Insight$(SOVERSION)Valgrind.supp
 	cp Utilities/vxl/config/valgrind.supp Insight$(SOVERSION)VxlValgrind.supp
 	dh_install -p$(pkg_lib) Insight$(SOVERSION)*.supp usr/lib/valgrind
-
-install/$(pkg_dev)::
+	#
+	# pkg_dev
 	dh_installman -p$(pkg_dev) debian/insighttoolkit.3
 	dh_installdocs -p$(pkg_dev) Documentation/*
 	dh_install -p$(pkg_dev) -XJava -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so usr/lib
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/include/InsightToolkit/*
 	dh_install -p$(pkg_dev) --autodest debian/tmp/usr/lib/InsightToolkit/*.cmake
 	dh_install -p$(pkg_dev) Wrapping/WrapITK /usr/src
-
-install/$(pkg_examples)::
+	#
+	# pkg_examples
 	dh_installexamples -p$(pkg_examples) Examples/*
 	find debian/$(pkg_examples)/usr/share/doc/$(pkg_examples)/examples \
 	    -type f -print0 | xargs -0 chmod 644
+	#
+	# cleanup
+	dh_fixperms
 
 $(UPSTREAM_SRC).tar.gz:
 	wget http://voxel.dl.sourceforge.net/sourceforge/itk/$@

More information about the debian-med-commit mailing list