r1461 - in packages/trunk/glest/debian: . patches

[Eddy Petrisor]

Author: eddyp-guest
Date: 2006-08-31 22:36:35 +0000 (Thu, 31 Aug 2006)
New Revision: 1461

Modified:
   packages/trunk/glest/debian/patches/05_nomapeditor.dpatch
   packages/trunk/glest/debian/rules
Log:
reedit the nomap editor patch not to include rejects; make sure the clean target can be run at all times by running configure; thinking more and more of embedding the nomapeditor taget in the debian diff

Modified: packages/trunk/glest/debian/patches/05_nomapeditor.dpatch
===================================================================
--- packages/trunk/glest/debian/patches/05_nomapeditor.dpatch	2006-08-31 21:38:32 UTC (rev 1460)
+++ packages/trunk/glest/debian/patches/05_nomapeditor.dpatch	2006-08-31 22:36:35 UTC (rev 1461)
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad glest-2.0.0~/mk/linux/Jamfile glest-2.0.0/mk/linux/Jamfile
---- glest-2.0.0~/mk/linux/Jamfile	2006-08-15 14:11:12.000000000 +0000
-+++ glest-2.0.0/mk/linux/Jamfile	2006-08-15 14:11:38.000000000 +0000
+--- glest-2.0.0~/mk/linux/Jamfile	2006-08-31 22:28:59.000000000 +0000
++++ glest-2.0.0/mk/linux/Jamfile	2006-08-31 22:29:00.000000000 +0000
 @@ -32,20 +32,20 @@
  ExternalLibs glest : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL ;
  IncludeDir glest : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;
@@ -42,43 +42,4 @@
 +#}
  
  
- #### Clean ####
-diff -urNad glest-2.0.0~/mk/linux/Jamfile.rej glest-2.0.0/mk/linux/Jamfile.rej
---- glest-2.0.0~/mk/linux/Jamfile.rej	1970-01-01 00:00:00.000000000 +0000
-+++ glest-2.0.0/mk/linux/Jamfile.rej	2006-08-15 14:11:12.000000000 +0000
-@@ -0,0 +1,35 @@
-+***************
-+*** 33,48 ****
-+  IncludeDir glest : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;
-+  
-+  #### Editor ####
-+- if $(WX_AVAILABLE) = "yes" {
-+-   SubDir TOP glest_map_editor ;
-+- 
-+-   GLEST_MAP_DIRS = . ;
-+-   for i in $(GLEST_DIRS) {
-+-     GLEST_MAP_SOURCES += [ Wildcard $(i) : *.cpp *.h ] ;
-+-   }
-+- 
-+-   Application glest_map_editor : $(GLEST_MAP_SOURCES) ;
-+-   LinkWith glest_map_editor : glestlib ;
-+-   ExternalLibs glest_map_editor : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL WX ;
-+-   IncludeDir glest_map_editor : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_MAP_DIRS) ;
-+- }
-+--- 33,48 ----
-+  IncludeDir glest : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_DIRS) ;
-+  
-+  #### Editor ####
-++ #if $(WX_AVAILABLE) = "yes" {
-++ #  SubDir TOP glest_map_editor ;
-++ #
-++ #  GLEST_MAP_DIRS = . ;
-++ #  for i in $(GLEST_DIRS) {
-++ #    GLEST_MAP_SOURCES += [ Wildcard $(i) : *.cpp *.h ] ;
-++ #  }
-++ #
-++ #  Application glest_map_editor : $(GLEST_MAP_SOURCES) ;
-++ #  LinkWith glest_map_editor : glestlib ;
-++ #  ExternalLibs glest_map_editor : SDL GL GLU XERCES VORBIS VORBISFILE OGG OPENAL WX ;
-++ #  IncludeDir glest_map_editor : ../shared_lib/include/$(LIB_INCLUDE_DIRS) $(GLEST_MAP_DIRS) ;
-++ #}
+ 

Modified: packages/trunk/glest/debian/rules
===================================================================
--- packages/trunk/glest/debian/rules	2006-08-31 21:38:32 UTC (rev 1460)
+++ packages/trunk/glest/debian/rules	2006-08-31 22:36:35 UTC (rev 1461)
@@ -43,7 +43,7 @@
 
 	touch build-stamp
 
-clean: clean-patched unpatch
+clean: clean-patched unpatch configure
 clean-patched:
 	dh_testdir
 	dh_testroot