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

[Steven Michael Robbins]

Author: smr
Date: 2011-04-16 06:47:37 +0000 (Sat, 16 Apr 2011)
New Revision: 14647

Removed:
   boost/trunk/debian/patches/remove-rpath.patch
Modified:
   boost/trunk/debian/changelog
   boost/trunk/debian/patches/series
   boost/trunk/debian/rules
Log:
drop remove-rpath.patch.

Modified: boost/trunk/debian/changelog
===================================================================
--- boost/trunk/debian/changelog	2011-04-15 21:16:46 UTC (rev 14646)
+++ boost/trunk/debian/changelog	2011-04-16 06:47:37 UTC (rev 14647)
@@ -10,7 +10,11 @@
     indicate all versions supported.  Ensure all python packages use both
     ${python:Depends} and ${python:Breaks}.
   
- -- Steve M. Robbins <smr at debian.org>  Fri, 15 Apr 2011 12:46:56 -0500
+  * rules: Remove execute bit from files in usr/share/boost-build.
+  
+  * patches/remove-rpath.patch: Delete.  Closes: #619766.
+  
+ -- Steve M. Robbins <smr at debian.org>  Sat, 16 Apr 2011 01:45:40 -0500
 
 boost1.46 (1.46.1-3) unstable; urgency=low
 

Deleted: boost/trunk/debian/patches/remove-rpath.patch
===================================================================
--- boost/trunk/debian/patches/remove-rpath.patch	2011-04-15 21:16:46 UTC (rev 14646)
+++ boost/trunk/debian/patches/remove-rpath.patch	2011-04-16 06:47:37 UTC (rev 14647)
@@ -1,44 +0,0 @@
-Description: Do not set rpath
-Author: Steve Robbins <smr at debian.org>
-Upstream: http://lists.boost.org/boost-build/2010/09/24089.php
-Upstream-Bug: https://svn.boost.org/trac/boost/ticket/5343
-
-
---- boost1.44-1.44.0.orig/tools/build/v2/tools/gcc.jam
-+++ boost1.44-1.44.0/tools/build/v2/tools/gcc.jam
-@@ -823,7 +823,7 @@
- 
- actions link bind LIBRARIES
- {
--    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
-+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
- 
- }
- 
-@@ -888,7 +888,7 @@
- # Differs from 'link' above only by -shared.
- actions link.dll bind LIBRARIES
- {
--    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
-+    "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
- }
- 
- rule setup-threading ( targets * : sources * : properties * )
---- boost1.44-1.44.0.orig/tools/build/v2/tools/gcc.py
-+++ boost1.44-1.44.0/tools/build/v2/tools/gcc.py
-@@ -586,7 +586,6 @@
- engine.register_action(
-     'gcc.link',
-     '"$(CONFIG_COMMAND)" -L"$(LINKPATH)" ' +
--        '-Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" ' +
-         '-Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" ' +
-         '$(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) ' +
-         '-l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) ' +
-@@ -648,7 +647,6 @@
-     'gcc.link.dll',
-     # Differ from 'link' above only by -shared.
-     '"$(CONFIG_COMMAND)" -L"$(LINKPATH)" ' +
--        '-Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" ' +
-         '"$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" ' +
-         '$(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) ' +
-         '-shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) ' +

Modified: boost/trunk/debian/patches/series
===================================================================
--- boost/trunk/debian/patches/series	2011-04-15 21:16:46 UTC (rev 14646)
+++ boost/trunk/debian/patches/series	2011-04-16 06:47:37 UTC (rev 14647)
@@ -8,6 +8,5 @@
 hurd-execution_monitor.patch
 kfreebsd-thread.patch
 fusion-name-qual.patch
-remove-rpath.patch
 boost-1.44-py3.1.patch
 changeset_71050.diff

Modified: boost/trunk/debian/rules
===================================================================
--- boost/trunk/debian/rules	2011-04-15 21:16:46 UTC (rev 14646)
+++ boost/trunk/debian/rules	2011-04-16 06:47:37 UTC (rev 14647)
@@ -252,7 +252,7 @@
 	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-python$(PKGVERSION)-dev.rtupdate
 	install --mode=755 -D debian/rtupdate debian/tmp/usr/share/python/runtime.d/libboost-mpi-python$(PKGVERSION)-dev.rtupdate
 
-	find debian/tmp/usr/include -type f | xargs chmod 644
+	find debian/tmp/usr/include debian/tmp/usr/share/boost-build -type f | xargs chmod 644
 	find debian/tmp -name .cvsignore | xargs rm -f
 	find debian -empty -type f | xargs rm -f