Package: gweled Version: 0.9.1-3 Severity: normal Tags: patch pending Hi Ondřej,
In the course of going over my libmikmod transition bugs, I spent a little time fixing up the gweled packaging. I know you're on the LowNMU list, but I thought I'd check with you before uploading because I didn't limit myself to bug-fixing... I noticed upstream has patches which drop libmikmod altogether in favour of libcanberra, but I didn't apply them: they appear to remove the background music altogether, and using an event notification library for a game's sound effects seems rather odd to me. (What's more, on my main system notification sounds are disabled, so the game didn't play any sounds, and I couldn't figure out how to re-enable them!) I hope you won't mind looking over the attached patch and letting me know if I should proceed with the NMU (after properly updating the target in debian/changelog!). Regards, Stephen
diff -Nru gweled-0.9.1/debian/changelog gweled-0.9.1/debian/changelog --- gweled-0.9.1/debian/changelog 2013-10-02 13:23:18.000000000 +0200 +++ gweled-0.9.1/debian/changelog 2016-05-15 20:53:37.000000000 +0200 @@ -1,3 +1,22 @@ +gweled (0.9.1-3.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Build-depend on libmikmod-dev and use pkg-config to find libmikmod + (Closes: #745072). + * Add upstream fix for timed and endless modes (Closes: #738455). + * Add the manpage written by Braulio Valdivielso Martínez (Closes: + #608439). + * Clean up modified files to allow building twice in a row. + * Switch to dpkg-buildflags hardening instead of hardening-wrapper. + * Fix a couple of spelling mistakes flagged by Lintian. + * Correct the synopsis so it doesn't start with an article. + * Clean up debian/control with cme: + - drop the obsolete version dependency on libgtk2.0-dev; + - Standards-Version 3.9.8; + - use canonical URLs for the VCS entries. + + -- Stephen Kitt <sk...@debian.org> Sat, 14 May 2016 23:22:18 +0200 + gweled (0.9.1-3) unstable; urgency=low * Update watch file diff -Nru gweled-0.9.1/debian/clean gweled-0.9.1/debian/clean --- gweled-0.9.1/debian/clean 1970-01-01 01:00:00.000000000 +0100 +++ gweled-0.9.1/debian/clean 2016-05-14 23:26:28.000000000 +0200 @@ -0,0 +1,4 @@ +config.log +data/gweled.desktop +Makefile.in +po/POTFILES diff -Nru gweled-0.9.1/debian/control gweled-0.9.1/debian/control --- gweled-0.9.1/debian/control 2013-10-02 13:23:18.000000000 +0200 +++ gweled-0.9.1/debian/control 2016-05-14 23:50:19.000000000 +0200 @@ -1,25 +1,24 @@ Source: gweled +Maintainer: Ondřej Surý <ond...@debian.org> Section: games Priority: optional -Maintainer: Ondřej Surý <ond...@debian.org> Build-Depends: debhelper (>= 9), - quilt, - libesd0-dev, - libgtk2.0-dev (>= 2.14), - librsvg2-dev, - libmikmod2-dev, - intltool, - hardening-wrapper, - dh-autoreconf -Standards-Version: 3.9.1 + quilt, + libgtk2.0-dev, + librsvg2-dev, + libmikmod-dev, + intltool, + dh-autoreconf +Standards-Version: 3.9.8 +Vcs-Browser: https://anonscm.debian.org/cgit/users/ondrej/gweled.git +Vcs-Git: https://anonscm.debian.org/git/users/ondrej/gweled.git Homepage: http://gweled.org/ -Vcs-Browser: http://git.debian.org/?p=users/ondrej/gweled.git -Vcs-Git: git://git.debian.org/users/ondrej/gweled.git Package: gweled Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A "Diamond Mine" puzzle game +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: "Diamond Mine"-style 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 diff -Nru gweled-0.9.1/debian/gweled.6 gweled-0.9.1/debian/gweled.6 --- gweled-0.9.1/debian/gweled.6 1970-01-01 01:00:00.000000000 +0100 +++ gweled-0.9.1/debian/gweled.6 2016-05-16 21:17:25.000000000 +0200 @@ -0,0 +1,102 @@ +.TH gweled 6 "12/30/2010" "0.7" "gweled Man Page" +.SH NAME +.B gweled +- a swapping gem game + +.SH SYNOPSIS +.B gweled [OPTIONS] + +.SH OPTIONS +A summary of the options supported by gweled is included below. +.TP +.B \-\-load\-modules=MODULE1,MODULE2,... +Dynamic modules to load +.SS Help Options +.TP +.B \-?, \-\-help +Show a help message +.SS GTK+ +.TP +.B \-\-gdk\-debug=FLAGS +Gdk debugging flags to set +.TP +.B \-\-gdk\-no\-debug=FLAGS +Gdk debugging flags to unset +.TP +.B \-\-display=DISPLAY +X display to use +.TP +.B \-\-screen=SCREEN +X screen to use +.TP +.B \-\-sync +Make X calls synchronous +.TP +.B \-\-name=NAME +Program name as used by the window manager +.TP +.B \-\-class=CLASS +Program class as used by the window manager +.TP +.B \-\-gtk\-debug=FLAGS +Gtk+ debugging flags to set +.TP +.B \-\-gtk\-no\-debug=FLAGS +Gtk+ debugging flags to unset +.TP +.B \-\-g\-fatal\-warnings +Make all warnings fatal +.TP +.B \-\-gtk\-module=MODULE +Load an additional Gtk module +.SS Bonobo activation Support +.TP +.B \-\-oaf\-ior\-fd=FD +File descriptor to print IOR on +.TP +.B \-oaf\-activate\-iid=IID +IID to activate +.TP +.B \-\-oaf\-private +Prevent registering of server with OAF +Gnome Library +.TP +.B \-\-disable\-sound +Disable sound server usage +.TP +.B \-\-enable\-sound +Enable sound server usage +.TP +.B \-\-espeaker=HOSTNAME:PORT +Host:port on which the sound server to use is running +.SS Session management +.TP +.B \-\-sm\-client\-id=ID +.TP +Specify session management ID +.TP +.B \-\-sm\-config\-prefix=PREFIX +Specify prefix of saved configuration +.TP +.B \-\-sm\-disable +Disable connection to session manager +.SS GNOME GUI Library +.TP +.B \-\-disable\-crash\-dialog +Disable crash dialogs + +.SH DESCRIPTION +.B 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. + +.SH AUTHORS +The game is developed by Seb Delestaing <sebdelesta...@free.fr> and +Daniele Napolitano <dna...@gmail.com>. +.br +This little Man Page has been made by Braulio Valdivielso +<brlvldvlsmr...@gmail.com>. +.SH SEE ALSO +The project's website: http://www.gweled.org diff -Nru gweled-0.9.1/debian/manpages gweled-0.9.1/debian/manpages --- gweled-0.9.1/debian/manpages 1970-01-01 01:00:00.000000000 +0100 +++ gweled-0.9.1/debian/manpages 2016-05-14 23:25:53.000000000 +0200 @@ -0,0 +1 @@ +debian/gweled.6 diff -Nru gweled-0.9.1/debian/patches/004-use-pkg-config-for-mikmod.patch gweled-0.9.1/debian/patches/004-use-pkg-config-for-mikmod.patch --- gweled-0.9.1/debian/patches/004-use-pkg-config-for-mikmod.patch 1970-01-01 01:00:00.000000000 +0100 +++ gweled-0.9.1/debian/patches/004-use-pkg-config-for-mikmod.patch 2016-05-14 23:14:36.000000000 +0200 @@ -0,0 +1,53 @@ +Description: Use pkg-config to configure libmikmod +Author: Stephen Kitt <sk...@debian.org> + +--- a/configure.in ++++ b/configure.in +@@ -36,12 +36,10 @@ + AC_SUBST(RSVG_LIBS) + + #### Check for mikmod.h header #### +-AC_CHECK_HEADER(mikmod.h,, AC_MSG_ERROR([libmikmod is required to compile gweled])) ++PKG_CHECK_MODULES([libmikmod], [libmikmod],, AC_MSG_ERROR([libmikmod is required to compile gweled])) + +-MIKMOD_CFLAGS=`libmikmod-config --cflags` +-MIKMOD_LIBS=`libmikmod-config --libs` +-AC_SUBST(MIKMOD_CFLAGS) +-AC_SUBST(MIKMOD_LIBS) ++AC_SUBST(libmikmod_CFLAGS) ++AC_SUBST(libmikmod_LIBS) + + AC_CHECK_HEADER(pthread.h, [], + AC_MSG_ERROR([*** Cannot find pthread.h header])) +--- a/Makefile.in ++++ b/Makefile.in +@@ -176,8 +176,8 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAINT = @MAINT@ + MAKEINFO = @MAKEINFO@ +-MIKMOD_CFLAGS = @MIKMOD_CFLAGS@ +-MIKMOD_LIBS = @MIKMOD_LIBS@ ++MIKMOD_CFLAGS = @libmikmod_CFLAGS@ ++MIKMOD_LIBS = @libmikmod_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MSGFMT = @MSGFMT@ +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -9,7 +9,7 @@ + AM_CFLAGS = \ + @GTK_CFLAGS@ \ + @RSVG_CFLAGS@ \ +- @MIKMOD_CFLAGS@ \ ++ @libmikmod_CFLAGS@ \ + @PTHREAD_CFLAGS@ + + bin_PROGRAMS = gweled +@@ -29,6 +29,6 @@ + games-setgid-io.c games-setgid-io.h \ + games-scores-dialog-private.h + +-gweled_LDADD = @GTK_LIBS@ @RSVG_LIBS@ @MIKMOD_LIBS@ @PTHREAD_LIBS@ ++gweled_LDADD = @GTK_LIBS@ @RSVG_LIBS@ @libmikmod_LIBS@ @PTHREAD_LIBS@ + + diff -Nru gweled-0.9.1/debian/patches/005-continue-endless-timed-modes.patch gweled-0.9.1/debian/patches/005-continue-endless-timed-modes.patch --- gweled-0.9.1/debian/patches/005-continue-endless-timed-modes.patch 1970-01-01 01:00:00.000000000 +0100 +++ gweled-0.9.1/debian/patches/005-continue-endless-timed-modes.patch 2016-05-16 21:12:16.000000000 +0200 @@ -0,0 +1,83 @@ +Description: Endless and times modes continue even if no possible moves +Author: Daniele Napolitano <dna...@gmail.com> +Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/86 +Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/87 +Origin: http://bazaar.launchpad.net/~dnax88/gweled/trunk/revision/88 + +--- a/po/gweled.pot ++++ b/po/gweled.pot +@@ -8,7 +8,7 @@ + msgstr "" + "Project-Id-Version: PACKAGE VERSION\n" + "Report-Msgid-Bugs-To: \n" +-"POT-Creation-Date: 2011-03-31 00:33+0200\n" ++"POT-Creation-Date: 2011-10-31 11:05+0100\n" + "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" + "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" + "Language-Team: LANGUAGE <l...@li.org>\n" +@@ -60,15 +60,15 @@ + msgstr "" + + #: ../src/main.c:397 +-msgid "Get as many point as you can. The game ends if you out of moves." ++msgid "Get as many points as you can. The game ends if you run out of moves." + msgstr "" + + #: ../src/main.c:399 +-msgid "Get as many points as you can, but you are limited on time." ++msgid "Get as many points as you can. The game ends if you run out of time." + msgstr "" + + #: ../src/main.c:401 +-msgid "Game will never end. Your scores will not be registered." ++msgid "The game never ends, but your score will not be saved." + msgstr "" + + #: ../src/main.c:461 +@@ -103,8 +103,8 @@ + msgid "_Pause" + msgstr "" + +-#: ../src/board_engine.c:829 ../src/board_engine.c:902 +-#: ../src/board_engine.c:1004 ++#: ../src/board_engine.c:830 ../src/board_engine.c:903 ++#: ../src/board_engine.c:1005 + #, c-format + msgid "Level %d" + msgstr "" +--- a/src/board_engine.c ++++ b/src/board_engine.c +@@ -764,7 +764,7 @@ + gweled_gems_fall_into_place (FALSE); + } else { + if (gweled_check_for_moves_left (NULL, NULL) == FALSE) { +- if ((gi_next_bonus_at == FIRST_BONUS_AT) && (prefs.game_mode != ENDLESS_MODE)) { ++ if ((gi_level == 1) || (prefs.game_mode == ENDLESS_MODE) || (prefs.game_mode == TIMED_MODE)) { + gint i, j; + // TRANSLATORS: # is replaced with !! + gweled_draw_game_message ("no moves left #", 1); +@@ -792,6 +792,7 @@ + gweled_gems_fall_into_place (FALSE); + gi_state = _MARK_ALIGNED_GEMS; + } else { ++ // Game over + gweled_draw_message ("no moves left #"); + gi_game_running = 0; + score.plain = gi_score; +--- a/src/main.c ++++ b/src/main.c +@@ -394,11 +394,11 @@ + g_alignment_welcome = GTK_WIDGET (gtk_builder_get_object (gweled_xml, "alignmentWelcome")); + + set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescNormal")), +- _("Get as many point as you can. The game ends if you out of moves.")); ++ _("Get as many points as you can. The game ends if you run out of moves.")); + set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescTimed")), +- _("Get as many points as you can, but you are limited on time.")); ++ _("Get as many points as you can. The game ends if you run out of time.")); + set_welcome_button_label (GTK_WIDGET (gtk_builder_get_object (gweled_xml, "labelDescEndless")), +- _("Game will never end. Your scores will not be registered.")); ++ _("The game never ends, but your score will not be saved.")); + + load_preferences(); + init_pref_window(); diff -Nru gweled-0.9.1/debian/patches/006-spelling-fixes.patch gweled-0.9.1/debian/patches/006-spelling-fixes.patch --- gweled-0.9.1/debian/patches/006-spelling-fixes.patch 1970-01-01 01:00:00.000000000 +0100 +++ gweled-0.9.1/debian/patches/006-spelling-fixes.patch 2016-05-16 21:19:49.000000000 +0200 @@ -0,0 +1,25 @@ +Description: Spelling fixes +Author: Stephen Kitt <sk...@debian.org> + +--- a/src/sound.c ++++ b/src/sound.c +@@ -62,7 +62,7 @@ + sound_available = TRUE; + MikMod_EnableOutput(); + pthread_create(&thread, NULL, (void *)&sound_thread, NULL); +- g_print("Audio driver choosen: %s\n", md_driver->Name); ++ g_print("Audio driver chosen: %s\n", md_driver->Name); + } + + is_playing = FALSE; +--- a/src/games-score.c ++++ b/src/games-score.c +@@ -92,7 +92,7 @@ + return 0; + default: + g_warning +- ("Uknown score style in games_score_compare - treating as equal."); ++ ("Unknown score style in games_score_compare - treating as equal."); + return 0; + } + } diff -Nru gweled-0.9.1/debian/patches/series gweled-0.9.1/debian/patches/series --- gweled-0.9.1/debian/patches/series 2013-10-02 13:23:18.000000000 +0200 +++ gweled-0.9.1/debian/patches/series 2016-05-16 21:12:25.000000000 +0200 @@ -1,2 +1,5 @@ 001-potfiles.patch 003-intools-update_ignore_quilt_directory.patch +004-use-pkg-config-for-mikmod.patch +005-continue-endless-timed-modes.patch +006-spelling-fixes.patch diff -Nru gweled-0.9.1/debian/rules gweled-0.9.1/debian/rules --- gweled-0.9.1/debian/rules 2013-10-02 13:23:18.000000000 +0200 +++ gweled-0.9.1/debian/rules 2016-05-14 23:31:17.000000000 +0200 @@ -5,7 +5,7 @@ export DH_OPTIONS -export DEB_BUILD_HARDENING=1 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: dh $@ --with autoreconf
signature.asc
Description: PGP signature
