please unblock pal 0.4.3-3
Hi,
please unblock pal 0.4.3-3. Changes since the version 0.4.2-3 in lenny (which
is 0.4.3 minus one simple patch) are doc fixes, an updated watch file, linking
against the wide version of ncurses to fix some issues when displaying UTF-8
and code that prevents a segfault, this code is only run when the segfault
would otherwise occur.
Thanks,
Carsten
$ diff -Nurpw pal-0.4.2 pal | filterdiff -x '*/pal.pot' -x '*/ChangeLog' -x '*/debian/patches/*' -x '*/debian/watch' -x '*/pal-0.4.*.spec' -x '*/.pc/*' -x '*/.git/*' -x 'pal/share/austria.pal' -x '*/pal.1.template' | egrep -v 'Binary files|diff -Nurp'
--- pal-0.4.2/debian/changelog· 2008-09-29 11:40:23.000000000 +0200
+++ pal/debian/changelog· 2008-09-29 11:58:01.000000000 +0200
@@ -1,3 +1,30 @@
+pal (0.4.3-3) unstable; urgency=low
+
+ * Recode austria.pal from ISO-8859 to UTF-8. (Closes: #499389)
+ * Link pal against libncursesw5 instead of libncurses5. (Closes:
+ #499403)
+
+ -- Carsten Hey <c.hey@web.de> Mon, 29 Sep 2008 11:57:52 +0200
+
+pal (0.4.3-2) unstable; urgency=low
+
+ * debian/watch: use QA redirector.
+ * Added a new Debian specific patch which changes the path to example.css in
+ pal.1. Debian installs this file into a different location than
+ upstream's makefile target install-doc. (Closes: #497874)
+
+ -- Carsten Hey <c.hey@web.de> Sat, 06 Sep 2008 07:13:08 +0200
+
+pal (0.4.3-1) unstable; urgency=low
+
+ * New Upstream Version
+ - Fix segfault when printing strings not valid in user's locale
+ (Closes: #492464)
+ * Removed patches that are included in pal's latest upstream release from
+ debian/patches. No remaining patches.
+
+ -- Carsten Hey <c.hey@web.de> Sat, 02 Aug 2008 19:26:36 +0200
+
pal (0.4.2-3) unstable; urgency=low
* Apply patch from upstream CVS:
--- pal-0.4.2/debian/control· 2008-09-29 11:40:23.000000000 +0200
+++ pal/debian/control· 2008-09-28 21:08:29.000000000 +0200
@@ -2,7 +2,7 @@ Source: pal
Section: utils
Priority: optional
Maintainer: Carsten Hey <c.hey@web.de>
-Build-Depends: debhelper (>= 5), libreadline5-dev | libreadline-dev, libncurses5-dev, libglib2.0-dev, gettext, quilt
+Build-Depends: debhelper (>= 5), libreadline5-dev | libreadline-dev, libncursesw5-dev, libglib2.0-dev, gettext, quilt
Standards-Version: 3.8.0
Homepage: http://palcal.sourceforge.net/
--- pal-0.4.2/src/Makefile· 2008-09-29 11:40:36.000000000 +0200
+++ pal/src/Makefile· 2008-09-29 11:58:15.000000000 +0200
@@ -4,7 +4,7 @@ include Makefile.defs
INCLDIR = -I${prefix}/include `pkg-config --cflags glib-2.0`
LIBDIR =
-LIBS = `pkg-config --libs glib-2.0` -lreadline -lncurses
+LIBS = `pkg-config --libs glib-2.0` -lreadline -lncursesw
SRC = main.c colorize.c output.c input.c event.c rl.c html.c latex.c \
add.c edit.c del.c remind.c search.c manage.c
--- pal-0.4.2/src/Makefile.defs·2008-09-29 11:40:36.000000000 +0200
+++ pal/src/Makefile.defs· 2008-09-28 06:04:57.000000000 +0200
@@ -6,7 +6,7 @@
prefix = /usr
CC = gcc
-PAL_VERSION = 0.4.2
+PAL_VERSION = 0.4.3
# used for portage, rpm, ...
DESTDIR =
--- pal-0.4.2/src/output.c· 2008-09-29 11:40:36.000000000 +0200
+++ pal/src/output.c· 2008-09-28 06:04:57.000000000 +0200
@@ -40,6 +40,12 @@ void pal_output_handler( const gchar *in
{
gsize strsize;
char *outstr = g_locale_from_utf8(instr, -1, NULL, &strsize, NULL);
+ /* if the previous fails, try the filename conversion, it gives reasonable results in most cases */
+ if(!outstr)
+ outstr = g_filename_from_utf8(instr, -1, NULL, &strsize, NULL);
+ /* If that doesn't work, just use the input string */
+ if(!outstr)
+ outstr = g_strdup(instr);
if(settings->curses)
waddnstr(pal_curwin, outstr, strsize);
Reply to: