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

[Steven Michael Robbins]

Author: smr
Date: 2010-10-23 02:36:57 +0000 (Sat, 23 Oct 2010)
New Revision: 5373

Modified:
   trunk/packages/insighttoolkit/trunk/debian/README.Debian
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Merge fix for #600867 from branches/3.18.0

Modified: trunk/packages/insighttoolkit/trunk/debian/README.Debian
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/README.Debian	2010-10-21 14:44:58 UTC (rev 5372)
+++ trunk/packages/insighttoolkit/trunk/debian/README.Debian	2010-10-23 02:36:57 UTC (rev 5373)
@@ -97,10 +97,23 @@
     ENDIF(ITK_FOUND)
 
 
+Valgrind
+~~~~~~~~
 
+To facilitate using valgrind with ITK-using packages, two valgrind
+suppression files are shipped with the library package.  To avoid
+conflicts, these files have been renamed.
+
+    CMake/InsightValgrind.supp becomes Insight$(SOVERSION)Valgrind.supp
+    Utilities/vxl/config/valgrind.supp becomes Insight$(SOVERSION)VxlValgrind.supp
+
+Both may be found in /usr/lib/valgrind.
+
+
+
 .. This document is written in reStructuredText, and can be processed
    to generate HTML, LaTeX and other rich output formats.  See the
    http://docutils.sourceforge.net/ project for more information.
 
 
- -- Gavin Baker <gavinb at antonym.org>, Thu Dec 01 22:42:37 2005
+ -- Steve M. Robbins <smr at debian.org>  Thu, 21 Oct 2010 03:55:00 -0500

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-10-21 14:44:58 UTC (rev 5372)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-10-23 02:36:57 UTC (rev 5373)
@@ -1,5 +1,9 @@
 insighttoolkit (3.20.0-3) experimental; urgency=low
 
+  * rules: Embed SOVERSION in valgrind suppression files to avoid file
+    conflicts on upgrade to new versions of insighttoolkit.  Closes:
+    #600867.  Merge from branches/3.18.0
+
   * Add Review/Statistics.  Use a separate tarball because the .orig.tar
     has all of Code/Review removed.
 

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2010-10-21 14:44:58 UTC (rev 5372)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2010-10-23 02:36:57 UTC (rev 5373)
@@ -94,9 +94,9 @@
 
 install/$(pkg_lib)::
 	dh_install -p$(pkg_lib) -XJava -XPython -XTcl debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
-	cp Utilities/vxl/config/valgrind.supp InsightVxlValgrind.supp
-	dh_install -p$(pkg_lib) InsightVxlValgrind.supp usr/lib/valgrind
-	dh_install -p$(pkg_lib) CMake/InsightValgrind.supp usr/lib/valgrind
+	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)::
 	dh_installman -p$(pkg_dev) debian/insighttoolkit.3