r6523 - in packages/trunk/vegastrike/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2008-04-12 21:16:36 +0000 (Sat, 12 Apr 2008)
New Revision: 6523

Added:
   packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff
Modified:
   packages/trunk/vegastrike/debian/changelog
   packages/trunk/vegastrike/debian/control
   packages/trunk/vegastrike/debian/patches/Makefile.diff
   packages/trunk/vegastrike/debian/patches/series
   packages/trunk/vegastrike/debian/rules
Log:
[vegastrike] Now builds fine and appears to run pretty fine - getting closer !

Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog	2008-04-12 13:57:06 UTC (rev 6522)
+++ packages/trunk/vegastrike/debian/changelog	2008-04-12 21:16:36 UTC (rev 6523)
@@ -13,7 +13,6 @@
   * Bumped to standards 3.7.3 with no changes.
   * New upstream release:
     - apparently no int-vs-long problems anymore (Closes: #307992)
-    - it is now possible to quit with Escape (Closes: #297778)
     - default fonts are now pretty readable IMHO (Closes: #453491)
     - fixed licensing problems with the collider (Closes: #449475)
   
@@ -44,8 +43,10 @@
     relatively cleanly
   * Disable the overzealous INSTALL_PROGRAM -s option, as dh_strip is
     big enough to figure out what it needs to strip by itself.
+  * Installing most of the executables into /usr/lib/vegastrike, except the
+    ones that should be in the path (Makefile.diff)
 
- -- Vincent Fourmond <fourmond at debian.org>  Sat, 12 Apr 2008 01:02:05 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 12 Apr 2008 23:15:54 +0200
 
 vegastrike (0.4.3.debian1-1) unstable; urgency=low
 

Modified: packages/trunk/vegastrike/debian/control
===================================================================
--- packages/trunk/vegastrike/debian/control	2008-04-12 13:57:06 UTC (rev 6522)
+++ packages/trunk/vegastrike/debian/control	2008-04-12 21:16:36 UTC (rev 6523)
@@ -12,7 +12,7 @@
 
 Package: vegastrike
 Architecture: any
-Depends: vegastrike-data (>=0.4.3), vegastrike-data (<<0.4.4), ${shlibs:Depends}
+Depends: vegastrike-data (>=0.4.3), ${shlibs:Depends}
 Description: 3D space combat game
  Vegastrike is a 3D space simulator. Currently in Beta development, the
  project, at version 1.0, is to be a generic space simulator. Current

Modified: packages/trunk/vegastrike/debian/patches/Makefile.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/Makefile.diff	2008-04-12 13:57:06 UTC (rev 6522)
+++ packages/trunk/vegastrike/debian/patches/Makefile.diff	2008-04-12 21:16:36 UTC (rev 6523)
@@ -1,10 +1,57 @@
 Boost-python now links with -lboost_python rather than -lboost_python-st...
 
-Index: vegastrike-0.5~svn12102/Makefile.am
+In addition,
+  * among binaries, only vegastrike and vssetup are installed in the path
+  * the other binaries are installed into pkglibdir
+  * the objconv scripts are also installed into pkglibdir
+
+Index: vegastrike-0.5~svn12126/Makefile.am
 ===================================================================
---- vegastrike-0.5~svn12102.orig/Makefile.am	2008-04-05 00:41:44.000000000 +0200
-+++ vegastrike-0.5~svn12102/Makefile.am	2008-04-05 00:41:49.000000000 +0200
-@@ -728,7 +728,7 @@
+--- vegastrike-0.5~svn12126.orig/Makefile.am	2008-03-26 03:14:32.000000000 +0100
++++ vegastrike-0.5~svn12126/Makefile.am	2008-04-12 22:08:36.000000000 +0200
+@@ -480,27 +480,22 @@
+   GTKUTILS_PROG=
+ endif
+ 
+-if VS_MAKE_NO_CLIENT
+-  CLIENT_PROG=
+-else
+-  CLIENT_PROG= \
+-    vegastrike \
+-    base_maker
+-endif
+-
++# Making the difference between what is private and what is not:
+ bin_PROGRAMS = \
+-  $(CLIENT_PROG) \
+-  asteroidgen \
+-  mesher \
+-  mesh_xml \
+-  tempgen \
+-  replace \
+-  trisort \
+-  vegaserver \
+-  vsrextract \
+-  vsrmake \
+-  $(GTKUTILS_PROG)
++	vegastrike \
++	vssetup
+ 
++pkglib_PROGRAMS = \
++	asteroidgen \
++	mesher \
++	mesh_xml \
++	tempgen \
++	replace \
++	trisort \
++	vegaserver \
++	vsrextract \
++	vsrmake \
++	base_maker
+ 
+ noinst_LIBRARIES_1=\
+   libnetlowlevel.a
+@@ -728,7 +723,7 @@
  	-lz
  if BOOSTSYSTEM
    vegastrike_LDADD = $(vegastrike_LDADD_1) \
@@ -13,7 +60,7 @@
  else
    vegastrike_LDADD = $(vegastrike_LDADD_1)
  endif  
-@@ -739,7 +739,7 @@
+@@ -739,7 +734,7 @@
  	-lz
  if BOOSTSYSTEM
    vegaserver_LDADD = $(vegaserver_LDADD_1) \
@@ -22,3 +69,15 @@
  else
    vegaserver_LDADD = $(vegaserver_LDADD_1)
  endif  
+@@ -993,8 +988,9 @@
+   src/python/briefing_wrapper.cpp
+ 
+ 
+-pkgdatadir = $(prefix)/objconv
+-pkgdata_DATA = objconv/3ds2xml objconv/obj2xml objconv/wcp2xml
++# pkgdata_DATA = objconv/3ds2xml objconv/obj2xml objconv/wcp2xml
++pkglib_SCRIPTS = objconv/3ds2xml objconv/obj2xml objconv/wcp2xml
++
+ EXTRA_DIST += $(pkgdata_DATA)
+ 
+ 

Added: packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff
===================================================================
--- packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff	                        (rev 0)
+++ packages/trunk/vegastrike/debian/patches/advertise-vsinstall.diff	2008-04-12 21:16:36 UTC (rev 6523)
@@ -0,0 +1,12 @@
+Index: vegastrike-0.5~svn12126/src/vsfilesystem.cpp
+===================================================================
+--- vegastrike-0.5~svn12126.orig/src/vsfilesystem.cpp	2008-04-12 20:41:27.000000000 +0200
++++ vegastrike-0.5~svn12126/src/vsfilesystem.cpp	2008-04-12 20:41:56.000000000 +0200
+@@ -666,6 +666,7 @@
+ 				{
+ 					cerr<<"CONFIGFILE - No config found in data dir : "<<(datadir+"/"+config_file)<<endl;
+ 					cerr<<"CONFIG FILE NOT FOUND !!!"<<endl;
++					cerr<<"You probably should use vsinstall to create it" << endl;
+ 					VSExit(1);
+ 				}
+ 			}

Modified: packages/trunk/vegastrike/debian/patches/series
===================================================================
--- packages/trunk/vegastrike/debian/patches/series	2008-04-12 13:57:06 UTC (rev 6522)
+++ packages/trunk/vegastrike/debian/patches/series	2008-04-12 21:16:36 UTC (rev 6523)
@@ -1,3 +1,4 @@
+advertise-vsinstall.diff
 bootstrap-fail-on-error.diff
 Makefile.diff
 alut.diff

Modified: packages/trunk/vegastrike/debian/rules
===================================================================
--- packages/trunk/vegastrike/debian/rules	2008-04-12 13:57:06 UTC (rev 6522)
+++ packages/trunk/vegastrike/debian/rules	2008-04-12 21:16:36 UTC (rev 6523)
@@ -40,14 +40,14 @@
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	CC="$(DEB_HOST_GNU_TYPE)-gcc" CXX="$(DEB_HOST_GNU_TYPE)-g++" \
 	./configure $(confflags) --bindir=/usr/games/ \
-	    --datadir=/usr/share/games/vegastrike \
+	    --prefix=/usr \
+	    --with-data-dir=/usr/share/games/vegastrike \
 	    --enable-release  --with-boost=system
-# Use --datadir= and not --with-data-dir !
 	touch configure-stamp
 
 build-stamp: configure-stamp
 	dh_testdir
-	$(MAKE) $(do_parallel) && \
+	$(MAKE) $(do_parallel) 
 	touch build-stamp
 
 clean:
@@ -57,7 +57,7 @@
 # These files are generated by autotools or during build. They are removed
 # to get the cleanest diff.gz possible.
 	rm -f install-sh config.guess config.sub configure aclocal.m4 depcomp \
-	  config.log vssetup/src/bin/setup 
+	  config.log 
 
 	rm -f *-stamp
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
@@ -72,9 +72,8 @@
 	dh_install debian/vegastrike-setup.desktop usr/share/applications
 	dh_install debian/vegastrike.xpm usr/share/pixmaps
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/vegastrike/
-# 	$(INSTALL_PROGRAM) -m 0755 vssetup/src/bin/setup \
-# 	  $(CURDIR)/debian/vegastrike/usr/games/vssetup
-# 	dh_install debian/scripts/vsinstall usr/games
+# Install the small wrapper around vssetup
+	dh_install debian/scripts/vsinstall usr/games
 
 #Nothing to do for binary-indep
 binary-indep: