r11444 - in packages/trunk/between/debian: . patches

[Paul Wise]

Author: pabs
Date: 2010-10-30 13:37:18 +0000 (Sat, 30 Oct 2010)
New Revision: 11444

Modified:
   packages/trunk/between/debian/install
   packages/trunk/between/debian/patches/abs_path.patch
   packages/trunk/between/debian/rules
Log:
more improvements

Modified: packages/trunk/between/debian/install
===================================================================
--- packages/trunk/between/debian/install	2010-10-30 11:53:41 UTC (rev 11443)
+++ packages/trunk/between/debian/install	2010-10-30 13:37:18 UTC (rev 11444)
@@ -3,3 +3,7 @@
 game7/gameSource/music usr/share/games/between
 game7/gameSource/settings/* etc/between
 debian/*.desktop usr/share/applications
+between.png usr/share/icons/hicolor/128x128/apps
+32x32/between.png usr/share/icons/hicolor/32x32/apps
+32x32/between.png usr/share/pixmaps
+32x32/between.xpm usr/share/pixmaps

Modified: packages/trunk/between/debian/patches/abs_path.patch
===================================================================
--- packages/trunk/between/debian/patches/abs_path.patch	2010-10-30 11:53:41 UTC (rev 11443)
+++ packages/trunk/between/debian/patches/abs_path.patch	2010-10-30 13:37:18 UTC (rev 11444)
@@ -30,13 +30,22 @@
  
  SettingsManagerStaticMembers::SettingsManagerStaticMembers()
 -    : mDirectoryName( stringDuplicate( "settings" ) ),
-+    : mDirectoryName( stringDuplicate( ETCDIRs ) ),
++    : mDirectoryName( stringDuplicate( ETCDIR ) ),
        mHashSalt( stringDuplicate( "default_salt" ) ) {
      
      }
 --- a/game7/gameSource/Client.cpp
 +++ b/game7/gameSource/Client.cpp
-@@ -254,7 +254,22 @@
+@@ -6,6 +6,8 @@
+ #include "minorGems/util/SettingsManager.h"
+ 
+ #include <time.h>
++#include <sys/stat.h>
++#include <sys/types.h>
+ 
+ 
+ char *Client::sServerURL = NULL;
+@@ -254,7 +256,21 @@
                  
                      mPlayerID = stringDuplicate( returnedID );
  
@@ -51,12 +60,11 @@
 +                      if( dir[len-1] == '/') strcpy( dir + len - 1, SETTINGS );
 +                      else strcpy( dir + len, SETTINGS );
 +                      mkdir( dir, 0777 );
-+                      char* dirName = SettingsManager::setDirectoryName();
++                      char* dirName = SettingsManager::getDirectoryName();
 +                      SettingsManager::setDirectoryName( dir );
 +                      SettingsManager::setSetting( "playerID", mPlayerID );
 +                      SettingsManager::setDirectoryName( dirName );
-+                    } else {
-+                      SettingsManager::setSetting( "playerID", mPlayerID );
++                    } else SettingsManager::setSetting( "playerID", mPlayerID );
                      }
                  else {
                      resultWellFormatted = false;

Modified: packages/trunk/between/debian/rules
===================================================================
--- packages/trunk/between/debian/rules	2010-10-30 11:53:41 UTC (rev 11443)
+++ packages/trunk/between/debian/rules	2010-10-30 13:37:18 UTC (rev 11444)
@@ -8,20 +8,22 @@
 	cd game7 && platformSelection=1 ./configure
 
 override_dh_auto_build:
-	#mkdir 256x256 64x64 32x32
-	#convert -scale 256x256 game7/gameSource/iPhone/LargeIcon.png 256x256/between.png
-	#convert -background None -gravity center -extent 64x64 game7/gameSource/iPhone/Icon.png 64x64/between.png
-	#convert -type Grayscale -negate game7/build/macOSX/iconMask.png mask.png
-	#composite -compose CopyOpacity mask.png game7/build/macOSX/iconColor.png between.png
-	#convert -scale 32x32 between.png 32x32/between.png 
-	#convert 32x32/between.png 32x32/between.xpm
-	$(MAKE) -C game7/gameSource PLATFORM_COMPILE_FLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/between\\\" -DDATADIR=\\\"/usr/share/games/between/\\\""
+	convert -type Grayscale -negate ./game7/build/macOSX/iconMask.png mask.png
+	composite -compose CopyOpacity mask.png ./game7/build/macOSX/iconColor.png between.png
+	mkdir 32x32
+	convert -scale 32x32 between.png 32x32/between.png
+	convert 32x32/between.png 32x32/between.xpm
+	sed -i -e 's/-lX11//' game7/gameSource/Makefile
+	sed -i -e 's/^DEBUG_FLAG = .*/DEBUG_FLAG = /' game7/gameSource/Makefile
+	sed -i -e 's/^OPTIMIZE_FLAG = .*/OPTIMIZE_FLAG = /' game7/gameSource/Makefile
+	sed -i -e 's/^COMPILE_FLAGS = /COMPILE_FLAGS = $$(CFLAGS) /' game7/gameSource/Makefile
+	$(MAKE) -C game7/gameSource CFLAGS="$(CFLAGS) -DETCDIR=\\\"/etc/between\\\" -DDATADIR=\\\"/usr/share/games/between/\\\""
 
 override_dh_auto_clean:
 	[ ! -f game7/gameSource/Makefile ] || $(MAKE) -C game7/gameSource clean
 	rm -f game7/gameSource/Makefile
 	rm -f game7/gameSource/Makefile.minorGems_dependencies
-	#rm -rf 256x256 64x64 32x32 between.png mask.png
+	rm -rf 32x32 between.png mask.png
 
 override_dh_installchangelogs:
 	dh_installchangelogs game7/documentation/changeLog.txt
@@ -29,8 +31,10 @@
 V=6
 
 get-orig-source:
-	wget http://downloads.sourceforge.net/hcsoftware/Between_v$(V)_UnixSource.tar.gz
+	wget -c http://downloads.sourceforge.net/hcsoftware/Between_v$(V)_UnixSource.tar.gz
 	tar xf Between_v$(V)_UnixSource.tar.gz
+	# VCS file
+	rm -rf Between_v$(V)_UnixSource/minorGems/.hgtags
 	# Pre-built Windows libraries, unused
 	rm -rf Between_v$(V)_UnixSource/game7/build/win32/SDL.dll
 	# non-free, unused