Author: tolimar
Date: 2010-07-20 10:44:10 +0000 (Tue, 20 Jul 2010)
New Revision: 11095
Removed:
packages/trunk/enemylines7/debian/patches/10_turn_off_useless_warnings.patch
Modified:
packages/trunk/enemylines7/debian/changelog
packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
packages/trunk/enemylines7/debian/patches/series
Log:
Refresh and drop patches
Modified: packages/trunk/enemylines7/debian/changelog
===================================================================
--- packages/trunk/enemylines7/debian/changelog 2010-07-20 10:36:32 UTC (rev
11094)
+++ packages/trunk/enemylines7/debian/changelog 2010-07-20 10:44:10 UTC (rev
11095)
@@ -9,12 +9,15 @@
[ Alexander Reichle-Schmehl ]
* New upstream release
* Drop debian/patches/fix-gcc-4.3.diff, applied upstream
+ * Drop debian/patches/10_turn_off_useless_warnings.patch not needed
+ anymore
+ * Refresh debian/patches/20_data_in_usr_games.patch
* Adopt debian/control to my new name
* Only call make clean, if Makefile exists
* Add debian/README.source
* Bump standards to 3.9.0 (No changes needed)
- -- Alexander Reichle-Schmehl <[email protected]> Tue, 20 Jul 2010 12:35:50
+0200
+ -- Alexander Reichle-Schmehl <[email protected]> Tue, 20 Jul 2010 12:43:22
+0200
enemylines7 (0.6-3) unstable; urgency=low
Deleted:
packages/trunk/enemylines7/debian/patches/10_turn_off_useless_warnings.patch
===================================================================
---
packages/trunk/enemylines7/debian/patches/10_turn_off_useless_warnings.patch
2010-07-20 10:36:32 UTC (rev 11094)
+++
packages/trunk/enemylines7/debian/patches/10_turn_off_useless_warnings.patch
2010-07-20 10:44:10 UTC (rev 11095)
@@ -1,18 +0,0 @@
-diff -ru enemylines7-0.6.orig/main.cc enemylines7-0.6/main.cc
---- enemylines7-0.6.orig/main.cc 2006-07-12 18:59:43.000000000 +0200
-+++ enemylines7-0.6/main.cc 2006-07-12 19:01:11.000000000 +0200
-@@ -30,14 +30,6 @@
- std::string load_audio(std::string dir) {
- std::string path;
- if (dir=="") {
-- path="data/";
-- std::cout << " Looking in " << path << std::endl;
-- if (Audio::load(path)) return path;
-- path="/usr/local/share/";
-- path+=PATHNAME;
-- path+="/";
-- std::cout << " Looking in " << path << std::endl;
-- if (Audio::load(path)) return path;
- path="/usr/share/";
- path+=PATHNAME;
- path+="/";
Modified: packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
===================================================================
--- packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
2010-07-20 10:36:32 UTC (rev 11094)
+++ packages/trunk/enemylines7/debian/patches/20_data_in_usr_games.patch
2010-07-20 10:44:10 UTC (rev 11095)
@@ -1,25 +1,10 @@
-diff -ru enemylines7-0.6.orig/Makefile enemylines7-0.6/Makefile
---- enemylines7-0.6.orig/Makefile 2006-07-12 19:03:56.000000000 +0200
-+++ enemylines7-0.6/Makefile 2006-07-12 19:46:00.000000000 +0200
-@@ -22,7 +22,7 @@
- rm -f *.o models/*.o block/*.o tweak/*.o math/*.o elements/*.o $(TARGET)
+--- a/src/lib01/filesystem1/filesystem1.cc
++++ b/src/lib01/filesystem1/filesystem1.cc
+@@ -47,6 +47,7 @@
+ namespace lib01 {
- install:
-- mkdir -p $(DESTDIR)/share/enemylines7/
-+ mkdir -p $(DESTDIR)/share/games/enemylines7/
- mkdir -p $(DESTDIR)/bin/
- cp enemylines7 $(DESTDIR)/bin/
-- cp data/* $(DESTDIR)/share/enemylines7/
-+ cp data/* $(DESTDIR)/share/games/enemylines7/
-diff -ru enemylines7-0.6.orig/main.cc enemylines7-0.6/main.cc
---- enemylines7-0.6.orig/main.cc 2006-07-12 19:03:56.000000000 +0200
-+++ enemylines7-0.6/main.cc 2006-07-12 19:46:20.000000000 +0200
-@@ -30,7 +30,7 @@
- std::string load_audio(std::string dir) {
- std::string path;
- if (dir=="") {
-- path="/usr/share/";
-+ path="/usr/share/games/";
- path+=PATHNAME;
- path+="/";
- std::cout << " Looking in " << path << std::endl;
+ FileSystem1::FileSystem1(std::string my):myname(my),physfs(false) {
++ dirs.push_back("/usr/share/games/$");
+ dirs.push_back("/usr/share/$");
+ dirs.push_back("/usr/local/share/$");
+ dirs.push_back("~/$");
Modified: packages/trunk/enemylines7/debian/patches/series
===================================================================
--- packages/trunk/enemylines7/debian/patches/series 2010-07-20 10:36:32 UTC
(rev 11094)
+++ packages/trunk/enemylines7/debian/patches/series 2010-07-20 10:44:10 UTC
(rev 11095)
@@ -1,2 +1 @@
-10_turn_off_useless_warnings.patch
20_data_in_usr_games.patch
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
