Control: tags -1 patch I am attaching a debdiff with patches and fixes for several bugs of lletters. There are more Lintian warnings to fix but I leave this to someone else who wants to build upon those patches in the future.
Changelog: * QA upload. * Set maintainer address to Debian QA Group <[email protected]>. * Add ${misc:Depends} substvar. * Fix FTBFS because of missing separators in intl/Makefile.in. (Closes: #749360) * Build with autotools-dev and fix FTBFS on newer architectures due to outdated config.sub and config.guess files. (Closes: #727450, #538667) * Fix program stops responding while playing sound by replacing type long with uint32_t. Thanks [email protected] for the patch. (Closes: #701852) * Fix application terminates when clicking A, B or H. Thanks to Prathibha B for the report and patch. (Closes: #712845) * Use compat level 9 and require debhelper >= 9. * Use source format 1.0 explicitly by adding a source directory and format file to the debian directory. * Remove superfluous postrm.debhelper and postinst.debhelper file. * Create a valid desktop file and add a comment in German. Regards, Markus
diff -u lletters-0.1.95+gtk2/lln.c lletters-0.1.95+gtk2/lln.c
--- lletters-0.1.95+gtk2/lln.c
+++ lletters-0.1.95+gtk2/lln.c
@@ -141,10 +141,11 @@
lang = strtok(getenv ("LANG"), "_");
// lang = strtok(lang, "_");
- if (!lang)
+ if (!lang || strcmp(lang, "en") == 0 )
{
- /* LANG is not set */
- printf(_("LANG environment is not set, using defaults.\n"));
+ if (!lang)
+ /* LANG is not set */
+ printf(_("LANG environment is not set, using
defaults.\n"));
/* if $LANG-specific dir doesn't exist... */
asprintf (&lln_image_dir, "%s/lletters/images/", DATADIR);
/* Set soundfile directory. Kirk Ismay */
diff -u lletters-0.1.95+gtk2/wav_play.c lletters-0.1.95+gtk2/wav_play.c
--- lletters-0.1.95+gtk2/wav_play.c
+++ lletters-0.1.95+gtk2/wav_play.c
@@ -112,11 +112,14 @@
if (i = init_dsp(file_info) != 0){
fprintf(stderr,"Cannot initialize DSP\n");
+ #undef SOUND
+/*
#ifdef SOUND
exit(0);
#endif
+*/
}
-
+ else {
report();
#ifdef GSM
@@ -136,0 +140 @@
+}
diff -u lletters-0.1.95+gtk2/debian/lletters.desktop
lletters-0.1.95+gtk2/debian/lletters.desktop
--- lletters-0.1.95+gtk2/debian/lletters.desktop
+++ lletters-0.1.95+gtk2/debian/lletters.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
Version=1.0
-Encoding=UTF-8
Type=Application
Name=Linux Letters and Numbers
Name[es]=Linux Letras y Números
@@ -12,8 +11,6 @@
-Icon=lletters.xpm
-
-FilePattern=lletters
+Comment[de]=Buchstaben-Lernspiel für kleine Kinder
+Icon=lletters
Exec=lletters
Terminal=false
StartupNotify=false
-
-Categories=Application;Game;Education;KidsGame;2DGraphics;
+Categories=Game;Education;KidsGame;2DGraphics;
reverted:
--- lletters-0.1.95+gtk2/debian/postinst.debhelper
+++ lletters-0.1.95+gtk2.orig/debian/postinst.debhelper
@@ -1,3 +0,0 @@
-# Automatically added by dh_installmenu
-if [ "$1" = "configure" ] && [ -x /usr/bin/update-menus ]; then update-menus ;
fi
-# End automatically added section
diff -u lletters-0.1.95+gtk2/debian/changelog
lletters-0.1.95+gtk2/debian/changelog
--- lletters-0.1.95+gtk2/debian/changelog
+++ lletters-0.1.95+gtk2/debian/changelog
@@ -1,3 +1,24 @@
+lletters (0.1.95+gtk2-4) unstable; urgency=medium
+
+ * QA upload.
+ * Set maintainer address to Debian QA Group <[email protected]>.
+ * Add ${misc:Depends} substvar.
+ * Fix FTBFS because of missing separators in intl/Makefile.in.
+ (Closes: #749360)
+ * Build with autotools-dev and fix FTBFS on newer architectures due to
+ outdated config.sub and config.guess files. (Closes: #727450, #538667)
+ * Fix program stops responding while playing sound by replacing type long
+ with uint32_t. Thanks [email protected] for the patch. (Closes: #701852)
+ * Fix application terminates when clicking A, B or H. Thanks to Prathibha B
+ for the report and patch. (Closes: #712845)
+ * Use compat level 9 and require debhelper >= 9.
+ * Use source format 1.0 explicitly by adding a source directory and format
+ file to the debian directory.
+ * Remove superfluous postrm.debhelper and postinst.debhelper file.
+ * Create a valid desktop file and add a comment in German.
+
+ -- Markus Koschany <[email protected]> Tue, 23 Sep 2014 14:26:55 +0200
+
lletters (0.1.95+gtk2-3.2) unstable; urgency=medium
* Non-maintainer upload.
diff -u lletters-0.1.95+gtk2/debian/compat lletters-0.1.95+gtk2/debian/compat
--- lletters-0.1.95+gtk2/debian/compat
+++ lletters-0.1.95+gtk2/debian/compat
@@ -1 +1 @@
-4
+9
diff -u lletters-0.1.95+gtk2/debian/control lletters-0.1.95+gtk2/debian/control
--- lletters-0.1.95+gtk2/debian/control
+++ lletters-0.1.95+gtk2/debian/control
@@ -1,13 +1,13 @@
Source: lletters
Section: games
Priority: extra
-Maintainer: Rudy Godoy <[email protected]>
-Build-Depends: libgtk2.0-dev (>= 2.6), gettext, debhelper (>= 4.6)
+Maintainer: Debian QA Group <[email protected]>
+Build-Depends: libgtk2.0-dev (>= 2.6), gettext, debhelper (>= 9), autotools-dev
Standards-Version: 3.7.2
Package: lletters
Architecture: any
-Depends: ${shlibs:Depends}, lletters-media, oss-compat
+Depends: ${misc:Depends}, ${shlibs:Depends}, lletters-media, oss-compat
Description: GTK letters-learning game for small children
This is based on author's daughter's (formerly) favorite game, Larry's
Learning Letters and Numbers. This is a Linux replacement, written from
diff -u lletters-0.1.95+gtk2/debian/rules lletters-0.1.95+gtk2/debian/rules
--- lletters-0.1.95+gtk2/debian/rules
+++ lletters-0.1.95+gtk2/debian/rules
@@ -22,6 +22,7 @@
# aclocal-1.9
# automake-1.9 --add-missing --foreign --include-deps --copy
# autoconf
+ dh_autotools-dev_updateconfig
./configure $(confflags) --prefix=/usr --bindir=\$${prefix}/games
--datadir=\$${prefix}/share/games
build: build-stamp
@@ -38,10 +39,9 @@
rm -f build-stamp install-stamp
# removal of libtool files to just symlink them
# rm -f config.guess config.sub ltmain.sh
-
# Add here commands to clean up after the build process.
-$(MAKE) distclean
-
+ dh_autotools-dev_restoreconfig
dh_clean
install: install-stamp
reverted:
--- lletters-0.1.95+gtk2/debian/postrm.debhelper
+++ lletters-0.1.95+gtk2.orig/debian/postrm.debhelper
@@ -1,3 +0,0 @@
-# Automatically added by dh_installmenu
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
-# End automatically added section
only in patch2:
unchanged:
--- lletters-0.1.95+gtk2.orig/debian/source/format
+++ lletters-0.1.95+gtk2/debian/source/format
@@ -0,0 +1 @@
+1.0
only in patch2:
unchanged:
--- lletters-0.1.95+gtk2.orig/intl/Makefile.in
+++ lletters-0.1.95+gtk2/intl/Makefile.in
@@ -202,11 +202,11 @@
# The dependency for intlh.inst is different in gettext and all other
# packages. Because we cannot you GNU make features we have to solve
# the problem while rewriting Makefile.in.
-@[email protected]: intlh.inst.in ../config.status
-@GT_YES@ cd .. \
-@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
-@GT_YES@ $(SHELL) ./config.status
-@[email protected]: intlh.inst
+ @[email protected]: intlh.inst.in ../config.status
+ @GT_YES@cd .. \
+ @GT_YES@&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \
+ @GT_YES@ $(SHELL) ./config.status
+ @[email protected]: intlh.inst
@[email protected]:
# Tell versions [3.59,3.63) of GNU make not to export all variables.
only in patch2:
unchanged:
--- lletters-0.1.95+gtk2.orig/libqdwav/wav_read.c
+++ lletters-0.1.95+gtk2/libqdwav/wav_read.c
@@ -5,6 +5,8 @@
#include <sys/stat.h>
#include "wav_lib.h"
+#include <string.h>
+#include <stdint.h>
/* wav header is 44 bytes long */
@@ -26,16 +28,16 @@
/* sample rate */
long get_wav_srate(wav_sig *info){
- return(*(long *)&info->head[24]);
+ return(*(uint32_t *)&info->head[24]);
}
/* # of bytes/sec processed (for buffer estimation) */
long get_wav_bps(wav_sig *info){
- return(*(long *)&info->head[28]);
+ return(*(uint32_t *)&info->head[28]);
}
/* minimum # of bytes per block for correct processing */
short get_wav_blkalign(wav_sig *info){
- return (*(long *)&info->head[32]);
+ return (*(short *)&info->head[32]);
}
/* sample depth (8bit or 16bit) */
@@ -45,18 +47,18 @@
/* data section only == totalfile - 44 */
long get_wav_len(wav_sig *info){
- return (*(long *)&info->head[40]);
+ return (*(uint32_t *)&info->head[40]);
}
int init_wav_read(char file_name[], wav_sig *info){
info->handle = open_wav(info->head, file_name);
if(strlen(file_name) > 30) {
- strncpy(info->name,file_name,26);
+ strncpy(info->name,file_name,27);
info->name[27]='\0';
strcat(info->name,"...");
}else{
- strncpy(info->name,file_name,29);
+ strncpy(info->name,file_name,30);
info->name[30]='\0';
}
info->chans = get_wav_channels(info);
signature.asc
Description: OpenPGP digital signature
