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

[Andres Mejia]

Author: ceros-guest
Date: 2008-05-11 02:31:07 +0000 (Sun, 11 May 2008)
New Revision: 6930

Modified:
   packages/trunk/vegastrike/debian/changelog
   packages/trunk/vegastrike/debian/control
   packages/trunk/vegastrike/debian/patches/series
   packages/trunk/vegastrike/debian/rules
Log:
  * Added DM-Upload-Allowed: yes field.
  * Fixed up debian/rules.
  * Include use of nostrip option.
  * Don't use bootstrap patch, just call autotools from debian/rules.


Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog	2008-05-11 02:30:19 UTC (rev 6929)
+++ packages/trunk/vegastrike/debian/changelog	2008-05-11 02:31:07 UTC (rev 6930)
@@ -2,6 +2,10 @@
 
   [ Andres Mejia ]
   * Added get-orig-source target that calls external script.
+  * Added DM-Upload-Allowed: yes field.
+  * Fixed up debian/rules.
+  * Include use of nostrip option.
+  * Don't use bootstrap patch, just call autotools from debian/rules.
 
  -- Andres Mejia <mcitadel at gmail.com>  Thu, 01 May 2008 01:56:49 -0400
 

Modified: packages/trunk/vegastrike/debian/control
===================================================================
--- packages/trunk/vegastrike/debian/control	2008-05-11 02:30:19 UTC (rev 6929)
+++ packages/trunk/vegastrike/debian/control	2008-05-11 02:31:07 UTC (rev 6930)
@@ -9,12 +9,26 @@
 Homepage:  http://vegastrike.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/vegastrike/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/vegastrike/?op=log
+DM-Upload-Allowed: yes
 
 Package: vegastrike
 Architecture: any
 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
- features include split-screen play, trading, exploration and plenty of
- shoot'em up action.
+Description: OpenSource 3d Space Simulator (client)
+ Vega Strike is an OpenSource 3d Space Simulator. Work is proceeding on both the
+ Vega Strike game engine and a Vega Strike Universe game data set. Both engine
+ and data are in a playable state, but still under development. Each release
+ serves as a beta for both engine and data.
+ .
+ The Vega Strike engine serves as the foundation for the Privateer Gemini Gold,
+ Privateer Remake, Vega Trek, and Pi Armada projects.
+ .
+ The project goal is, at version 1.0, is to be a generic space simulator.
+ Currently developed features include:
+ .
+    * Trading
+    * Exploration
+    * Plenty of shoot 'em up action
+    * Preliminary multiplayer Deathmatch (testing server only)
+ .
+ This package installs the game vegastrike.

Modified: packages/trunk/vegastrike/debian/patches/series
===================================================================
--- packages/trunk/vegastrike/debian/patches/series	2008-05-11 02:30:19 UTC (rev 6929)
+++ packages/trunk/vegastrike/debian/patches/series	2008-05-11 02:31:07 UTC (rev 6930)
@@ -1,6 +1,6 @@
 fix-mips.diff
 advertise-vsinstall.diff
-bootstrap-fail-on-error.diff
+# bootstrap-fail-on-error.diff
 Makefile.diff
 alut.diff
 # gtk2.diff

Modified: packages/trunk/vegastrike/debian/rules
===================================================================
--- packages/trunk/vegastrike/debian/rules	2008-05-11 02:30:19 UTC (rev 6929)
+++ packages/trunk/vegastrike/debian/rules	2008-05-11 02:31:07 UTC (rev 6930)
@@ -22,8 +22,11 @@
   confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-        confflags += --enable-debug-rel
+# nostrip option implies noopt
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+   confflags += --enable-release --enable-flags="-g"
+else
+   confflags += --enable-debug
 endif
 
 # borrowed from the kernel rules script since this can
@@ -32,25 +35,34 @@
 do_parallel = -j$(CONCURRENCY_LEVEL)
 endif
 
-build: configure-stamp build-stamp
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	touch patch-stamp
 
+configure: patch configure-stamp
 configure-stamp:
-	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
-	sh bootstrap-sh
+	aclocal -I m4scripts $(ACLOCALFLAGS)
+	autoheader -f $(AUTOHEADERFLAGS)
+	autoconf -f $(AUTOCONFFLAGS)
+	automake -acf $(AUTOMAKEFLAGS)
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-	CC="$(DEB_HOST_GNU_TYPE)-gcc" CXX="$(DEB_HOST_GNU_TYPE)-g++" \
-	./configure $(confflags) --bindir=/usr/games/ \
+	./configure $(confflags) --bindir=/usr/games \
 	    --prefix=/usr \
 	    --with-data-dir=/usr/share/games/vegastrike \
-	    --enable-release  --with-boost=system
+	    --with-boost=system \
+		--enable-wall
 	touch configure-stamp
 
-build-stamp: configure-stamp
+build: configure build-stamp
+build-stamp:
 	dh_testdir
 	$(MAKE) $(do_parallel) 
 	touch build-stamp
 
-clean:
+clean: clean-stamp unpatch
+clean-stamp:
 	dh_testdir
 	dh_testroot
 	[ ! -f Makefile ] || $(MAKE) distclean
@@ -58,11 +70,15 @@
 # to get the cleanest diff.gz possible.
 	rm -f install-sh config.guess config.sub configure aclocal.m4 depcomp \
 	  config.log 
-
-	rm -f *-stamp
+	rm -f configure-stamp build-stamp
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean
 
+unpatch:
+	dh_testdir
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc/ patch-stamp
+
 install: build
 	dh_testdir
 	dh_testroot
@@ -87,7 +103,9 @@
 	dh_installman debian/*.6
 	dh_installchangelogs ChangeLog
 	dh_desktop
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	dh_strip
+endif
 	dh_compress
 	dh_fixperms
 	dh_installdeb