[SCM] Packaging the Gamazons Games branch, master, updated. 66ef6707c0df2f41a0dd79b740ae20aa37d39880
Christoph Egger
Christoph.Egger at gmx.de
Sun Aug 16 11:19:15 UTC 2009
The following commit has been merged in the master branch:
commit 66ef6707c0df2f41a0dd79b740ae20aa37d39880
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date: Wed Aug 5 11:57:51 2009 +0200
Port from CDBS to dh 7
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..35578e1
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+debian/gamazons.6
+pixmaps/gnome-gamazons.xpm
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index b1cb657..5185a4b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
Uploaders: Christoph Egger <debian at christoph-egger.org>
Vcs-Git: git://git.debian.org/git/pkg-games/gamazons.git/
Vcs-Browser: http://git.debian.org/?p=pkg-games/gamazons.git
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, libgnomeui-dev, imagemagick,
- docbook-to-man
+Build-Depends: debhelper (>= 7), autotools-dev, libgnomeui-dev,
+ imagemagick, quilt, docbook-to-man
Standards-Version: 3.8.0
Homepage: http://www.yorgalily.org/gamazons/
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..ba1610b
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/gamazons.6
diff --git a/debian/patches/01_lookup_widget.diff b/debian/patches/01_lookup_widget.diff
deleted file mode 100644
index 9af144a..0000000
--- a/debian/patches/01_lookup_widget.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -x '*.jpg' -x '*_archive' -x '*.png' -x '*.wav' -x '*.ogg' -ruN ../orig/gamazons-0.83/src/board.c ./src/board.c
---- ../orig/gamazons-0.83/src/board.c 2002-11-25 01:47:38.000000000 +0100
-+++ ./src/board.c 2006-12-30 13:38:09.000000000 +0100
-@@ -6,6 +6,7 @@
- #include "board.h"
- #include "bstate.h"
- #include "callbacks.h"
-+#include "support.h"
-
- /* local Prototypes */
-
-diff -x '*.jpg' -x '*_archive' -x '*.png' -x '*.wav' -x '*.ogg' -ruN ../orig/gamazons-0.83/src/bstate.c ./src/bstate.c
---- ../orig/gamazons-0.83/src/bstate.c 2002-11-25 01:47:38.000000000 +0100
-+++ ./src/bstate.c 2006-12-30 13:38:38.000000000 +0100
-@@ -2,6 +2,7 @@
- #include "amazons.h"
- #include "board.h"
- #include "bstate.h"
-+#include "support.h"
-
- static Board_State bstate;
- extern struct game_states states;
-diff -x '*.jpg' -x '*_archive' -x '*.png' -x '*.wav' -x '*.ogg' -ruN ../orig/gamazons-0.83/src/moves.c ./src/moves.c
---- ../orig/gamazons-0.83/src/moves.c 2002-11-25 01:47:38.000000000 +0100
-+++ ./src/moves.c 2006-12-30 13:38:19.000000000 +0100
-@@ -28,6 +28,7 @@
-
- #include "amazons.h"
- #include "unit-test.h"
-+#include "support.h"
-
-
- #define HEVAL heval // for testing differant hevals
diff --git a/debian/patches/03_human_ai.diff b/debian/patches/03_human_ai.diff
deleted file mode 100644
index 08e1a67..0000000
--- a/debian/patches/03_human_ai.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- ../orig/gamazons-0.83/src/moves.c 2002-11-25 01:47:38.000000000 +0100
-+++ src/moves.c 2006-12-30 16:20:40.000000000 +0100
-@@ -1742,7 +1742,7 @@
- options.engine.maxwidth=3000;
- options.engine.timeout=1;
- options.white_player=HUMAN;
-- options.black_player=HUMAN;
-+ options.black_player=AI;
- options.print_statistics=FALSE;
-
- home_env = getenv("HOME");
diff --git a/debian/patches/human-ai b/debian/patches/human-ai
new file mode 100644
index 0000000..136d974
--- /dev/null
+++ b/debian/patches/human-ai
@@ -0,0 +1,13 @@
+Index: gamazons/src/moves.c
+===================================================================
+--- gamazons.orig/src/moves.c 2009-08-05 11:53:17.000000000 +0200
++++ gamazons/src/moves.c 2009-08-05 11:53:26.000000000 +0200
+@@ -1743,7 +1743,7 @@
+ options.engine.maxwidth=3000;
+ options.engine.timeout=1;
+ options.white_player=HUMAN;
+- options.black_player=HUMAN;
++ options.black_player=AI;
+ options.print_statistics=FALSE;
+
+ home_env = getenv("HOME");
diff --git a/debian/patches/lookup-widget b/debian/patches/lookup-widget
new file mode 100644
index 0000000..24e608b
--- /dev/null
+++ b/debian/patches/lookup-widget
@@ -0,0 +1,36 @@
+Index: gamazons/src/board.c
+===================================================================
+--- gamazons.orig/src/board.c 2009-08-05 11:43:04.000000000 +0200
++++ gamazons/src/board.c 2009-08-05 11:43:14.000000000 +0200
+@@ -6,6 +6,7 @@
+ #include "board.h"
+ #include "bstate.h"
+ #include "callbacks.h"
++#include "support.h"
+
+ /* local Prototypes */
+
+Index: gamazons/src/bstate.c
+===================================================================
+--- gamazons.orig/src/bstate.c 2009-08-05 11:43:04.000000000 +0200
++++ gamazons/src/bstate.c 2009-08-05 11:43:14.000000000 +0200
+@@ -2,6 +2,7 @@
+ #include "amazons.h"
+ #include "board.h"
+ #include "bstate.h"
++#include "support.h"
+
+ static Board_State bstate;
+ extern struct game_states states;
+Index: gamazons/src/moves.c
+===================================================================
+--- gamazons.orig/src/moves.c 2009-08-05 11:43:04.000000000 +0200
++++ gamazons/src/moves.c 2009-08-05 11:43:14.000000000 +0200
+@@ -28,6 +28,7 @@
+
+ #include "amazons.h"
+ #include "unit-test.h"
++#include "support.h"
+
+
+ #define HEVAL heval // for testing differant hevals
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7239ff1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+lookup-widget
+warnings
+human-ai
diff --git a/debian/patches/02_warnings.diff b/debian/patches/warnings
similarity index 88%
rename from debian/patches/02_warnings.diff
rename to debian/patches/warnings
index ca87a48..7b8a4e9 100644
--- a/debian/patches/02_warnings.diff
+++ b/debian/patches/warnings
@@ -1,12 +1,14 @@
---- ../orig/gamazons-0.83/src/board.c 2002-11-25 01:47:38.000000000 +0100
-+++ src/board.c 2006-12-30 16:20:40.000000000 +0100
+Index: gamazons/src/board.c
+===================================================================
+--- gamazons.orig/src/board.c 2009-08-05 11:52:32.000000000 +0200
++++ gamazons/src/board.c 2009-08-05 11:52:35.000000000 +0200
@@ -1,3 +1,5 @@
+#define _GNU_SOURCE
+#include <stdio.h>
#include <time.h>
#include <assert.h>
#include <gnome.h>
-@@ -10,9 +12,6 @@
+@@ -11,9 +13,6 @@
/* local Prototypes */
@@ -16,7 +18,7 @@
static void draw_a_line(GnomeCanvasGroup *group,
int x1, int y1, int x2, int y2, char *color);
static void draw_grid();
-@@ -32,7 +31,6 @@
+@@ -33,7 +32,6 @@
void init_game_board(GtkWidget *GamazonsMain)
{
int i,j;
@@ -24,7 +26,7 @@
GtkWidget *w = (GtkWidget *) lookup_widget(GamazonsMain, BOARD_NAME);
GtkWidget *force_button, *undo_button;
GtkTextView *view;
-@@ -114,32 +112,6 @@
+@@ -115,32 +113,6 @@
}
@@ -57,7 +59,7 @@
static void draw_grid()
{
int x,y;
-@@ -189,14 +161,12 @@
+@@ -190,14 +162,12 @@
void draw_board()
{
int i,j,k;
@@ -74,7 +76,7 @@
/* Find images */
-@@ -425,12 +395,10 @@
+@@ -426,12 +396,10 @@
{
double Lx, Uy, Rx, By;
double to_Lx, to_Uy;
@@ -88,7 +90,7 @@
game_life = bstate_get_game_life();
to_Lx = get_x_from_square(to);
-@@ -600,7 +568,9 @@
+@@ -601,7 +569,9 @@
int x,y;
GdkPixbuf *arrow_sq;
GnomeCanvasItem *image;
@@ -99,7 +101,7 @@
x = sq % 10;
y = sq / 10;
-@@ -808,7 +778,6 @@
+@@ -809,7 +779,6 @@
move movelist[3000];
int move_count;
int i;
@@ -107,7 +109,7 @@
int found = FALSE;
char move_str[32];
char err_msg[256];
-@@ -889,9 +858,7 @@
+@@ -890,9 +859,7 @@
void gen_legal_moves(Square sq)
{
int arr_i = 0;
@@ -117,7 +119,7 @@
sq_col = get_x_int_from_square(sq);
sq_row = get_y_int_from_square(sq);
-@@ -1140,7 +1107,7 @@
+@@ -1141,7 +1108,7 @@
*
* Updates the status bar based on the current value of what_next
*/
@@ -126,7 +128,7 @@
{
GtkStatusbar *status = (GtkStatusbar *) lookup_widget(main_window, "statusbar1");
guint context_id = bstate_get_what_next();
-@@ -1174,6 +1141,7 @@
+@@ -1175,6 +1142,7 @@
}
@@ -134,7 +136,7 @@
}
/*==============================================================================
-@@ -1212,8 +1180,6 @@
+@@ -1213,8 +1181,6 @@
*/
void destroy_board()
{
@@ -143,7 +145,7 @@
#ifdef DEBUG
-@@ -1411,7 +1377,7 @@
+@@ -1412,7 +1378,7 @@
int replay_mode = bstate_get_replay_mode();
int replay_delay = 0;
int game_life = bstate_get_game_life();
@@ -152,8 +154,10 @@
if (replay_mode)
{
---- ../orig/gamazons-0.83/src/callbacks.c 2002-11-25 01:47:38.000000000 +0100
-+++ src/callbacks.c 2006-12-30 15:57:40.000000000 +0100
+Index: gamazons/src/callbacks.c
+===================================================================
+--- gamazons.orig/src/callbacks.c 2009-08-05 11:52:23.000000000 +0200
++++ gamazons/src/callbacks.c 2009-08-05 11:52:35.000000000 +0200
@@ -18,7 +18,7 @@
extern Square legal_moves[100];
extern int ok;
diff --git a/debian/rules b/debian/rules
index 257f142..87526cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,30 +1,17 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+%:
+ dh --with quilt $@
-DEB_CONFIGURE_EXTRA_FLAGS += --bindir=/usr/games
-DEB_INSTALL_MANPAGES_gamazons := debian/gamazons.6
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-update-config::
- [ -e pixmaps/gnome-gamazons.xpm ] || \
- convert -resize 32x32 pixmaps/gnome-gamazons.png pixmaps/gnome-gamazons.xpm
-
-reverse-config::
- rm -f pixmaps/gnome-gamazons.xpm
-
-restore-cruft:
- for f in \
- config.h config.log config.status gamazons.glade.bak gamazons.gladep.bak Makefile Makefile.in pixmaps/Makefile po/Makefile \
- po/Makefile.in po/POTFILES src/.deps src/interface.c.bak src/interface.h.bak src/Makefile stamp-h ; \
- do \
- rm -rf $$f ; \
- cp -p -r ../orig/*/$$f $$f ; \
- done
+override_dh_auto_configure:
+ CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --bindir=/usr/games
-pre-build::
+override_dh_auto_build:
+ [ -e pixmaps/gnome-gamazons.xpm ] || \
+ convert -resize 32x32 pixmaps/gnome-gamazons.png pixmaps/gnome-gamazons.xpm
docbook-to-man debian/gamazons.sgml > debian/gamazons.6
-clean::
- rm -f debian/gamazons.6
+
--
Packaging the Gamazons Games
More information about the Pkg-games-commits
mailing list