r9495 - in packages/trunk/holotz-castle/debian: . patches

[Barry deFreese]

Author: bdefreese
Date: 2009-04-08 17:18:28 +0000 (Wed, 08 Apr 2009)
New Revision: 9495

Added:
   packages/trunk/holotz-castle/debian/patches/10_dont_hardcode_g++41.patch
Modified:
   packages/trunk/holotz-castle/debian/changelog
   packages/trunk/holotz-castle/debian/copyright
   packages/trunk/holotz-castle/debian/patches/series
Log:
  * Version GPL license path to GPL-2.
  * 10_dont_hardcode_g++41.patch - JLib/Makefile hardcoded to g++-4.1.


Modified: packages/trunk/holotz-castle/debian/changelog
===================================================================
--- packages/trunk/holotz-castle/debian/changelog	2009-04-08 17:15:44 UTC (rev 9494)
+++ packages/trunk/holotz-castle/debian/changelog	2009-04-08 17:18:28 UTC (rev 9495)
@@ -10,6 +10,8 @@
 
   [ Barry deFreese ]
   * Add myself to uploaders.
+  * Version GPL license path to GPL-2.
+  * 10_dont_hardcode_g++41.patch - JLib/Makefile hardcoded to g++-4.1.
   * Bump Standards Version to 3.8.1. (No changes needed).
 
  -- Barry deFreese <bdefreese at debian.org>  Wed, 08 Apr 2009 12:42:18 -0400

Modified: packages/trunk/holotz-castle/debian/copyright
===================================================================
--- packages/trunk/holotz-castle/debian/copyright	2009-04-08 17:15:44 UTC (rev 9494)
+++ packages/trunk/holotz-castle/debian/copyright	2009-04-08 17:18:28 UTC (rev 9495)
@@ -24,4 +24,4 @@
    02110-1301, USA
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.

Added: packages/trunk/holotz-castle/debian/patches/10_dont_hardcode_g++41.patch
===================================================================
--- packages/trunk/holotz-castle/debian/patches/10_dont_hardcode_g++41.patch	                        (rev 0)
+++ packages/trunk/holotz-castle/debian/patches/10_dont_hardcode_g++41.patch	2009-04-08 17:18:28 UTC (rev 9495)
@@ -0,0 +1,26 @@
+#Author: Barry deFreese <bdefreese at debian.org>
+#Description: Don't hardcode g++-4.1 in JLib/Makefile.
+Index: holotz-castle-1.3.13-src/JLib/Makefile
+===================================================================
+--- holotz-castle-1.3.13-src.orig/JLib/Makefile	2009-04-08 12:58:09.000000000 -0400
++++ holotz-castle-1.3.13-src/JLib/Makefile	2009-04-08 12:58:40.000000000 -0400
+@@ -29,15 +29,15 @@
+ 
+ # JLib
+ libJLib: $(JLIB_OBJS)
+-	g++-4.1 -shared -L/usr/lib -fPIC -o $@.so $? \
++	g++ -shared -L/usr/lib -fPIC -o $@.so $? \
+ 	&& ar rvus $@.a $? \
+ 
+ $(GRAPHICS)/%.o: $(GRAPHICS)/%.cpp
+-	g++-4.1 $(CFLAGS) -c -o $@ $<
++	g++ $(CFLAGS) -c -o $@ $<
+ $(UTIL)/%.o: $(UTIL)/%.cpp
+-	g++-4.1 $(CFLAGS) -c -o $@ $<
++	g++ $(CFLAGS) -c -o $@ $<
+ $(MATH)/%.o: $(MATH)/%.cpp
+-	g++-4.1 $(CFLAGS) -c -o $@ $<
++	g++ $(CFLAGS) -c -o $@ $<
+ 
+ .PHONY: install
+ install:

Modified: packages/trunk/holotz-castle/debian/patches/series
===================================================================
--- packages/trunk/holotz-castle/debian/patches/series	2009-04-08 17:15:44 UTC (rev 9494)
+++ packages/trunk/holotz-castle/debian/patches/series	2009-04-08 17:18:28 UTC (rev 9495)
@@ -7,3 +7,4 @@
 07_hcenemy.patch -p1
 08_jlib_jtree.patch -p1
 09_gcc-4.3.patch
+10_dont_hardcode_g++41.patch