[pkg-boost-commits] r14201 - in boost/trunk/debian: . patches

[smr at alioth.debian.org]

Author: smr
Date: 2008-04-14 03:06:57 +0000 (Mon, 14 Apr 2008)
New Revision: 14201

Added:
   boost/trunk/debian/patches/library-naming.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
Log:
Patch to remove the toolset and boost version from library names.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-04-13 11:07:28 UTC (rev 14200)
+++ boost/trunk/debian/changelog	2008-04-14 03:06:57 UTC (rev 14201)
@@ -1,6 +1,10 @@
 boost (1.35.0-1) UNRELEASED; urgency=low
 
   * New upstream version.  Closes: #473752.
+    debian/patches: Adjust to new version.
+  
+  * debian/patches/library-naming.patch: Remove toolset and boost version
+    from library names.
 
  -- Steve M. Robbins <smr at debian.org>  Sun, 13 Apr 2008 05:51:33 -0500
 

Added: boost/trunk/debian/patches/library-naming.patch
===================================================================
--- boost/trunk/debian/patches/library-naming.patch	                        (rev 0)
+++ boost/trunk/debian/patches/library-naming.patch	2008-04-14 03:06:57 UTC (rev 14201)
@@ -0,0 +1,37 @@
+The first chunk removes the toolset and boost version from the library 
+names.  
+
+The second chunk removes a rule that creates an unversioned
+hard link; e.g. foo.so --> foo-1_35.so.1.35.0.  However, there is
+also a rule that creates a softlink foo-1_35.so --> foo-1_35.so.1.35.0.
+
+After removing the boost version, both links are the same.
+We keep the softlink.
+--- upstream-boost-1.35.0/Jamroot	2008-03-25 15:47:24.000000000 -0500
++++ boost-1.35.0/Jamroot	2008-04-13 19:19:07.000000000 -0500
+@@ -309,7 +309,7 @@
+         if $(layout) = versioned
+         {
+             local result = [ common.format-name
+-                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
++                <base> <threading> <runtime> 
+                 -$(BUILD_ID)
+                 : $(name) : $(type) : $(property-set) ] ;
+             
+@@ -445,13 +445,9 @@
+         return $(result) ;
+     }    
+             
+-    generate stage-unversioned : stage-proper : 
+-      <generating-rule>@make-unversioned-links ;
+-    explicit stage-unversioned ;
+-    
+-    generate install-unversioned : install-proper : 
+-      <generating-rule>@make-unversioned-links ;
+-    explicit install-unversioned ;
++    # Create do-nothing aliases
++    alias stage-unversioned ;
++    alias install-unversioned ;
+ }
+ else
+ {

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2008-04-13 11:07:28 UTC (rev 14200)
+++ boost/trunk/debian/patches/series	2008-04-14 03:06:57 UTC (rev 14201)
@@ -1,3 +1,4 @@
+library-naming.patch
 suppress-compiler-warnings.patch
 gcc-4.3.patch
 date_time_date_formatting_hpp.patch