r10947 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2010-04-24 03:51:15 +0000 (Sat, 24 Apr 2010)
New Revision: 10947

Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/control
   packages/trunk/warzone2100/debian/rules
Log:
Use the system GLee and remove the embedded version during build

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2010-04-24 02:13:17 UTC (rev 10946)
+++ packages/trunk/warzone2100/debian/changelog	2010-04-24 03:51:15 UTC (rev 10947)
@@ -8,6 +8,7 @@
     at the upstream website for downloading and installing them since
     Debian does not yet have a good solution for distributing them.
     (Closes: #439736)
+  * Use the system GLee and remove the embedded version during build
 
  -- Paul Wise <pabs at debian.org>  Sat, 13 Mar 2010 13:20:19 +0700
 

Modified: packages/trunk/warzone2100/debian/control
===================================================================
--- packages/trunk/warzone2100/debian/control	2010-04-24 02:13:17 UTC (rev 10946)
+++ packages/trunk/warzone2100/debian/control	2010-04-24 03:51:15 UTC (rev 10947)
@@ -20,6 +20,7 @@
  dpkg-dev (>= 1.13.19),
  libglc-dev,
  libpopt-dev,
+ glee-dev | libglee-dev,
  pkg-config,
  zip,
  unzip

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2010-04-24 02:13:17 UTC (rev 10946)
+++ packages/trunk/warzone2100/debian/rules	2010-04-24 03:51:15 UTC (rev 10947)
@@ -35,6 +35,8 @@
 #	sed -i -e 's_automake[^/" ]*_automake-1.10_g' autogen.sh
 #	sed -i -e 's_aclocal[^/" ]*_aclocal-1.10_g' autogen.sh
 #	./autogen.sh
+	# Remove GLee embedded code copy so we never use it
+	rm lib/ivis_opengl/GLee.c
 	./configure \
 	    CFLAGS="$(CFLAGS)" \
 	    LDFLAGS="$(LDFLAGS)" \