debian menu, icon

ChangeLog

@@ -1,12 +1,13 @@
 2011-06-25  Pace Willisson  <[email protected]>
 
+	* add ".desktop" file back into the deb; update icon;
+	improve make-tarball
+
 	* V268
 
 	* fix a couple of compiler warnings - now compiles cleanly on
 	ubuntu 10.04 and 11.04
 
-2011-06-25  Pace Willisson <[email protected]>
-
 	* V267
 
 	* created fortify_workaround.[ch] to quiet 100+ new compiler
@@ -24,8 +25,6 @@
 
 	* add gamedata files to make install-data
 
-2011-06-22  Pace Willisson  <[email protected]>
-
 	* V266
 
 	* add make install-data target which will be used when

debian/changelog

@@ -1,3 +1,9 @@
+raceintospace (1.0rc3-1) unstable; urgency=low
+
+  * insert into games menu; update icon
+
+ -- Pace Willisson <[email protected]>  Sat, 25 Jun 2011 21:33:27 -0400
+
 raceintospace (1.0rc2-1) lucid; urgency=low
 
   * change version number in order to make a new ppa package

debian/rules

@@ -16,3 +16,9 @@ override_dh_auto_configure:
 
 override_dh_auto_install:
 	make DESTDIR=$(DESTDIR) install
+	install -d $(DESTDIR)/usr/share/applications
+	install -c -m 644 debian/raceintospace.desktop \
+		$(DESTDIR)/usr/share/applications
+	install -d $(DESTDIR)/usr/share/pixmaps
+	install -c -m 644 os_linux/raceintospace.xpm \
+		$(DESTDIR)/usr/share/pixmaps

make-tarball

@@ -2,9 +2,6 @@
 
 # this makes a tarball of the sources plus the media files
 
-# the files for race and gamedat come from the sourceforge server,
-# so won't include any uncommitted changes you have locally
-
 # you need to be in a directory with subdirectories race gamedat and avdata
 
 if [ $# != 1 ]
@@ -61,9 +58,25 @@ then
     export CVSROOT
 fi
 
+# sure wish there was a way for cvs to tell me the list of files
+# that it is managing, but we can do it the hard way - do an export
+# to get the list of files, then copy the latest files to the 
+# staging area
+
 cvs -z8 export -D now race
+
+find race -type f -print > TMP.race
+rm -rf race
+(cd ..; cpio -pdvm TMP.build) < TMP.race
+
+
 cvs -z8 export -D now gamedat
 
+find gamedat -type f -print > TMP.gamedat
+rm -rf gamedat
+(cd ..; cpio -pdvm TMP.build) < TMP.gamedat
+
+
 dir=raceintospace-${rel}
 mv race ${dir}
 

os_linux/README

@@ -6,6 +6,14 @@ $ cvs -d:ext:raceintospace.cvs.sourceforge.net:/cvsroot/raceintospace co race
 $ cvs -d:ext:raceintospace.cvs.sourceforge.net:/cvsroot/raceintospace co gamedat
 $ git clone ssh://raceintospace.git.sourceforge.net/gitroot/raceintospace/avdata
 
+For ordinary development
+
+$ cd race/race
+$ aclocal -I m4
+$ autoconf
+$ make
+# make install
+
 ================================================================
 To make a distribution tarball:
 
@@ -14,7 +22,7 @@ cd race
 (now you're in the development directory, and have race gamedat and
 avdata subdirectories)
 
-$ ./race/make-tarball RELEASE-NUBMER
+$ ./race/make-tarball RELEASE-NUMBER
 
 (for example ./race/make-tarball 1.0rc1)
 
@@ -34,9 +42,17 @@ tar xf raceintospace_REL.orig.tar.gz
 cd raceintospace-REL
 debuild
 
-create the .deb in the parent directory
+creates the .deb in the parent directory
 
 ================================================================ 
 
 there are some remnants in the Makefile for making rpm files, but they
 probably don't work any more
+
+================================================================
+
+the icon image is from
+http://mix.msfc.nasa.gov/IMAGES/MEDIUM/6870605.jpg
+"AS-205 Launch" (Apollo 7)
+
+