Author: fourmond
Date: 2008-04-11 19:32:59 +0000 (Fri, 11 Apr 2008)
New Revision: 6514
Added:
packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
Modified:
packages/trunk/vegastrike/debian/changelog
packages/trunk/vegastrike/debian/patches/series
packages/trunk/vegastrike/debian/rules
Log:
[vegastrike] Now accepts to start to build...
Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog 2008-04-11 13:48:46 UTC (rev
6513)
+++ packages/trunk/vegastrike/debian/changelog 2008-04-11 19:32:59 UTC (rev
6514)
@@ -38,8 +38,12 @@
* Dropped hat_switches.diff, included upstream
* Dropped configure.in_modifications, as upstream build system did
evolve quit a fair amount !
+ * bootstrap-fail-on-error to not continue building if the bootstrap process
+ is not happy.
+ * Quite a few debian/rules tweaks so vegastrike can build
+ relatively cleanly
- -- Vincent Fourmond <[EMAIL PROTECTED]> Mon, 07 Apr 2008 22:00:27 +0200
+ -- Vincent Fourmond <[EMAIL PROTECTED]> Fri, 11 Apr 2008 21:27:28 +0200
vegastrike (0.4.3.debian1-1) unstable; urgency=low
Added: packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
===================================================================
--- packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
(rev 0)
+++ packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
2008-04-11 19:32:59 UTC (rev 6514)
@@ -0,0 +1,18 @@
+Index: vegastrike-0.5~svn12126/bootstrap-sh
+===================================================================
+--- vegastrike-0.5~svn12126.orig/bootstrap-sh 2008-04-11 21:18:15.000000000
+0200
++++ vegastrike-0.5~svn12126/bootstrap-sh 2008-04-11 21:19:11.000000000
+0200
+@@ -139,8 +139,11 @@
+ ( echo Running "$AUTOHEADER" && "$AUTOHEADER" -f $AUTOHEADERFLAGS && \
+ echo Running "$AUTOCONF" && "$AUTOCONF" -f $AUTOCONFFLAGS && \
+ echo Running "$AUTOMAKE" && "$AUTOMAKE" -acf $AUTOMAKEFLAGS && \
+- echo "Bootstrap is complete. Run ./configure to configure the build
system." ) || \
+- echo "An error occurred while running the autotools. Please correct."
++ echo "Bootstrap is complete. Run ./configure to configure the build
system." ) || {
++ echo "An error occurred while running the autotools. Please correct."
++ exit 1
++ }
++
+ else
+ echo "aclocal execution failed."
+ echo "Try running svn update"
Modified: packages/trunk/vegastrike/debian/patches/series
===================================================================
--- packages/trunk/vegastrike/debian/patches/series 2008-04-11 13:48:46 UTC
(rev 6513)
+++ packages/trunk/vegastrike/debian/patches/series 2008-04-11 19:32:59 UTC
(rev 6514)
@@ -1,3 +1,4 @@
+bootstrap-fail-on-error
Makefile.diff
alut.diff
# gtk2.diff
Modified: packages/trunk/vegastrike/debian/rules
===================================================================
--- packages/trunk/vegastrike/debian/rules 2008-04-11 13:48:46 UTC (rev
6513)
+++ packages/trunk/vegastrike/debian/rules 2008-04-11 19:32:59 UTC (rev
6514)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
-VERSION=0.4.3
+#VERSION=0.4.3
#GCC_VERSION=3.4
# as directed by autotools-dev's README.Debian
@@ -41,16 +41,12 @@
configure-stamp:
QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- aclocal && \
- autoheader && \
- automake --add-missing --foreign --copy && \
- autoconf && \
- CFLAGS=$(CFLAGS) CXXFLAGS=$(CXXFLAGS) \
- CC=$(DEB_HOST_GNU_TYPE)-gcc CXX=$(DEB_HOST_GNU_TYPE)-g++ \
+ sh bootstrap-sh
+ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ CC="$(DEB_HOST_GNU_TYPE)-gcc" CXX="$(DEB_HOST_GNU_TYPE)-g++" \
./configure $(confflags) --bindir=/usr/games/ \
--with-data-dir=/usr/share/games/vegastrike \
- --enable-release --with-boost=system \
- || (cat config.log && false)
+ --enable-release --with-boost=system
touch configure-stamp
build-stamp: configure-stamp
@@ -66,12 +62,8 @@
[ ! -f Makefile ] || $(MAKE) distclean
# These files are generated by autotools or during build. They are removed
# to get the cleanest diff.gz possible.
- find -name '*.in' ! -name 'configure.in' -exec rm -rf {} \;
- find -name 'Makefile' -exec rm -rf {} \;
- find -name '*.o' -exec rm -rf {} \;
- find -prune -name '.deps' -exec rm -rf {} \;
rm -f install-sh config.guess config.sub configure aclocal.m4 depcomp \
- config.log vssetup/src/bin/setup
+ config.log vssetup/src/bin/setup
rm -f *-stamp
QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
