r3644 - packages/trunk/vegastrike/debian

Sun Aug 12 18:57:36 UTC 2007

Author: ceros-guest
Date: 2007-08-12 18:57:36 +0000 (Sun, 12 Aug 2007)
New Revision: 3644

Modified:
   packages/trunk/vegastrike/debian/changelog
   packages/trunk/vegastrike/debian/control
   packages/trunk/vegastrike/debian/copyright
   packages/trunk/vegastrike/debian/docs
   packages/trunk/vegastrike/debian/rules
Log:
Adding changes that reflects reverting back to quilt and using uploaded tarball.

Modified: packages/trunk/vegastrike/debian/changelog
===================================================================

--- packages/trunk/vegastrike/debian/changelog	2007-08-12 18:56:38 UTC (rev 3643)
+++ packages/trunk/vegastrike/debian/changelog	2007-08-12 18:57:36 UTC (rev 3644)
@@ -1,3 +1,14 @@
+vegastrike (0.4.3.debian-3) unstable; urgency=low
+
+  [ Andres Mejia ]
+  * Going to use orig tarball that is uploaded already instead.
+    + Changed debian/rules and patches to use this.
+  * Kept quilt instead of dpatch.
+    + Modified patches to use quilt.
+  * Documentation from vegastrike-data won't be included.
+
+ -- Andres Mejia <mcitadel at gmail.com>  Fri, 10 Aug 2007 12:37:00 -0400
+
 vegastrike (0.4.3.debian-2) unstable; urgency=low
 
   [ Gonéri Le Bouder ]
@@ -51,7 +62,7 @@
   * Install .desktop file to /usr/share/applications/
   * Added 502_hat_switches.diff to support hatswitch configuration
 
- -- Andres Mejia <mcitadel at gmail.com>  Wed, 11 Jul 2007 08:25:54 +0200
+ -- Andres Mejia <mcitadel at gmail.com>  Fri, 10 Aug 2007 01:55:12 -0400
 
 vegastrike (0.4.3.debian-1) unstable; urgency=low
 

Modified: packages/trunk/vegastrike/debian/control
===================================================================
--- packages/trunk/vegastrike/debian/control	2007-08-12 18:56:38 UTC (rev 3643)
+++ packages/trunk/vegastrike/debian/control	2007-08-12 18:57:36 UTC (rev 3644)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Andres Mejia <mcitadel at gmail.com>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 5), dpatch, automake, autoconf, libboost-python-dev, libgtk2.0-dev, libopenal-dev, libalut-dev, libgl1-mesa-dev, libexpat1-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libpng12-dev, libjpeg62-dev, freeglut3-dev, libxmu-dev
+Build-Depends: debhelper (>= 5), quilt, automake, autoconf, libboost-python-dev, libgtk2.0-dev, libopenal-dev, libalut-dev, libgl1-mesa-dev, libexpat1-dev, libsdl1.2-dev, libsdl-mixer1.2-dev, libpng12-dev, libjpeg62-dev, freeglut3-dev, libxmu-dev
 Standards-Version: 3.7.2
 
 Package: vegastrike

Modified: packages/trunk/vegastrike/debian/copyright
===================================================================
--- packages/trunk/vegastrike/debian/copyright	2007-08-12 18:56:38 UTC (rev 3643)
+++ packages/trunk/vegastrike/debian/copyright	2007-08-12 18:57:36 UTC (rev 3644)
@@ -2,29 +2,13 @@
 Fre, 05 Apr 2002 11:14:39 -0500.
 
 It was later redebianized by Andres Mejia <mcitadel at gmail.com> on
-Tue, 26 Jun 2007 00:42:18 -0400.
+Fri, 10 Aug 2007 12:19:00 -0400.
 
 It was downloaded from http://sourceforge.net/projects/vegastrike
 from the SVN repository. The command to download was <svn co https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_0_4_3/vegastrike vegastrike>
 
 The vssetup folder comes from version 0.2.9. The vssetup folder in vegastrike was downloaded into the vegastrike directory using the command <svn co https://vegastrike.svn.sourceforge.net/svnroot/vegastrike/tags/vegastrike_0_2_9/vssetup vssetup>
 
