[gweled] 02/72: Imported Debian patch 0.7-2
Stephen Kitt
skitt at moszumanska.debian.org
Thu May 26 16:55:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch debian-sid
in repository gweled.
commit c6961692f90a032da85e8ab6c3e6ec0d38b017ad
Author: Ondřej Surý <ondrej at debian.org>
Date: Tue Dec 5 18:20:44 2006 +0100
Imported Debian patch 0.7-2
---
debian/changelog | 53 +++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 17 ++++++++
debian/control.in | 17 ++++++++
debian/copyright | 12 ++++++
debian/dirs | 3 ++
debian/docs | 1 +
debian/gweled.postinst | 26 ++++++++++++
debian/gweled.postrm | 27 +++++++++++++
debian/menu | 2 +
debian/patches/fix_double_free.diff | 12 ++++++
debian/patches/gweled-ppc.diff | 11 +++++
debian/patches/mikmod-disable-disk-writers.diff | 16 ++++++++
debian/rules | 21 ++++++++++
14 files changed, 219 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..f99b041
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,53 @@
+gweled (0.7-2) unstable; urgency=low
+
+ * Disable disk writer driver in MikMod initialization
+ (Closes: #401727, #401375)
+ * Fix double free when exiting (Closes: #401730)
+
+ -- Ondřej Surý <ondrej at debian.org> Tue, 5 Dec 2006 18:20:44 +0100
+
+gweled (0.7-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #392973)
+ + Removed some patches merged upstream.
+ * Added -rdynamic CFLAG (Closes: #392971)
+
+ -- Ondřej Surý <ondrej at debian.org> Mon, 23 Oct 2006 14:14:41 +0200
+
+gweled (0.6-2) unstable; urgency=low
+
+ * Fix missing DESTDIR in scoredir (Closes: #307643)
+
+ -- Ondřej Surý <ondrej at sury.org> Fri, 6 May 2005 21:25:38 +0200
+
+gweled (0.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * Apply patch to fix timed game speed not resetting (Closes: #286874)
+ - credits to Neil Moore <neil at s-z.org>
+ * Apply patch to fix FTBFS on amd64 (Closes: #286956)
+ - credits to Andreas Jochens <aj at andaco.de>
+
+ -- Ondřej Surý <ondrej at sury.org> Tue, 3 May 2005 20:48:13 +0200
+
+gweled (0.5-2) unstable; urgency=low
+
+ * Fix PPC runtime error, credits to Michael Klein (Closes: #280506)
+
+ -- Ondřej Surý <ondrej at sury.org> Wed, 10 Nov 2004 12:37:17 +0100
+
+gweled (0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Remove upstream score file from package.
+ * Move binary to /usr/games and make it setgid games (Closes: #268682)
+ * Create debian menu entry (Closes: #268682)
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 2 Sep 2004 09:34:12 +0200
+
+gweled (0.4-1) unstable; urgency=low
+
+ * Initial Release. (Closes: #225711)
+
+ -- Ondřej Surý <ondrej at debian.org> Thu, 19 Aug 2004 08:58:17 +0200
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..d3e974f
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,17 @@
+Source: gweled
+Section: games
+Priority: optional
+Maintainer: Ondřej Surý <ondrej at debian.org>
+Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-pkg-tools, libgnomecanvas2-dev, libglade2-dev, libgnomeui-dev, librsvg2-dev, libmikmod2-dev
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Andrew Lau <netsnipe at users.sourceforge.net>, Clément Stenac <zorglub at debian.org>, Dafydd Harries <daf at debian.org>, Guilherme de S. Pastore <gpastore at debian.org>, Gustavo Franco <stratus at debian.org>, Gustavo Noronha Silva <kov at debian.org>, J.H.M. Dassen (Ray) <jdassen at debian.org>, Jordi Mallach <jordi at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier [...]
+Standards-Version: 3.6.1.0
+
+Package: gweled
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A "Diamond Mine" puzzle game
+ Gweled is a Gnome version of a popular PalmOS/Windows/Java
+ game called "Bejeweled" or "Diamond Mine". The aim of the game
+ is to make alignment of 3 or more gems, both vertically
+ or horizontally by swapping adjacent gems. The game ends
+ when there are no possible moves left.
diff --git a/debian/control.in b/debian/control.in
new file mode 100644
index 0000000..6ae2844
--- /dev/null
+++ b/debian/control.in
@@ -0,0 +1,17 @@
+Source: gweled
+Section: games
+Priority: optional
+Maintainer: Ondřej Surý <ondrej at debian.org>
+Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-pkg-tools, libgnomecanvas2-dev, libglade2-dev, libgnomeui-dev, librsvg2-dev, libmikmod2-dev
+Uploaders: @GNOME_TEAM@
+Standards-Version: 3.6.1.0
+
+Package: gweled
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A "Diamond Mine" puzzle game
+ Gweled is a Gnome version of a popular PalmOS/Windows/Java
+ game called "Bejeweled" or "Diamond Mine". The aim of the game
+ is to make alignment of 3 or more gems, both vertically
+ or horizontally by swapping adjacent gems. The game ends
+ when there are no possible moves left.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..6c458ec
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,12 @@
+This package was debianized by Ondřej Surý <ondrej at debian.org> on
+Sat, 14 Aug 2004 10:12:36 +0200.
+
+It was downloaded from http://sebdelestaing.free.fr/gweled/
+
+Upstream Author(s): Sebastien Delestaing <sebdelestaing at free.fr>
+
+Copyright:
+
+Gweled is licensed under the terms of the GNU General Public License.
+On Debian systems, the complete text of the GPL can be found in
+/usr/share/common-licenses/GPL.
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..12cd302
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1,3 @@
+usr/games
+usr/share/gweled
+usr/share/pixmaps/gweled
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..edc0071
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+NEWS
diff --git a/debian/gweled.postinst b/debian/gweled.postinst
new file mode 100644
index 0000000..d54dc60
--- /dev/null
+++ b/debian/gweled.postinst
@@ -0,0 +1,26 @@
+#! /bin/sh
+
+set -e
+
+# gweled scores files get root:games
+
+SCORE_FILES="
+gweled.easy.scores
+gweled.timed.scores"
+
+if [ ! -d /var/games ]; then
+ mkdir /var/games
+fi
+
+for FILES in $SCORE_FILES; do
+
+ if [ -e /var/games/$FILES ]; then
+ continue
+ fi
+
+ touch /var/games/$FILES
+ chown root:games /var/games/$FILES
+ chmod 664 /var/games/$FILES
+done
+
+#DEBHELPER#
diff --git a/debian/gweled.postrm b/debian/gweled.postrm
new file mode 100644
index 0000000..6b3fe03
--- /dev/null
+++ b/debian/gweled.postrm
@@ -0,0 +1,27 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "purge" ] ; then
+# remove empty/unused scorefiles
+
+SCORE_FILES="
+gweled.easy.scores
+gweled.timed.scores"
+
+ for FILES in $SCORE_FILES; do
+
+ if [ -s /var/games/$FILES ]; then
+ continue
+ fi
+
+ rm -f /var/games/$FILES
+ done
+
+ if [ -d /var/games ]; then
+ rmdir --ignore-fail-on-non-empty /var/games
+ fi
+
+fi
+
+#DEBHELPER#
diff --git a/debian/menu b/debian/menu
new file mode 100644
index 0000000..ba798d9
--- /dev/null
+++ b/debian/menu
@@ -0,0 +1,2 @@
+?package(gweled):needs=X11 section=Games/Board \
+ title="Gweled" command="/usr/games/gweled"
diff --git a/debian/patches/fix_double_free.diff b/debian/patches/fix_double_free.diff
new file mode 100644
index 0000000..0d22819
--- /dev/null
+++ b/debian/patches/fix_double_free.diff
@@ -0,0 +1,12 @@
+diff -urN gweled-0.7~/src/main.c gweled-0.7/src/main.c
+--- gweled-0.7~/src/main.c 2005-05-25 23:44:04.000000000 +0200
++++ gweled-0.7/src/main.c 2006-12-05 18:29:49.000000000 +0100
+@@ -365,7 +369,7 @@
+ if(swap_sfx)
+ Sample_Free(swap_sfx);
+ if(click_sfx)
+- Sample_Free(swap_sfx);
++ Sample_Free(click_sfx);
+
+ MikMod_Exit();
+
diff --git a/debian/patches/gweled-ppc.diff b/debian/patches/gweled-ppc.diff
new file mode 100644
index 0000000..115a37f
--- /dev/null
+++ b/debian/patches/gweled-ppc.diff
@@ -0,0 +1,11 @@
+--- src/board_engine.c.orig 2004-11-09 22:53:38.000000000 +0100
++++ src/board_engine.c 2004-11-09 23:12:28.116177720 +0100
+@@ -40,7 +40,7 @@
+ gint gi_x_click = 0;
+ gint gi_y_click = 0;
+
+-gchar gpc_game_board[BOARD_WIDTH][BOARD_HEIGHT];
++gint gpc_game_board[BOARD_WIDTH][BOARD_HEIGHT];
+ gint gi_nb_of_tiles[7];
+
+ gboolean g_do_not_score;
diff --git a/debian/patches/mikmod-disable-disk-writers.diff b/debian/patches/mikmod-disable-disk-writers.diff
new file mode 100644
index 0000000..582f40b
--- /dev/null
+++ b/debian/patches/mikmod-disable-disk-writers.diff
@@ -0,0 +1,16 @@
+diff -urN gweled-0.7~/src/main.c gweled-0.7/src/main.c
+--- gweled-0.7~/src/main.c 2005-05-25 23:44:04.000000000 +0200
++++ gweled-0.7/src/main.c 2006-12-05 18:29:49.000000000 +0100
+@@ -254,7 +254,11 @@
+ PACKAGE_DATA_DIR, NULL);
+
+ /* register all the drivers */
+- MikMod_RegisterAllDrivers();
++ MikMod_RegisterDriver(&drv_AF);
++ MikMod_RegisterDriver(&drv_esd);
++ MikMod_RegisterDriver(&drv_alsa);
++ MikMod_RegisterDriver(&drv_oss);
++ MikMod_RegisterDriver(&drv_nos);
+
+ /* register all the module loaders */
+ MikMod_RegisterAllLoaders();
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..fef2439
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,21 @@
+#! /usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS := --bindir=\$${prefix}/games
+DEB_DH_FIXPERMS_ARGS := -X/var/games/.*scores -X/usr/games
+
+CFLAGS := -Wall -g -rdynamic
+
+# Ensure at build time that the library has no dependencies on undefined
+# symbols.
+LDFLAGS += -Wl,-z,defs
+
+# Speed up loading.
+LDFLAGS += -Wl,-O1
+
+binary-post-install/gweled::
+ chmod u+w $(CURDIR)/debian/gweled/usr/games/*
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/gweled.git
More information about the Pkg-games-commits
mailing list