Your message dated Wed, 15 Aug 2007 18:17:05 +0000 with message-id <[EMAIL PROTECTED]> and subject line Bug#437338: fixed in hex-a-hop 0.0.20070315-3 has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what I am talking about this indicates a serious mail system misconfiguration somewhere. Please contact me immediately.) Debian bug tracking system administrator (administrator, Debian Bugs database)
--- Begin Message ---Package: hex-a-hop Version: 0.0.20070315-2 Tags: l10n patch Hi, I noticed that the first help screen is not translatable by default as xgettext has trouble extracting _("Welcome to " GAMENAME "!"). It doesn't extract anything behind the macro. That's why I suggest to apply xgettext on preprocessed files and attached a patch for it (apply it after applying all patches from debian/patches/, I hope it is OK so). (I had really a lot of trouble, often the package could not build because of my changes as the previous patches could not be reverted. I also created first a backup copy of the source directory with suffix .orig (to patch later against it) which was always deleted by dpkg-buildpackage!!!) Since the preprocessed file hex_puzzzle.cpp (shouldn't is be renamed to hex_puzzle.cpp?) includes not only the affected menus.h but also level_list.h I merged both POT files (messages and levels) into one. That's why I assume you merge your translations levels.es.po and messages.es.po into es.po. I think this is better than maintaining two files. Please note that I now also update all translations during package build (in the clean target which is called at the beginning of a new build). Translations will never be outdated again! The file debian/i18n/files.list should now be deleted, it is no longer used. PS: It is not obvious that the game (at least the help) insert explicit linebreaks once it finds " " in a message and starts a new paragraph on " ". If the POT file is distributed as well (and not only generated) I suggest to document this at the beginning of this file so that these comments are merged automatically into all <lang>.po files. I also suggest to document other messages for translators in C++ files (just prepend a /* TRANSLATORS: A hint for translators*/ before difficult gettext messages as this is copied into PO files as well). JensNur in hex-a-hop-0.0.20070315.unchanged/debian/i18n: files.list. diff -ur hex-a-hop-0.0.20070315.unchanged/debian/i18n/Makefile hex-a-hop-0.0.20070315/debian/i18n/Makefile --- hex-a-hop-0.0.20070315.unchanged/debian/i18n/Makefile 2007-08-11 23:55:41.000000000 +0200 +++ hex-a-hop-0.0.20070315/debian/i18n/Makefile 2007-08-12 00:00:47.000000000 +0200 @@ -17,51 +17,44 @@ LOCALEDIR=./ -all: messages.pot levels.pot build-stamp +all: messages.pot build-stamp -levels.pot: - @echo Creatting Templata \"[EMAIL PROTECTED]" - cd ../..; xgettext -k_ -o "debian/i18n/$@" level_list.h --from-code=iso-8859-1 - -messages.pot: - @echo Creatting Templata \"[EMAIL PROTECTED]" - cd ../..; xgettext -k_ -o "debian/i18n/$@" -f debian/i18n/files.list --from-code=iso-8859-1 - -%.tmp.po: levels.%.po messages.%.po - msgcat -o $@ $+ - -%.tmp.po: %.po - cp $< $@ +# xgettext fails on _("Welcome to " GAMENAME "!") (doesn't extract anything +# behind the macro, so we preprocess hex_puzzzle.cpp (which includes menus.h) +# first +hex_puzzzle_preprocessed.cpp: ../../hex_puzzzle.cpp ../../menus.h + $(CXX) $(CXXFLAGS) -E ../../hex_puzzzle.cpp -o $@ + +messages.pot: hex_puzzzle_preprocessed.cpp + @echo Creating Template \"[EMAIL PROTECTED]" + cd ../..; xgettext --add-comments="TRANSLATORS:" -k_ -o "debian/i18n/$@" gfx.cpp debian/i18n/hex_puzzzle_preprocessed.cpp level_list.h --from-code=iso-8859-1 build: build-stamp build-stamp: - @for i in `cat languages.list` ; do \ - echo Setting Up Language \"$$i\" ; \ - $(MAKE) $$i.tmp.po ; \ + @for i in $$(cat languages.list); do \ + echo Building \"$$i\" translation; \ + msgfmt $$i.po -o $$i.mo ; \ done - @if ls *.tmp.po 2>/dev/null ; then \ - for f in *.tmp.po; do \ - i=`basename $$f .tmp.po` ; \ - echo Building Language \"$$i\" ; \ - msgfmt $$f -o $$i.mo ; \ - done \ - fi touch build-stamp clean: #for f in *.po; do i=`echo $$f | awk 'BEGIN {FS="."} {print $$1}'`; rm -rf "$$i"; done + # Merge all (old) PO files with POT file to ship up-to-date files! + # We cannot touch source PO files during build but here is happens normally!? + $(MAKE) messages.pot + @for i in $$(cat languages.list); do \ + echo Updating \"$$i\" translation; \ + msgmerge --update $$i.po messages.pot ; \ + done rm -f *.mo - rm -f *.tmp.po rm -f *.pot + rm -f hex_puzzzle_preprocessed.cpp rm -f build-stamp install: build-stamp - if ls *.mo 2>/dev/null ; then \ - for f in *.mo; do \ - i=`basename $$f .mo` ; \ - echo Installing Language \"$$i\" ; \ - install -d $(LOCALEDIR)$$i ; \ - install -p -d -m 755 $(LOCALEDIR)$$i/LC_MESSAGES ; \ - install -m 644 $$f $(LOCALEDIR)$$i/LC_MESSAGES/hex-a-hop.mo ; \ - done \ - fi + @for i in $$(cat languages.list); do \ + echo Installing \"$$i\" translation; \ + install -d $(LOCALEDIR)$$i ; \ + install -p -d -m 755 $(LOCALEDIR)$$i/LC_MESSAGES ; \ + install -m 644 $$i.mo $(LOCALEDIR)$$i/LC_MESSAGES/hex-a-hop.mo ; \ + done diff -ur hex-a-hop-0.0.20070315.unchanged/debian/patches/gettext_i18n.patch hex-a-hop-0.0.20070315/debian/patches/gettext_i18n.patch --- hex-a-hop-0.0.20070315.unchanged/debian/patches/gettext_i18n.patch 2007-08-11 23:55:41.000000000 +0200 +++ hex-a-hop-0.0.20070315/debian/patches/gettext_i18n.patch 2007-08-12 00:02:50.000000000 +0200 @@ -52,7 +52,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -+#include "i18n.h" ++#include "i18n.h" ////////////////////////////////////////////////////// // Config @@ -413,8 +413,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -+ -+#include "i18n.h" ++ ++#include "i18n.h" #include "state.h" diff -ur hex-a-hop-0.0.20070315.unchanged/debian/rules hex-a-hop-0.0.20070315/debian/rules --- hex-a-hop-0.0.20070315.unchanged/debian/rules 2007-08-11 23:55:41.000000000 +0200 +++ hex-a-hop-0.0.20070315/debian/rules 2007-08-12 00:03:37.000000000 +0200 @@ -29,7 +29,7 @@ build-stamp: configure-stamp dh_testdir $(MAKE) CXXFLAGS="$(CFLAGS)" NAME="hex-a-hop" DATA_DIR="/usr/share/games/hex-a-hop" - $(MAKE) -C debian/i18n + $(MAKE) CXXFLAGS="$(CFLAGS)" NAME="hex-a-hop" DATA_DIR="/usr/share/games/hex-a-hop" -C debian/i18n touch $@ clean:
--- End Message ---
--- Begin Message ---Source: hex-a-hop Source-Version: 0.0.20070315-3 We believe that the bug you reported is fixed in the latest version of hex-a-hop, which is due to be installed in the Debian FTP archive: hex-a-hop_0.0.20070315-3.diff.gz to pool/main/h/hex-a-hop/hex-a-hop_0.0.20070315-3.diff.gz hex-a-hop_0.0.20070315-3.dsc to pool/main/h/hex-a-hop/hex-a-hop_0.0.20070315-3.dsc hex-a-hop_0.0.20070315-3_i386.deb to pool/main/h/hex-a-hop/hex-a-hop_0.0.20070315-3_i386.deb A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [EMAIL PROTECTED], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Miriam Ruiz <[EMAIL PROTECTED]> (supplier of updated hex-a-hop package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing [EMAIL PROTECTED]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.7 Date: Wed, 8 Aug 2007 16:34:41 +0200 Source: hex-a-hop Binary: hex-a-hop Architecture: source i386 Version: 0.0.20070315-3 Distribution: unstable Urgency: low Maintainer: Debian Games Team <[EMAIL PROTECTED]> Changed-By: Miriam Ruiz <[EMAIL PROTECTED]> Description: hex-a-hop - puzzle game based on hexagonal tiles Closes: 436008 436469 437313 437338 437438 437439 437440 Changes: hex-a-hop (0.0.20070315-3) unstable; urgency=low . [Miriam Ruiz] * Do not unnecessarily initialize cdrom subsystem. Thanks to Piotr Engelking <[EMAIL PROTECTED]>. Closes: #436008 * Added tools to convert files from/to bmp and dat formats. . [Jens Seidel] * Refined debian/i18n/Makefile to workaround an xgettext limitation, to ship a POT file and to update PO files. Closes: #437338 * Added German translation. Thanks to Helge Kreutzmann <[EMAIL PROTECTED]>. Closes: #437438 * Fixed some typos. Thanks to Helge Kreutzmann <[EMAIL PROTECTED]>. Closes: #437440, #437439 * Fixed all compiler warnings and use e.g. -Wall -Wextra default. Closes: #437313 * Use the SDLPango library for font handling. This is a first draft and behaves differently for English and translations. Closes: #436469. * debian/control: + Added myself to the uploader list. Files: fcd51a325446ef1c164bb22af107c391 949 games extra hex-a-hop_0.0.20070315-3.dsc 8eab10623e08bf1af2813ff206221f42 37626 games extra hex-a-hop_0.0.20070315-3.diff.gz 9955266fcd3edd0579b420da6731c773 913244 games extra hex-a-hop_0.0.20070315-3_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFGw0CALARVQsm1XawRAjrUAJ4zDVmhBqrP2flQOGL0ZQglwTy6mACfTTpf q/tyUiP++fTcyb9uGV46zmE= =sjYh -----END PGP SIGNATURE-----
--- End Message ---