-The downloaded contents from svn were than packed using the command <tar -cvzf vegastrike.tar.gz vegastrike/ -X exclusions>.
-
-The exclusions file included exclusions for:
-*/CVS/*
-CVS
-*/.svn/*
-.svn
-*.exe
-*.dll
-*.ico
-*.bat
-*.dsp
-*.dsw
-*.lib
-
-
 Upstream Authors:
 
 Core Development Team 
@@ -75,11 +59,6 @@
 On Debian systems, the complete text of the GNU General Public
 License can be found in /usr/share/common-licenses/GPL
 
-
-Debian specific changes:
-
-The documentation found in the "documentation" directory of the data package was included in this package under the "doc" directory, with the exception of the man pages which is included in this package's "debian" directory.
-
 The names of some of the binaries have been changed to have a "vs" prefix
 in order to avoid a name collision.  Eventually most of these helper
 binaries will be removed as they are integrated into the main

Modified: packages/trunk/vegastrike/debian/docs
===================================================================
--- packages/trunk/vegastrike/debian/docs	2007-08-12 18:56:38 UTC (rev 3643)
+++ packages/trunk/vegastrike/debian/docs	2007-08-12 18:57:36 UTC (rev 3644)
@@ -1,11 +1,3 @@
-vegastrike/ToDo.txt
-vegastrike/AUTHORS
-vegastrike/doc/texturizer
-vegastrike/doc/CelesteStory.txt
-vegastrike/doc/description.xunit
-vegastrike/doc/detailtextures.txt
-vegastrike/doc/fixers_howto.html
-vegastrike/doc/IntroMonologue.txt
-vegastrike/doc/readme.txt
-vegastrike/doc/unitstats.csv
-vegastrike/doc/Vega_Strike_Players_Guide.pdf
+ToDo.txt
+AUTHORS
+doc/texturizer

Modified: packages/trunk/vegastrike/debian/rules
===================================================================
--- packages/trunk/vegastrike/debian/rules	2007-08-12 18:56:38 UTC (rev 3643)
+++ packages/trunk/vegastrike/debian/rules	2007-08-12 18:57:36 UTC (rev 3644)
@@ -37,18 +37,10 @@
 do_parallel = -j$(CONCURRENCY_LEVEL)
 endif
 
-unpack: unpack-stamp
-unpack-stamp:
-	dh_testdir
-	tar -xvzf vegastrike.tar.gz
-	touch unpack-stamp
+build: configure-stamp build-stamp
 
-# Using dpatch for patching.
-include /usr/share/dpatch/dpatch.make
-
-configure: unpack patch configure-stamp
 configure-stamp:
-	cd vegastrike && \
+	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 	aclocal && \
 	autoheader && \
 	automake --add-missing --foreign --copy && \
@@ -61,21 +53,64 @@
 	|| (cat config.log && false)
 	touch configure-stamp
 
-build: configure build-stamp
-build-stamp:
+build-stamp: configure-stamp
 	dh_testdir
-	cd vegastrike && \
 	$(MAKE) $(do_parallel) && \
 	cd vssetup/src && \
 	perl build
 	touch build-stamp
 
-clean: unpatch clean-stamp
-clean-stamp:
+clean:
 	dh_testdir
 	dh_testroot
+	-$(MAKE) distclean
+# These files are generated by autotools or during build. They are removed
+# to get the cleanest diff.gz possible.
+	rm -f install-sh
+	rm -f Makefile.in
+	rm -f config.guess
+	rm -f common/Makefile.in
+	rm -f common/Makefile
+	rm -f config.sub
+	rm -f configure
+	rm -f objconv/Makefile.in
+	rm -f objconv/Makefile
+	rm -rf objconv/.deps
+	rm -f objconv/mesher/Makefile.in
+	rm -f objconv/mesher/Makefile
+	rm -rf objconv/mesher/.deps
+	rm -f src/Makefile.in
+	rm -f src/common/Makefile.in
+	rm -f src/aldrv/Makefile.in
+	rm -f src/gldrv/Makefile.in
+	rm -f src/gfx/Makefile.in
+	rm -f src/gfx/nav/Makefile.in
+	rm -f src/networking/Makefile.in
+	rm -f src/networking/lowlevel/Makefile.in
+	rm -f src/python/Makefile.in
+	rm -f src/gui/Makefile.in
+	rm -f src/cmd/Makefile.in
+	rm -f src/cmd/collide/csgeom/Makefile.in
+	rm -f src/cmd/collide/Makefile.in
+	rm -f src/cmd/script/Makefile.in
+	rm -f src/cmd/script/c_alike/Makefile.in
+	rm -f src/cmd/ai/Makefile.in
+	rm -f mission/Makefile.in
+	rm -f mission/Makefile
+	rm -rf mission/.deps
+	rm -f tools/Makefile.in
+	rm -f tools/Makefile
+	rm -rf tools/.deps
+	rm -f aclocal.m4
+	rm -f config.h.in
+	rm -f depcomp
+	rm -f config.log
+	rm -f launcher/Makefile.in
+	rm -f launcher/Makefile
+	rm -rf launcher/.deps
+
 	rm -f *-stamp
-	rm -rf vegastrike
+	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	dh_clean
 
 install: build
@@ -86,7 +121,6 @@
 	dh_install debian/vegastrike.desktop usr/share/applications
 	dh_install debian/vegastrike-setup.desktop usr/share/applications
 	dh_install debian/vegastrike.xpm usr/share/pixmaps
-	cd vegastrike && \
 	$(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
 	  DESTDIR=$(CURDIR)/debian/vegastrike/ bindir=/usr/games/ && \
 	$(INSTALL_PROGRAM) -m 0755 vssetup/src/bin/setup \
@@ -97,7 +131,6 @@
 #	    DESTDIR=$(CURDIR)/debian/vegastrike/ \
 #	)
 
-
 #Nothing to do for binary-indep
 binary-indep:
 
@@ -108,7 +141,7 @@
 	dh_installdocs
 	dh_installmenu
 	dh_installman debian/*.6
-	dh_installchangelogs vegastrike/ChangeLog
+	dh_installchangelogs ChangeLog
 	dh_desktop
 	dh_strip
 	dh_compress
@@ -120,4 +153,4 @@
 	dh_builddeb
 
 binary: binary-arch
-.PHONY: build clean binary-indep binary-arch binary install unpack configure
+.PHONY: build clean binary-indep binary-arch binary install configure


