r360 - in packages: . enemylines enemylines/enemylines7 enemylines/enemylines7/trunk enemylines/enemylines7/trunk/debian enemylines/enemylines7/trunk/debian/patches

[Gonéri Le Bouder]

Author: goneri-guest
Date: 2006-03-26 20:03:57 +0000 (Sun, 26 Mar 2006)
New Revision: 360

Added:
   packages/enemylines/
   packages/enemylines/enemylines7/
   packages/enemylines/enemylines7/trunk/
   packages/enemylines/enemylines7/trunk/debian/
   packages/enemylines/enemylines7/trunk/debian/patches/
   packages/enemylines/enemylines7/trunk/debian/patches/00list
   packages/enemylines/enemylines7/trunk/debian/patches/01_add_destdir_in_makefile.patch
   packages/enemylines/enemylines7/trunk/debian/patches/02_data_in_usr_share.patch
Log:
new game in the repository: enemylines7


Added: packages/enemylines/enemylines7/trunk/debian/patches/00list
===================================================================
--- packages/enemylines/enemylines7/trunk/debian/patches/00list	2006-03-26 19:59:48 UTC (rev 359)
+++ packages/enemylines/enemylines7/trunk/debian/patches/00list	2006-03-26 20:03:57 UTC (rev 360)
@@ -0,0 +1,2 @@
+01_add_destdir_in_makefile.patch
+02_data_in_usr_share.patch

Added: packages/enemylines/enemylines7/trunk/debian/patches/01_add_destdir_in_makefile.patch
===================================================================
--- packages/enemylines/enemylines7/trunk/debian/patches/01_add_destdir_in_makefile.patch	2006-03-26 19:59:48 UTC (rev 359)
+++ packages/enemylines/enemylines7/trunk/debian/patches/01_add_destdir_in_makefile.patch	2006-03-26 20:03:57 UTC (rev 360)
@@ -0,0 +1,38 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Goneri Le Bouder
+## DP: Add $(DESDIR) in the Makefile
+
+ at DPATCH@
+
+
+diff -ru enemylines.orig/Makefile enemylines7-0.5/Makefile
+--- enemylines.orig/Makefile	2006-03-20 16:06:47.000000000 +0100
++++ enemylines7-0.5/Makefile	2006-03-26 20:16:13.000000000 +0200
+@@ -1,4 +1,4 @@
+-
++DESTDIR	?= /usr/local
+ 
+ TARGET = enemylines7
+ 
+@@ -18,14 +18,11 @@
+ 
+ 
+ clean:
+-	rm *.o $(TARGET)
++	rm -f *.o models/*.o generators/*.o tweak/*.o $(TARGET)
+ 
+ install: 
+-	mkdir /usr/local/share/enemylines7/
+-	cp enemylines7 /usr/local/bin/
+-	cp data/* /usr/local/share/enemylines7/
+-
+-installpkg:
+-	mkdir /usr/share/enemylines7/
+-	cp enemylines7 /usr/bin/
+-	cp data/* /usr/share/enemylines7/
++	mkdir -p $(DESTDIR)/share/enemylines7/
++	mkdir -p $(DESTDIR)/bin/
++	cp enemylines7 $(DESTDIR)/bin/
++	cp data/* $(DESTDIR)/share/enemylines7/
++


Property changes on: packages/enemylines/enemylines7/trunk/debian/patches/01_add_destdir_in_makefile.patch
___________________________________________________________________
Name: svn:executable
   + *

Added: packages/enemylines/enemylines7/trunk/debian/patches/02_data_in_usr_share.patch
===================================================================
--- packages/enemylines/enemylines7/trunk/debian/patches/02_data_in_usr_share.patch	2006-03-26 19:59:48 UTC (rev 359)
+++ packages/enemylines/enemylines7/trunk/debian/patches/02_data_in_usr_share.patch	2006-03-26 20:03:57 UTC (rev 360)
@@ -0,0 +1,31 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Goneri Le Bouder <goneri at rulezlan.org>
+## DP: by default, enemylines7 look for its data in data and /usr/local
+## DP: before /usr/share
+## DP: I prefere to turn of this to avoid error if a non Debian 
+## DP: packaged enemylines is already installed
+
+ at DPATCH@
+
+
+diff -ru enemylines.orig/main.cc enemylines7-0.5/main.cc
+--- enemylines.orig/main.cc	2006-03-20 16:06:47.000000000 +0100
++++ enemylines7-0.5/main.cc	2006-03-26 20:31:08.000000000 +0200
+@@ -46,7 +46,7 @@
+ 
+ 	std::string path;
+ 	if (dir=="") {
+-		path="data/";
++/*		path="data/";
+ 		std::cout << "  Looking in " << path << std::endl;
+ 		err=Audio::load(path);
+ 		if (err) return path;
+@@ -59,6 +59,7 @@
+ 		err=Audio::load(path);
+ 		if (err) return path;
+ 		std::cout << "    Not found " << std::endl;
++		*/
+ 
+ 		path="/usr/share/";
+ 		path+=PATHNAME;


Property changes on: packages/enemylines/enemylines7/trunk/debian/patches/02_data_in_usr_share.patch
___________________________________________________________________
Name: svn:executable
   + *