--- gweled-0.7.orig/gweled.desktop +++ gweled-0.7/gweled.desktop @@ -1,9 +1,11 @@ [Desktop Entry] +Version=1.0 +Encoding=UTF-8 Name=Gweled Comment=A "Diamond Mine" for Gnome Exec=gweled -Icon=gweled.png +Icon=gweled Terminal=false Type=Application -Categories=GNOME;Application;Game; +Categories=Game;BlocksGame; StartupNotify=true --- gweled-0.7.orig/debian/patches/gweled-ppc.diff +++ gweled-0.7/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; --- gweled-0.7.orig/debian/patches/mikmod-disable-disk-writers.diff +++ gweled-0.7/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(); --- gweled-0.7.orig/debian/patches/fix_double_free.diff +++ gweled-0.7/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(); + --- gweled-0.7.orig/debian/changelog +++ gweled-0.7/debian/changelog @@ -0,0 +1,80 @@ +gweled (0.7-2ubuntu1) feisty; urgency=low + + * Re-merge from Debian unstable. Ubuntu change: + - Fixed the .desktop file to match the specification + + -- Adrien Cunin Wed, 6 Dec 2006 14:50:30 +0100 + +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ý Tue, 5 Dec 2006 18:20:44 +0100 + +gweled (0.7-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu change: + - Fixed the .desktop file to match the specification + + -- Adrien Cunin Tue, 28 Nov 2006 21:07:28 +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ý Mon, 23 Oct 2006 14:14:41 +0200 + +gweled (0.6-2ubuntu1) dapper; urgency=low + + * Fixed the .desktop file to match the specification + * rules - Added -rdymanic to CFLAGS - Barry deFreese + + -- Emmet Hikory Sun, 9 Apr 2006 20:54:14 +0900 + +gweled (0.6-2build1) dapper; urgency=low + + * Rebuild to drop unwanted libglitz1 dependency on hppa. + + -- Adam Conrad Mon, 10 Apr 2006 20:02:03 +1000 + +gweled (0.6-2) unstable; urgency=low + + * Fix missing DESTDIR in scoredir (Closes: #307643) + + -- Ondřej Surý 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 + * Apply patch to fix FTBFS on amd64 (Closes: #286956) + - credits to Andreas Jochens + + -- Ondřej Surý 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ý 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ý Thu, 2 Sep 2004 09:34:12 +0200 + +gweled (0.4-1) unstable; urgency=low + + * Initial Release. (Closes: #225711) + + -- Ondřej Surý Thu, 19 Aug 2004 08:58:17 +0200 + --- gweled-0.7.orig/debian/compat +++ gweled-0.7/debian/compat @@ -0,0 +1 @@ +4 --- gweled-0.7.orig/debian/control +++ gweled-0.7/debian/control @@ -0,0 +1,17 @@ +Source: gweled +Section: games +Priority: optional +Maintainer: Ondřej Surý +Build-Depends: debhelper (>= 4.0.0), cdbs, gnome-pkg-tools, libgnomecanvas2-dev, libglade2-dev, libgnomeui-dev, librsvg2-dev, libmikmod2-dev +Uploaders: Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Marco Cabizza , Oystein Gisnas , Ross Burton , Sebastien Bacher , Sjoerd Simons +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. --- gweled-0.7.orig/debian/control.in +++ gweled-0.7/debian/control.in @@ -0,0 +1,17 @@ +Source: gweled +Section: games +Priority: optional +Maintainer: Ondřej Surý +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. --- gweled-0.7.orig/debian/copyright +++ gweled-0.7/debian/copyright @@ -0,0 +1,12 @@ +This package was debianized by Ondřej Surý on +Sat, 14 Aug 2004 10:12:36 +0200. + +It was downloaded from http://sebdelestaing.free.fr/gweled/ + +Upstream Author(s): Sebastien Delestaing + +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. --- gweled-0.7.orig/debian/dirs +++ gweled-0.7/debian/dirs @@ -0,0 +1,3 @@ +usr/games +usr/share/gweled +usr/share/pixmaps/gweled --- gweled-0.7.orig/debian/docs +++ gweled-0.7/debian/docs @@ -0,0 +1 @@ +NEWS --- gweled-0.7.orig/debian/gweled.postinst +++ gweled-0.7/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# --- gweled-0.7.orig/debian/gweled.postrm +++ gweled-0.7/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# --- gweled-0.7.orig/debian/menu +++ gweled-0.7/debian/menu @@ -0,0 +1,2 @@ +?package(gweled):needs=X11 section=Games/Board \ + title="Gweled" command="/usr/games/gweled" --- gweled-0.7.orig/debian/rules +++ gweled-0.7/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/*