r5841 - in packages/trunk/wesnoth: . debian debian/patches

[Gerfried Fuchs]

Author: alfie
Date: 2008-02-19 07:18:03 +0000 (Tue, 19 Feb 2008)
New Revision: 5841

Added:
   packages/trunk/wesnoth/debian/patches/
   packages/trunk/wesnoth/debian/patches/01disable-rpath
   packages/trunk/wesnoth/debian/patches/series
Modified:
   packages/trunk/wesnoth/
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/rules
Log:
  * Another new upstream release (aka the real 1.4-rc1).
  * Build with --disable-rpath, also add patch disable-rpath because the boost
    macro doesn't check for the configure switch.



Property changes on: packages/trunk/wesnoth
___________________________________________________________________
Name: svn-bp:origUrl
   - http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.3.17.orig.tar.gz

   + http://pkg-games.alioth.debian.org/tarballs/wesnoth_1.3.18.orig.tar.gz


Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-02-19 05:29:40 UTC (rev 5840)
+++ packages/trunk/wesnoth/debian/changelog	2008-02-19 07:18:03 UTC (rev 5841)
@@ -1,12 +1,14 @@
-wesnoth (1:1.3.17-1) unstable; urgency=low
+wesnoth (1:1.3.18-1) unstable; urgency=low
 
   * New upstream release (aka 1.4-rc1).
   * Update watchfile to match everything, not only development releases, for
     the time being until the next stable release.
   * Use fixed control file substitute strings and switch in debian/rules
     appropriately.
+  * Build with --disable-rpath, also add patch disable-rpath because the boost
+    macro doesn't check for the configure switch.
 
- -- Gerfried Fuchs <rhonda at debian.at>  Mon, 18 Feb 2008 11:54:17 +0100
+ -- Gerfried Fuchs <rhonda at debian.at>  Mon, 18 Feb 2008 23:27:31 +0100
 
 wesnoth (1:1.3.16-1) unstable; urgency=low
 

Added: packages/trunk/wesnoth/debian/patches/01disable-rpath
===================================================================
--- packages/trunk/wesnoth/debian/patches/01disable-rpath	                        (rev 0)
+++ packages/trunk/wesnoth/debian/patches/01disable-rpath	2008-02-19 07:18:03 UTC (rev 5841)
@@ -0,0 +1,25 @@
+Author: Gerfried Fuchs <rhonda at debian.at>	vim:ft=diff:
+Description: disable rpath for real
+
+Index: wesnoth-1.3.17/configure
+===================================================================
+--- wesnoth-1.3.17.orig/configure
++++ wesnoth-1.3.17/configure
+@@ -14467,7 +14467,7 @@ rm -f core conftest.err conftest_ipa8_co
+       ac_objext=$boost_save_ac_objext
+       LDFLAGS=$boost_save_LDFLAGS
+       if test x"$boost_cv_lib_iostreams" = xyes; then
+-        boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath -R$boost_ldpath"
++        boost_cv_lib_iostreams_LDFLAGS="-L$boost_ldpath"
+         boost_cv_lib_iostreams_LIBS="-l$boost_lib"
+         LIBS=$boost_save_LIBS
+         break 6
+@@ -14807,7 +14807,7 @@ rm -f core conftest.err conftest_ipa8_co
+       ac_objext=$boost_save_ac_objext
+       LDFLAGS=$boost_save_LDFLAGS
+       if test x"$boost_cv_lib_unit_test_framework" = xyes; then
+-        boost_cv_lib_unit_test_framework_LDFLAGS="-L$boost_ldpath -R$boost_ldpath"
++        boost_cv_lib_unit_test_framework_LDFLAGS="-L$boost_ldpath"
+         boost_cv_lib_unit_test_framework_LIBS="-l$boost_lib"
+         LIBS=$boost_save_LIBS
+         break 6

Added: packages/trunk/wesnoth/debian/patches/series
===================================================================
--- packages/trunk/wesnoth/debian/patches/series	                        (rev 0)
+++ packages/trunk/wesnoth/debian/patches/series	2008-02-19 07:18:03 UTC (rev 5841)
@@ -0,0 +1 @@
+01disable-rpath

Modified: packages/trunk/wesnoth/debian/rules
===================================================================
--- packages/trunk/wesnoth/debian/rules	2008-02-19 05:29:40 UTC (rev 5840)
+++ packages/trunk/wesnoth/debian/rules	2008-02-19 07:18:03 UTC (rev 5841)
@@ -54,7 +54,7 @@
 	dh_testdir
 	# Add here commands to configure the package.
 	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr --mandir=\$${prefix}/share/man \
+		--disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man \
 		--bindir=\$${prefix}/games --with-datadir-name=wesnoth \
 		--with-localedir=\$${prefix}/share/locale \
 		--with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games \