--- gweled-0.6.orig/gweled.desktop +++ gweled-0.6/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.6.orig/debian/patches/scoredir-destdir.patch +++ gweled-0.6/debian/patches/scoredir-destdir.patch @@ -0,0 +1,48 @@ +diff -urN gweled-0.6~/Makefile.am gweled-0.6/Makefile.am +--- gweled-0.6~/Makefile.am 2004-11-30 20:27:09.000000000 +0100 ++++ gweled-0.6/Makefile.am 2005-05-06 21:23:05.280559704 +0200 +@@ -21,13 +21,13 @@ + fi \ + done \ + fi +- -$(mkinstalldirs) $(scoredir) +- touch $(scoredir)/gweled.easy.scores +- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.easy.scores +- -chmod 664 $(scoredir)/gweled.easy.scores +- touch $(scoredir)/gweled.timed.scores +- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.timed.scores +- -chmod 664 $(scoredir)/gweled.timed.scores ++ -$(mkinstalldirs) $(DESTDIR)$(scoredir) ++ touch $(DESTDIR)$(scoredir)/gweled.easy.scores ++ -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.easy.scores ++ -chmod 664 $(DESTDIR)$(scoredir)/gweled.easy.scores ++ touch $(DESTDIR)$(scoredir)/gweled.timed.scores ++ -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.timed.scores ++ -chmod 664 $(DESTDIR)$(scoredir)/gweled.timed.scores + -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gweled && chmod 2555 $(DESTDIR)$(bindir)/gweled ; fi + + dist-hook: +diff -urN gweled-0.6~/Makefile.in gweled-0.6/Makefile.in +--- gweled-0.6~/Makefile.in 2004-11-30 21:26:41.000000000 +0100 ++++ gweled-0.6/Makefile.in 2005-05-06 21:24:57.012573856 +0200 +@@ -624,13 +624,13 @@ + fi \ + done \ + fi +- -$(mkinstalldirs) $(scoredir) +- touch $(scoredir)/gweled.easy.scores +- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.easy.scores +- -chmod 664 $(scoredir)/gweled.easy.scores +- touch $(scoredir)/gweled.timed.scores +- -chown $(scores_user):$(scores_group) $(scoredir)/gweled.timed.scores +- -chmod 664 $(scoredir)/gweled.timed.scores ++ -$(mkinstalldirs) $(DESTDIR)$(scoredir) ++ touch $(DESTDIR)$(scoredir)/gweled.easy.scores ++ -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.easy.scores ++ -chmod 664 $(DESTDIR)$(scoredir)/gweled.easy.scores ++ touch $(DESTDIR)$(scoredir)/gweled.timed.scores ++ -chown $(scores_user):$(scores_group) $(DESTDIR)$(scoredir)/gweled.timed.scores ++ -chmod 664 $(DESTDIR)$(scoredir)/gweled.timed.scores + -if test "x$(setgid)" = "xtrue"; then chgrp $(scores_group) $(DESTDIR)$(bindir)/gweled && chmod 2555 $(DESTDIR)$(bindir)/gweled ; fi + + dist-hook: --- gweled-0.6.orig/debian/patches/gweled-amd64.diff +++ gweled-0.6/debian/patches/gweled-amd64.diff @@ -0,0 +1,21 @@ +diff -urN gweled-0.6.orig/src/sge_core.c gweled-0.6/src/sge_core.c +--- gweled-0.6.orig/src/sge_core.c 2004-01-22 23:10:40.000000000 +0100 ++++ gweled-0.6/src/sge_core.c 2005-05-03 20:52:06.570008440 +0200 +@@ -83,7 +83,7 @@ + ((T_SGEObject *) object)-> + height); + +- (int) ((T_SGEObject *) object)->needs_drawing = 0; ++ ((T_SGEObject *) object)->needs_drawing = 0; + + invalidate_objects_above ((T_SGEObject *) object); + } +@@ -99,7 +99,7 @@ + ((T_SGEObject *) object)->vx; + ((T_SGEObject *) object)->y += + ((T_SGEObject *) object)->vy; +- (int) ((T_SGEObject *) object)->needs_drawing |= 0x02; ++ ((T_SGEObject *) object)->needs_drawing |= 0x02; + } + + if (((T_SGEObject *) object)->stop_condition) --- gweled-0.6.orig/debian/patches/gweled-timer.diff +++ gweled-0.6/debian/patches/gweled-timer.diff @@ -0,0 +1,45 @@ +diff -U3 -r gweled-0.5/src/board_engine.c gweled-0.5-patched/src/board_engine.c +--- gweled-0.5/src/board_engine.c 2004-01-25 03:23:54.000000000 -0500 ++++ gweled-0.5-patched/src/board_engine.c 2004-12-22 13:55:39.000000000 -0500 +@@ -35,6 +35,7 @@ + gint gi_previous_bonus_at; + gint gi_next_bonus_at; + gint gi_trigger_bonus; ++guint g_steps_for_timer; + + gint gi_gem_clicked = 0; + gint gi_x_click = 0; +@@ -104,6 +105,7 @@ + gi_previous_bonus_at = 0; + gi_next_bonus_at = FIRST_BONUS_AT; + gi_trigger_bonus = 0; ++ g_steps_for_timer = FIRST_BONUS_AT / TOTAL_STEPS_FOR_TIMER; + + if(gweled_in_timer_mode) + gi_total_gems_removed = FIRST_BONUS_AT / 2; +@@ -493,7 +495,6 @@ + static gint x1, y1, x2, y2, time_slice = 0; + static T_SGEObject *cursor[2] = { NULL, NULL }; + gchar msg_buffer[200]; +- static guint steps_for_timer = FIRST_BONUS_AT / TOTAL_STEPS_FOR_TIMER; + + time_slice++; + +@@ -508,7 +509,7 @@ + /* Let's first check if we are in timer mode, and penalize the player if necessary */ + if (gweled_in_timer_mode && gi_game_running && (time_slice % 10 == 0)) + { +- gi_total_gems_removed -= steps_for_timer; ++ gi_total_gems_removed -= g_steps_for_timer; + if (gi_total_gems_removed <= gi_previous_bonus_at) { + gweled_draw_message ("time's up #"); + gi_game_running = 0; +@@ -678,7 +679,7 @@ + gi_previous_bonus_at = gi_next_bonus_at; + gi_next_bonus_at *= 2; + if (gweled_in_timer_mode) +- steps_for_timer = (gi_next_bonus_at - gi_previous_bonus_at) / TOTAL_STEPS_FOR_TIMER + 1; ++ g_steps_for_timer = (gi_next_bonus_at - gi_previous_bonus_at) / TOTAL_STEPS_FOR_TIMER + 1; + gi_bonus_multiply++; + sprintf (msg_buffer, "bonus x%d", gi_bonus_multiply >> 1); + gweled_draw_game_message (msg_buffer, 1.0); --- gweled-0.6.orig/debian/patches/gweled-ppc.diff +++ gweled-0.6/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.6.orig/debian/control +++ gweled-0.6/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 +Uploaders: Debian GNOME Maintainers , Akira TAGOH , Andreas Rottmann , Andrew Lau , Carlos Perelló Marín , Clément Stenac , Ed Boraas , Edd Dumbill , Emil Soleyman-Zomalan , Guilherme de S. Pastore , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Joe Drew , Johannes Rohr , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Rob Bradford , Robert McQueen , Ross Burton , Sebastien Bacher , Sjoerd Simons , Takuo KITAME +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.6.orig/debian/dirs +++ gweled-0.6/debian/dirs @@ -0,0 +1,3 @@ +usr/games +usr/share/gweled +usr/share/pixmaps/gweled --- gweled-0.6.orig/debian/compat +++ gweled-0.6/debian/compat @@ -0,0 +1 @@ +4 --- gweled-0.6.orig/debian/menu +++ gweled-0.6/debian/menu @@ -0,0 +1,2 @@ +?package(gweled):needs=X11 section=Games/Board \ + title="Gweled" command="/usr/games/gweled" --- gweled-0.6.orig/debian/control.in +++ gweled-0.6/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 +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.6.orig/debian/changelog +++ gweled-0.6/debian/changelog @@ -0,0 +1,50 @@ +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.6.orig/debian/docs +++ gweled-0.6/debian/docs @@ -0,0 +1 @@ +NEWS --- gweled-0.6.orig/debian/copyright +++ gweled-0.6/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.6.orig/debian/gweled.postinst +++ gweled-0.6/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.6.orig/debian/gweled.postrm +++ gweled-0.6/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.6.orig/debian/rules +++ gweled-0.6/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/*