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

[smr at alioth.debian.org]

Author: smr
Date: 2008-04-30 06:01:26 +0000 (Wed, 30 Apr 2008)
New Revision: 14215

Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/library-naming.patch
Log:
Revert 14211.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2008-04-30 05:51:30 UTC (rev 14214)
+++ boost/trunk/debian/changelog	2008-04-30 06:01:26 UTC (rev 14215)
@@ -4,8 +4,8 @@
     debian/documentation-files: 
     debian/patches: Adjust to new version.
   
-  * debian/patches/library-naming.patch: New.  Remove toolset decoration
-    from library names.
+  * debian/patches/library-naming.patch: New.  Remove toolset and boost
+    version from library names.
   
   * debian/rtupdate: Remove logic for links with toolset name.
 

Modified: boost/trunk/debian/patches/library-naming.patch
===================================================================
--- boost/trunk/debian/patches/library-naming.patch	2008-04-30 05:51:30 UTC (rev 14214)
+++ boost/trunk/debian/patches/library-naming.patch	2008-04-30 06:01:26 UTC (rev 14215)
@@ -1,13 +1,37 @@
-This patch removes the <toolset> decoration from all library names.
+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,8 +309,8 @@
+@@ -309,7 +309,7 @@
          if $(layout) = versioned
          {
              local result = [ common.format-name
 -                <base> <toolset> <threading> <runtime> -$(BOOST_VERSION_TAG)
-+                <base> <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
+ {