1 |
hasufell 13/01/30 16:12:06 |
2 |
|
3 |
Added: berusky-1.6-gentoo.patch |
4 |
Log: |
5 |
version bump wrt #454624 |
6 |
|
7 |
(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 games-arcade/berusky/files/berusky-1.6-gentoo.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/berusky/files/berusky-1.6-gentoo.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/games-arcade/berusky/files/berusky-1.6-gentoo.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: berusky-1.6-gentoo.patch |
16 |
=================================================================== |
17 |
--- Makefile.am |
18 |
+++ Makefile.am |
19 |
@@ -5,8 +5,7 @@ |
20 |
|
21 |
SUBDIRS = po src data |
22 |
|
23 |
-beruskydocdir = ${prefix}/doc/berusky |
24 |
-beruskydoc_DATA = \ |
25 |
+EXTRA_DIST = \ |
26 |
README\ |
27 |
COPYING\ |
28 |
AUTHORS\ |
29 |
@@ -15,10 +14,6 @@ |
30 |
NEWS\ |
31 |
TODO |
32 |
|
33 |
-EXTRA_DIST = $(beruskydoc_DATA) |
34 |
- |
35 |
- |
36 |
- |
37 |
# Copy all the spec files. Of cource, only one is actually used. |
38 |
dist-hook: |
39 |
for specfile in *.spec; do \ |
40 |
--- data/Makefile.am |
41 |
+++ data/Makefile.am |
42 |
@@ -3,10 +3,3 @@ |
43 |
## Created by Anjuta - will be overwritten |
44 |
## If you don't want it to overwrite it, |
45 |
## Please disable it in the Anjuta project configuration |
46 |
- |
47 |
-berusky_datadir = $(prefix)/@NO_PREFIX_PACKAGE_DATA_DIR@/@PACKAGE@ |
48 |
- |
49 |
-berusky_data_DATA = \ |
50 |
- berusky.ini |
51 |
- |
52 |
-EXTRA_DIST = $(berusky_data_DATA) |
53 |
--- berusky.ini |
54 |
+++ berusky.ini |
55 |
@@ -1,9 +1,9 @@ |
56 |
# Configuration for berusky game |
57 |
|
58 |
# Game data location |
59 |
-level_data = /usr/share/berusky/Levels |
60 |
-game_data = /usr/share/berusky/GameData |
61 |
-graphics_data = /usr/share/berusky/Graphics |
62 |
+level_data = @GENTOO_DATADIR@/Levels |
63 |
+game_data = @GENTOO_DATADIR@/GameData |
64 |
+graphics_data = @GENTOO_DATADIR@/Graphics |
65 |
|
66 |
# Graphics settings for game and editor |
67 |
# game runs in 640x480 |
68 |
@@ -17,7 +17,7 @@ |
69 |
|
70 |
# Game binary & tmp dir |
71 |
# they're used by editor for "run level" command |
72 |
-game_binary = /usr/bin/berusky |
73 |
+game_binary = @GENTOO_BINDIR@/berusky |
74 |
tmp_data = /var/tmp |
75 |
|
76 |
# Dir for users levels (it's the default level dir for level editor) |
77 |
--- src/defines.h |
78 |
+++ src/defines.h |
79 |
@@ -446,7 +446,7 @@ |
80 |
#define INI_USER_DIRECTORY "~/.berusky" |
81 |
#define INI_USER_LEVELS "~/.berusky/User" |
82 |
#define INI_USER_PROFILES "~/.berusky/Profiles" |
83 |
-#define INI_FILE_GLOBAL "/var/games/berusky/"INI_FILE_NAME |
84 |
+#define INI_FILE_GLOBAL "@GENTOO_DATADIR@/"INI_FILE_NAME |
85 |
#define INI_FILE_USER "~/.berusky/"INI_FILE_NAME |
86 |
#define INI_FILE_LOCAL "./"INI_FILE_NAME |
87 |
#elif WINDOWS |