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

Wed Nov 12 05:28:09 UTC 2008

Author: smr
Date: 2008-11-12 05:28:09 +0000 (Wed, 12 Nov 2008)
New Revision: 2661

Modified:
   trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/compat
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Updates for upstream version 3.10.0.
Use debhelper compat level 7.
Fix parallel build: specify -jN only to initial make.
Temporarily comment out doxygen commands (too slow).
Use CMAKE_BUILD_TYPE=RELEASE, to obtain -O3 optimization.


Modified: trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian
===================================================================

--- trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian	2008-11-12 05:17:57 UTC (rev 2660)
+++ trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian	2008-11-12 05:28:09 UTC (rev 2661)
@@ -18,7 +18,7 @@
 BUILD_TESTING:BOOL=OFF
 
 // Give us an optimised release build
-CMAKE_BUILD_TYPE:STRING=RELWITHDEBINFO
+CMAKE_BUILD_TYPE:STRING=RELEASE
 
 // Install path prefix, prepended onto install directories
 CMAKE_INSTALL_PREFIX:PATH=/usr

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2008-11-12 05:17:57 UTC (rev 2660)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2008-11-12 05:28:09 UTC (rev 2661)
@@ -1,16 +1,28 @@
-insighttoolkit (3.8.0-2) UNRELEASED; urgency=low
+insighttoolkit (3.10.0-1) UNRELEASED; urgency=low
+  
+  * New upstream version.
+    - patches/nifti-versioning.patch: Remove.  Applied upstream.
+    - control:
+    - rules: Update version numbers, package names.
 
   [Dominique Belhachemi]
-  * debian/control: new documentation package: insighttoolkit3.8-doc
-  * debian/rules: generate source code documentation with doxygen
+  * control: new documentation package: insighttoolkitX.Y-doc
+  * rules: generate source code documentation with doxygen
   
   [Steve M. Robbins]
-  * debian/control: Build-depend on uuid-dev (gdcm uses it).
-  * debian/copyright: Update download URL.
-  * debian/rules: Adhere to parallel=N in DEB_BUILD_OPTIONS by setting
-    MAKEFLAGS.
+  * control: Build-depend on uuid-dev (gdcm uses it).
+  
+  * copyright: Update download URL.
+  
+  * rules: Adhere to parallel=N in DEB_BUILD_OPTIONS by setting MAKEFLAGS.
+  
+  * compat: Set to 7.
+  * control: Update build-dep on debhelper to version >= 7.
 
- -- Steve M. Robbins <smr at debian.org>  Wed, 15 Oct 2008 07:00:54 -0500
+  * CMakeCache.txt.debian: Set CMAKE_BUILD_TYPE to "RELEASE" so that we
+    build with -O3 (not -O2), necessary to optimize the templated code.
+  
+ -- Steve M. Robbins <smr at debian.org>  Tue, 11 Nov 2008 23:12:28 -0600
 
 insighttoolkit (3.8.0-1) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/compat
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/compat	2008-11-12 05:17:57 UTC (rev 2660)
+++ trunk/packages/insighttoolkit/trunk/debian/compat	2008-11-12 05:28:09 UTC (rev 2661)
@@ -1 +1 @@
-5
+7

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2008-11-12 05:17:57 UTC (rev 2660)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2008-11-12 05:28:09 UTC (rev 2661)
@@ -4,7 +4,7 @@
 Priority: optional
 Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Gavin Baker <gavinb at antonym.org>, Steve M. Robbins <smr at debian.org>
-Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 6.0.7), cmake, cableswig, gccxml (>= 0.9.0+cvs20080525),
+Build-Depends: cdbs (>= 0.4.49), quilt, debhelper (>= 7), cmake, cableswig, gccxml (>= 0.9.0+cvs20080525),
  zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3), python-support (>= 0.6.4), python-dev,
  python-numarray, libfftw3-dev, tcl8.4-dev, tk8.4-dev, uuid-dev, doxygen, graphviz
 XS-Python-Version: current
@@ -12,7 +12,7 @@
 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/
 
-Package: libinsighttoolkit3.8
+Package: libinsighttoolkit3.10
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
@@ -69,7 +69,7 @@
 Package: libinsighttoolkit3-dev
 Section: libdevel
 Architecture: any
-Depends: libinsighttoolkit3.8 (= ${binary:Version}), libfftw3-dev
+Depends: libinsighttoolkit3.10 (= ${binary:Version}), libfftw3-dev
 Conflicts: libinsighttoolkit-dev
 Replaces: libinsighttoolkit-dev
 Suggests: insighttoolkit3-examples
@@ -107,7 +107,7 @@
  .
  This package contains the source for example programs.
 
-Package: insighttoolkit3.8-doc
+Package: insighttoolkit3.10-doc
 Section: doc
 Architecture: all
 Suggests: libinsighttoolkit3-dev

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2008-11-12 05:17:57 UTC (rev 2660)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2008-11-12 05:28:09 UTC (rev 2661)
@@ -5,7 +5,7 @@
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 VER_MAJOR = 3
-VER_MINOR = 8
+VER_MINOR = 10
 VER_PATCH = 0
 
 UPSTREAM_SRC = InsightToolkit-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
@@ -32,9 +32,10 @@
 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-	MAKEFLAGS += -j$(NUMJOBS)
+	DEB_MAKE_BUILD_TARGET = -j$(NUMJOBS) all
 endif
 
+
 clean::
 	rm -rf $(DEB_BUILDDIR)
 
@@ -52,8 +53,8 @@
 
 common-configure-arch:: $(DEB_BUILDDIR)/CMakeCache.txt
 	cd $(DEB_BUILDDIR) && cmake ..
-	doxygen -u $(DEB_BUILDDIR)/Utilities/Doxygen/doxygen.config
-	doxygen $(DEB_BUILDDIR)/Utilities/Doxygen/doxygen.config
+	#doxygen -u $(DEB_BUILDDIR)/Utilities/Doxygen/doxygen.config
+	#doxygen $(DEB_BUILDDIR)/Utilities/Doxygen/doxygen.config
 
 common-build-arch::
 	echo "$(pkg_tcl): non-dev-pkg-with-shlib-symlink" > debian/$(pkg_tcl).lintian-overrides


