Author: fourmond
Date: 2008-04-11 23:34:34 +0000 (Fri, 11 Apr 2008)
New Revision: 6516
Added:
packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error.diff
Removed:
packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
Modified:
packages/trunk/vegastrike/debian/changelog
packages/trunk/vegastrike/debian/docs
packages/trunk/vegastrike/debian/patches/series
packages/trunk/vegastrike/debian/rules
Log:
[vegastrike] some more small steps towards vegasytrike that builds fine !
Modified: packages/trunk/vegastrike/debian/changelog
===================================================================
--- packages/trunk/vegastrike/debian/changelog 2008-04-11 22:27:48 UTC (rev
6515)
+++ packages/trunk/vegastrike/debian/changelog 2008-04-11 23:34:34 UTC (rev
6516)
@@ -42,8 +42,10 @@
is not happy.
* Quite a few debian/rules tweaks so vegastrike can build
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.
- -- Vincent Fourmond <[EMAIL PROTECTED]> Fri, 11 Apr 2008 21:27:28 +0200
+ -- Vincent Fourmond <[EMAIL PROTECTED]> Sat, 12 Apr 2008 01:02:05 +0200
vegastrike (0.4.3.debian1-1) unstable; urgency=low
Modified: packages/trunk/vegastrike/debian/docs
===================================================================
--- packages/trunk/vegastrike/debian/docs 2008-04-11 22:27:48 UTC (rev
6515)
+++ packages/trunk/vegastrike/debian/docs 2008-04-11 23:34:34 UTC (rev
6516)
@@ -1,3 +1,2 @@
ToDo.txt
AUTHORS
-doc/texturizer
Deleted: packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
===================================================================
--- packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
2008-04-11 22:27:48 UTC (rev 6515)
+++ packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error
2008-04-11 23:34:34 UTC (rev 6516)
@@ -1,18 +0,0 @@
-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"
Copied: packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error.diff
(from rev 6514,
packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error)
===================================================================
--- packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error.diff
(rev 0)
+++ packages/trunk/vegastrike/debian/patches/bootstrap-fail-on-error.diff
2008-04-11 23:34:34 UTC (rev 6516)
@@ -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 22:27:48 UTC
(rev 6515)
+++ packages/trunk/vegastrike/debian/patches/series 2008-04-11 23:34:34 UTC
(rev 6516)
@@ -1,4 +1,4 @@
-bootstrap-fail-on-error
+bootstrap-fail-on-error.diff
Makefile.diff
alut.diff
# gtk2.diff
Modified: packages/trunk/vegastrike/debian/rules
===================================================================
--- packages/trunk/vegastrike/debian/rules 2008-04-11 22:27:48 UTC (rev
6515)
+++ packages/trunk/vegastrike/debian/rules 2008-04-11 23:34:34 UTC (rev
6516)
@@ -26,11 +26,6 @@
confflags += --enable-debug-rel
endif
-INSTALL_PROGRAM = install
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
-
# borrowed from the kernel rules script since this can
# take a few minutes to compile :)
ifneq ($(strip $(CONCURRENCY_LEVEL)),)
@@ -45,15 +40,14 @@
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 \
+ --datadir=/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) && \
- cd vssetup/src && \
- perl build
touch build-stamp
clean:
@@ -77,15 +71,10 @@
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
- $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
- DESTDIR=$(CURDIR)/debian/vegastrike/ bindir=/usr/games/ && \
- $(INSTALL_PROGRAM) -m 0755 vssetup/src/bin/setup \
- $(CURDIR)/debian/vegastrike/usr/games/vssetup
- dh_install debian/scripts/vsinstall usr/games
-# (cd vssetup/src && \
-# $(MAKE) install INSTALL="$(INSTALL_PROGRAM)" \
-# DESTDIR=$(CURDIR)/debian/vegastrike/ \
-# )
+ $(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
#Nothing to do for binary-indep
binary-indep:
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
