[berusky] 06/17: Refresh 01-debianize.patch and 04-unfinished.patch.patch.
Markus Koschany
apo at moszumanska.debian.org
Sun Oct 8 14:30:04 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository berusky.
commit 487836021958e78875f787d8515b3c49c71e52e8
Author: Markus Koschany <apo at debian.org>
Date: Sun Oct 8 15:42:01 2017 +0200
Refresh 01-debianize.patch and 04-unfinished.patch.patch.
---
debian/patches/01-debianize.patch | 80 +++++++++++++++++++++++++++
debian/patches/04-unfinished.patch.patch | 95 ++++++++++++++++++++++++++++++++
debian/patches/05-no-editor.patch | 4 +-
debian/patches/11-german-po.patch | 4 +-
debian/patches/12-locale.patch | 4 +-
debian/patches/series | 2 +
6 files changed, 183 insertions(+), 6 deletions(-)
diff --git a/debian/patches/01-debianize.patch b/debian/patches/01-debianize.patch
new file mode 100644
index 0000000..e97cd10
--- /dev/null
+++ b/debian/patches/01-debianize.patch
@@ -0,0 +1,80 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 8 Oct 2017 15:37:38 +0200
+Subject: 01 debianize
+
+---
+ Makefile.in | 6 ++----
+ configure | 2 +-
+ configure.in | 4 ++--
+ src/defines.h | 2 +-
+ 4 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index c1c92d7..8bd17e9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -375,14 +375,12 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = po src data
+-beruskydocdir = ${prefix}/doc/berusky
++SUBDIRS = po src
++beruskydocdir = ${prefix}/share/doc/berusky
+ beruskydoc_DATA = \
+ README\
+- COPYING\
+ AUTHORS\
+ ChangeLog\
+- INSTALL\
+ NEWS\
+ TODO
+
+diff --git a/configure b/configure
+index 994c226..a6ede7a 100755
+--- a/configure
++++ b/configure
+@@ -17674,7 +17674,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+
+
+-ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile data/Makefile"
++ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile"
+
+ cat >confcache <<\_ACEOF
+ # This file is a shell script that caches the results of configure
+diff --git a/configure.in b/configure.in
+index 1ed29ff..aa7a49f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -50,7 +50,7 @@ fi
+
+ dnl Set PACKAGE DATA & DOC DIR
+ packagedatadir=share
+-packagedocdir=doc/${PACKAGE}
++packagedocdir=share/doc/${PACKAGE}
+
+ dnl Set PACKAGE DIRS in config.h.
+ packagepixmapsdir=${packagedatadir}/pixmaps
+@@ -66,7 +66,7 @@ AC_SUBST(PACKAGE_DATA_DIR)
+ dnl Subst PACKAGE_DOC_DIR.
+ NO_PREFIX_PACKAGE_DOC_DIR="${packagedocdir}"
+ AC_SUBST(NO_PREFIX_PACKAGE_DOC_DIR)
+-PACKAGE_DOC_DIR="${packageprefix}/${packagedocdir}"
++PACKAGE_DOC_DIR="${packageprefix}/share/${packagedocdir}"
+ AC_SUBST(PACKAGE_DOC_DIR)
+
+ dnl Subst PACKAGE_PIXMAPS_DIR.
+diff --git a/src/defines.h b/src/defines.h
+index df5145d..c249c34 100644
+--- a/src/defines.h
++++ b/src/defines.h
+@@ -445,7 +445,7 @@ typedef int anim_handle;
+ #define INI_USER_DIRECTORY "~/.berusky"
+ #define INI_USER_LEVELS "~/.berusky/User"
+ #define INI_USER_PROFILES "~/.berusky/Profiles"
+-#define INI_FILE_GLOBAL "/var/games/berusky/"INI_FILE_NAME
++#define INI_FILE_GLOBAL "/etc/berusky/"INI_FILE_NAME
+ #define INI_FILE_USER "~/.berusky/"INI_FILE_NAME
+ #define INI_FILE_LOCAL "./"INI_FILE_NAME
+ #define DIRECTORY_GET(d) (d)
diff --git a/debian/patches/04-unfinished.patch.patch b/debian/patches/04-unfinished.patch.patch
new file mode 100644
index 0000000..4d65526
--- /dev/null
+++ b/debian/patches/04-unfinished.patch.patch
@@ -0,0 +1,95 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 8 Oct 2017 15:41:33 +0200
+Subject: 04 unfinished.patch
+
+---
+ README | 2 --
+ src/berusky_gui.cpp | 4 ----
+ src/main.cpp | 12 ------------
+ src/main.h | 1 -
+ 4 files changed, 19 deletions(-)
+
+diff --git a/README b/README
+index 9fef3e6..58d40da 100644
+--- a/README
++++ b/README
+@@ -98,8 +98,6 @@
+ 4 - Choose the fourth bug
+ 5 - Choose the fifth bug
+
+- N - change the music (not implemented yet)
+- D - start recording a demo (not implemented yet)
+ CTRL+X - quit quickly
+
+ F1 - In game help
+diff --git a/src/berusky_gui.cpp b/src/berusky_gui.cpp
+index db9da58..8c908f7 100644
+--- a/src/berusky_gui.cpp
++++ b/src/berusky_gui.cpp
+@@ -1057,8 +1057,6 @@ which can be controlled by these keys:"));
+ p_font->print(NULL, X_START+20, start_y += Y_DIFF, _("SHIFT+arrows"));
+
+ p_font->print(NULL, X_START+20, start_y += Y_DIFF, _("Tab"));
+- p_font->print(NULL, X_START+20, start_y += Y_DIFF, _("N"));
+- p_font->print(NULL, X_START+20, start_y += Y_DIFF, _("D"));
+ p_font->print(NULL, X_START+20, start_y += Y_DIFF, _("CTRL+X"));
+ p_font->print(NULL, X_START+20, start_y += Y_DIFF, _("F1"));
+ p_font->print(NULL, X_START+20, start_y += Y_DIFF, _("F2"));
+@@ -1068,8 +1066,6 @@ which can be controlled by these keys:"));
+ p_font->print(NULL, X_START+135, start_y, _(". . . . . move the bug"));
+ p_font->print(NULL, X_START+205, start_y += Y_DIFF, _(". . quick bug movement"));
+ p_font->print(NULL, X_START+86, start_y += Y_DIFF, _(". . . . . . . switch among the bugs"));
+- p_font->print(NULL, X_START+60, start_y += Y_DIFF, _(". . . . . . . . change the music"));
+- p_font->print(NULL, X_START+60, start_y += Y_DIFF, _(". . . . . . . . demo"));
+ p_font->print(NULL, X_START+110, start_y += Y_DIFF, _(". . . . . . quit quickly"));
+ p_font->print(NULL, X_START+60, start_y += Y_DIFF, _(". . . . . . . . Help"));
+ p_font->print(NULL, X_START+60, start_y += Y_DIFF, _(". . . . . . . . Save level"));
+diff --git a/src/main.cpp b/src/main.cpp
+index 836eb07..9adfdd3 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -144,11 +144,6 @@ void run_game(GAME_MODE gmode, char *p_garg, DIR_LIST *p_dir)
+ main_queue.add(LEVEL_EVENT(GC_RUN_LEVEL_LINE, p_garg));
+ break;
+
+- /* Run demo */
+- case USER_DEMO:
+- //main_queue.add(LEVEL_EVENT(GC_RUN_LEVEL_LINE, p_garg));
+- break;
+-
+ /* WTF? */
+ default:
+ assert(0);
+@@ -321,12 +316,6 @@ int main(int argc, char *argv[])
+ gmode = USER_LEVEL;
+ p_garg = argv[2];
+ }
+- /* Run demo */
+- else if(argc > 2 && (argv[1][0] != '-' || argv[1][1] == 'd'))
+- {
+- gmode = USER_DEMO;
+- p_garg = argv[2];
+- }
+ /* Run normal game from menu */
+ else if(argc == 1)
+ {
+@@ -354,7 +343,6 @@ int main(int argc, char *argv[])
+ void start_logo_draw(GAME_MODE mode)
+ {
+ switch(mode) {
+- case USER_DEMO:
+ case USER_LEVEL:
+ case MENU:
+ {
+diff --git a/src/main.h b/src/main.h
+index 113ef4a..50015cc 100644
+--- a/src/main.h
++++ b/src/main.h
+@@ -31,7 +31,6 @@
+ typedef enum game_mode {
+
+ USER_LEVEL,
+- USER_DEMO,
+ MENU,
+ EDITOR
+
diff --git a/debian/patches/05-no-editor.patch b/debian/patches/05-no-editor.patch
index 37bc0ae..2bc6953 100644
--- a/debian/patches/05-no-editor.patch
+++ b/debian/patches/05-no-editor.patch
@@ -7,7 +7,7 @@ Subject: 05 no editor
1 file changed, 5 deletions(-)
diff --git a/src/berusky_gui.cpp b/src/berusky_gui.cpp
-index 78ffb66..46f027d 100644
+index c832b3b..db9da58 100644
--- a/src/berusky_gui.cpp
+++ b/src/berusky_gui.cpp
@@ -271,7 +271,6 @@ void game_gui::menu_main(MENU_STATE state, size_ptr data, size_ptr data1)
@@ -18,7 +18,7 @@ index 78ffb66..46f027d 100644
menu_item_draw(quit, MENU_LEFT, MENU_SAVE_BACK, LEVEL_EVENT(GC_MENU_QUIT));
p_font->alignment_set(MENU_CENTER);
-@@ -2826,10 +2825,6 @@ bool game_gui::callback(LEVEL_EVENT_QUEUE *p_queue, int frame)
+@@ -2835,10 +2834,6 @@ bool game_gui::callback(LEVEL_EVENT_QUEUE *p_queue, int frame)
p_ber->game_data_load();
break;
diff --git a/debian/patches/11-german-po.patch b/debian/patches/11-german-po.patch
index cc3353c..2ff5d10 100644
--- a/debian/patches/11-german-po.patch
+++ b/debian/patches/11-german-po.patch
@@ -9,10 +9,10 @@ Subject: 11 german po
create mode 100644 po/de.po
diff --git a/configure b/configure
-index 3853fb3..2594f04 100755
+index 1a22b19..994c226 100755
--- a/configure
+++ b/configure
-@@ -6209,7 +6209,7 @@ cat >>confdefs.h <<_ACEOF
+@@ -6259,7 +6259,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
diff --git a/debian/patches/12-locale.patch b/debian/patches/12-locale.patch
index 325ab61..2c73c0d 100644
--- a/debian/patches/12-locale.patch
+++ b/debian/patches/12-locale.patch
@@ -7,10 +7,10 @@ Subject: 12 locale
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/main.cpp b/src/main.cpp
-index 1de19c8..2d65fcd 100644
+index 3ea2281..836eb07 100644
--- a/src/main.cpp
+++ b/src/main.cpp
-@@ -276,7 +276,16 @@ int main(int argc, char *argv[])
+@@ -284,7 +284,16 @@ int main(int argc, char *argv[])
setbuf(stdout, NULL);
setbuf(stderr, NULL);
srand(clock());
diff --git a/debian/patches/series b/debian/patches/series
index 61da4d9..d8024b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
05-no-editor.patch
11-german-po.patch
12-locale.patch
+01-debianize.patch
+04-unfinished.patch.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/berusky.git
More information about the Pkg-games-commits
mailing list