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

Sat May 10 13:59:26 UTC 2008

Author: smr
Date: 2008-05-10 13:59:25 +0000 (Sat, 10 May 2008)
New Revision: 1848

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/control
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Add major version number to package names.

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

--- trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-10 11:14:31 UTC (rev 1847)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2008-05-10 13:59:25 UTC (rev 1848)
@@ -1,8 +1,12 @@
 insighttoolkit (3.6.0-1) UNRELEASED; urgency=low
 
   * New upstream.
+  
+  * debian/control:
+  * debian/rules: Add major version ('3') to all package names,
+    in order to support two major versions in the Debian archive.
 
- -- Steve M. Robbins <smr at debian.org>  Thu, 08 May 2008 13:12:32 -0500
+ -- Steve M. Robbins <smr at debian.org>  Sat, 10 May 2008 08:58:30 -0500
 
 insighttoolkit (3.4.0-4) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control	2008-05-10 11:14:31 UTC (rev 1847)
+++ trunk/packages/insighttoolkit/trunk/debian/control	2008-05-10 13:59:25 UTC (rev 1848)
@@ -26,11 +26,13 @@
  .
  This package contains the libraries needed to run ITK applications.
 
-Package: python-insighttoolkit
+Package: python-insighttoolkit3
 Section: python
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}
 Suggests: insighttoolkit-examples
+Conflicts: python-insighttoolkit
+Replaces: python-insighttoolkit
 XB-Python-Version: ${python:Versions}
 Description: Image processing toolkit for registration and segmentation - Python bindings
  ITK is an open-source software toolkit for performing registration and
@@ -45,10 +47,12 @@
  .
  This package contains the Python language bindings for ITK.
 
-Package: libinsighttoolkit-dev
+Package: libinsighttoolkit3-dev
 Section: devel
 Architecture: any
 Depends: libinsighttoolkit3.6 (= ${binary:Version}), libfftw3-dev
+Conflicts: libinsighttoolkit-dev
+Replaces: libinsighttoolkit-dev
 Description: Image processing toolkit for registration and segmentation - development
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and
@@ -63,11 +67,13 @@
  This package contains the development files needed to build your own
  ITK applications.
 
-Package: insighttoolkit-examples
+Package: insighttoolkit3-examples
 Section: devel
 Architecture: all
 Depends: ${shlibs:Depends}
 Suggests: libinsighttoolkit-dev
+Conflicts: insighttoolkit-examples
+Replaces: insighttoolkit-examples
 Description: Image processing toolkit for registration and segmentation - examples
  ITK is an open-source software toolkit for performing registration and
  segmentation. Segmentation is the process of identifying and

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2008-05-10 11:14:31 UTC (rev 1847)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2008-05-10 13:59:25 UTC (rev 1848)
@@ -4,9 +4,14 @@
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
+pkg_lib = libinsighttoolkit3.6
+pkg_dev = libinsighttoolkit3-dev
+pkg_python = python-insighttoolkit3
+pkg_examples = insighttoolkit3-examples
+
 PYVERS = $(shell pyversions -r debian/control)
-PYMODDIR = usr/share/python-support/python-insighttoolkit
-PYEXTDIR = usr/lib/python-support/python-insighttoolkit/$(PYVERS)
+PYMODDIR = usr/share/python-support/$(pkg_python)
+PYEXTDIR = usr/lib/python-support/$(pkg_python)/$(PYVERS)
 
 DEB_BUILDDIR = $(CURDIR)/Build
 DEB_DESTDIR = $(CURDIR)/debian/tmp
@@ -25,24 +30,24 @@
 common-configure-arch:: $(DEB_BUILDDIR)/CMakeCache.txt
 	cd $(DEB_BUILDDIR) && cmake ..
 
-install/libinsighttoolkit3.6::
-	dh_install -plibinsighttoolkit3.6 -XPython debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
+install/$(pkg_lib)::
+	dh_install -p$(pkg_lib) -XPython debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
 
-install/libinsighttoolkit-dev::
-	dh_installman -plibinsighttoolkit-dev debian/insighttoolkit.3
-	dh_installdocs -plibinsighttoolkit-dev Documentation/*
-	dh_install -plibinsighttoolkit-dev -XPython debian/tmp/usr/lib/InsightToolkit/lib*.so usr/lib
-	dh_install -plibinsighttoolkit-dev --autodest debian/tmp/usr/include/InsightToolkit/*
-	dh_install -plibinsighttoolkit-dev --autodest debian/tmp/usr/lib/InsightToolkit/*.cmake 
+install/$(pkg_dev)::
+	dh_installman -p$(pkg_dev) debian/insighttoolkit.3
+	dh_installdocs -p$(pkg_dev) Documentation/*
+	dh_install -p$(pkg_dev) -XPython 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 
 
-install/python-insighttoolkit::
-	dh_install -ppython-insighttoolkit -XlibSwig debian/tmp/usr/lib/InsightToolkit/*Python.so* $(PYEXTDIR)
-	dh_install -ppython-insighttoolkit debian/tmp/usr/lib/InsightToolkit/libSwigRuntimePython.so* usr/lib
-	dh_install -ppython-insighttoolkit debian/tmp/usr/lib/InsightToolkit/python/* $(PYMODDIR)
-	dh_install -ppython-insighttoolkit debian/tmp/usr/lib/InsightToolkit/*.py   $(PYMODDIR)
-	dh_pysupport -ppython-insighttoolkit
+install/$(pkg_python)::
+	dh_install -p$(pkg_python) -XlibSwig debian/tmp/usr/lib/InsightToolkit/*Python.so* $(PYEXTDIR)
+	dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/libSwigRuntimePython.so* usr/lib
+	dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/python/* $(PYMODDIR)
+	dh_install -p$(pkg_python) debian/tmp/usr/lib/InsightToolkit/*.py   $(PYMODDIR)
+	dh_pysupport -p$(pkg_python)
 
-install/insighttoolkit-examples::
-	dh_installexamples -pinsighttoolkit-examples Examples/*
-	find debian/insighttoolkit-examples/usr/share/doc/insighttoolkit-examples/examples \
+install/$(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


