diff -u tuxpaint-0.9.21/debian/changelog tuxpaint-0.9.21/debian/changelog --- tuxpaint-0.9.21/debian/changelog +++ tuxpaint-0.9.21/debian/changelog @@ -1,3 +1,21 @@ +tuxpaint (1:0.9.21-1.1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. Remaining changes: + - tuxpaint suggests (not recommends) tuxpaint-config + - tuxpaint-data recommends (not depends) on + tuxpaint-stamps-default | tuxpaint-stamps + - all the binary now depends from ${misc:Depends} + - d/control: build dependency on libpng3-dev -> libpng12-dev + * Converted in patch previous Ubuntu changes: + - d/p/fix-gettext-domain.patch: gettext domain in + src/tuxpaint.desktop.in + - d/p/fix-inverted-args-tuxpaint.c.patch: Fixed inverted arguments + to memset() in src/tuxpaint.c::render_text_w() + - d/p/fix-build-dep.patch: Added missing png lib to link, fixing FTBFS. + * Closes LP: #1211069 + + -- Mattia Rizzolo Sun, 11 Aug 2013 21:32:35 +0200 + tuxpaint (1:0.9.21-1.1) unstable; urgency=low * Non-maintainer upload. @@ -6,12 +24,47 @@ -- Ana Beatriz Guerrero Lopez Sun, 04 Dec 2011 14:04:49 +0100 +tuxpaint (1:0.9.21-1ubuntu3) raring; urgency=low + + * Added missing png lib to link, fixing FTBFS. + * Fixed inverted arguments to memset() in src/tuxpaint.c::render_text_w(). + + -- Daniel T Chen Wed, 10 Apr 2013 17:02:25 -0400 + +tuxpaint (1:0.9.21-1ubuntu2) lucid-proposed; urgency=low + + * Version bump to include the missing translations (LP: #503919) + + -- Alkis Georgopoulos Tue, 03 Aug 2010 15:18:17 +0300 + +tuxpaint (1:0.9.21-1ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - tuxpaint suggests (not recommends) tuxpaint-config + - tuxpaint-data recommends (not depends) on tuxpaint-stamps-default | tuxpaint-stamps + - build dependency on libpng3-dev -> libpng12-dev + - gettext domain in src/tuxpaint.desktop.in + + -- Scott Balneaves Sat, 07 Nov 2009 21:49:13 -0600 + tuxpaint (1:0.9.21-1) unstable; urgency=low * New upstream release. -- Ben Armstrong Sun, 09 Aug 2009 11:17:59 -0300 +tuxpaint (1:0.9.20-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - tuxpaint suggests (not recommends) tuxpaint-config + - tuxpaint-data recommends (not depends) on tuxpaint-stamps-default | tuxpaint-stamps + - build dependency on libpng3-dev -> libpng12-dev + - gettext domain in src/tuxpaint.desktop.in + - add Categories=Education;Art; to .desktop.in + * Closes (LP: #252115) + + -- Oliver Grawert Fri, 11 Jul 2008 18:35:11 +0100 + tuxpaint (1:0.9.20-2) unstable; urgency=low * Fix upgrade from old tuxpaint-data containing files moved @@ -33,6 +86,26 @@ -- Ben Armstrong Sun, 08 Jun 2008 12:42:15 -0300 +tuxpaint (1:0.9.17-1.1ubuntu2) intrepid; urgency=low + + * fix Makefile mangling (leftover from old ubuntu patch for xdg compliance, + debian does that from debian/rules which we inherit), fixes FTBFS + * *really* build-dep on libpng12-dev + + -- Oliver Grawert Thu, 08 May 2008 15:02:08 +0200 + +tuxpaint (1:0.9.17-1.1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - tuxpaint-data recommends (not depends) on tuxpaint-stamps + - tuxpaint suggests (not recommends) tuxpaint-config + - build dependency on libpng3-dev -> libpng12-dev + - gettext domain in src/tuxpaint.desktop.in + - add Categories=Education; Art; to .desktop. + - set Ubuntu maintainer address. + + -- Oliver Grawert Thu, 01 May 2008 02:49:29 +0100 + tuxpaint (1:0.9.17-1.1) unstable; urgency=low * Non-maintainer upload to fix bashism. @@ -49,6 +122,33 @@ -- Maximiliano Curia Sat, 08 Mar 2008 19:25:39 -0200 +tuxpaint (1:0.9.17-1ubuntu3) hardy; urgency=low + + * Change depends/recommends/suggests to fix LP #82510 + - tuxpaint-data recommends (not depends) on tuxpaint-stamps + - tuxpaint suggests (not recommends) tuxpaint-config + + -- Caroline Ford Tue, 01 Apr 2008 20:30:38 +0100 + +tuxpaint (1:0.9.17-1ubuntu2) hardy; urgency=low + + * debian/rules: Use dh_icons. + + -- Matthias Klose Fri, 25 Jan 2008 11:16:39 +0000 + +tuxpaint (1:0.9.17-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable keeping: + - dh_iconcache in debian/rules + - gettext domain in src/tuxpaint.desktop.in + - build dependency on libpng3-dev -> libpng12-dev + - remove dependency on netpbm + - don't install .desktop to non-standard directories + - add Categories=Education; Art; to .desktop. + - set Ubuntu maintainer address. + + -- Jordan Mantha Tue, 24 Jul 2007 13:41:46 -0700 + tuxpaint (1:0.9.17-1) unstable; urgency=low * New upstream release. @@ -62,6 +162,32 @@ -- Ben Armstrong Thu, 3 May 2007 08:23:49 -0300 +tuxpaint (1:0.9.16-1ubuntu3) gutsy; urgency=low + + * Don't install .desktop to non-standard directories + * Add Categories=Education; Art; to .desktop. + (Closes LP: #32252) + + -- Jordan Mantha Mon, 21 May 2007 20:40:57 -0700 + +tuxpaint (1:0.9.16-1ubuntu2) feisty; urgency=low + + * Rebuild for changes in the amd64 toolchain. + * Set Ubuntu maintainer address. + + -- Matthias Klose Mon, 5 Mar 2007 01:27:12 +0000 + +tuxpaint (1:0.9.16-1ubuntu1) feisty; urgency=low + + * Merge from debian unstable keeping: + - dh_iconcache in debian/rules + - gettext domain in src/tuxpaint.desktop.in + - build dependency on libpng3-dev -> libpng12-dev + - remove dependency on netpbm + - add in pot and po data + + -- Jordan Mantha Wed, 15 Nov 2006 17:00:19 -0800 + tuxpaint (1:0.9.16-1) unstable; urgency=low * New upstream release. @@ -91,6 +217,12 @@ -- Ben Armstrong Thu, 12 Oct 2006 14:18:21 -0300 +tuxpaint (1:0.9.15b-3ubuntu1) edgy; urgency=low + + * Merge from debian unstable. + + -- Oliver Grawert Thu, 29 Jun 2006 12:04:59 +0100 + tuxpaint (1:0.9.15b-3) unstable; urgency=low * Backported fix from CVS for clicking to the right of the colour palette. @@ -106,6 +238,31 @@ -- Ben Armstrong Sun, 22 Jan 2006 20:26:56 -0400 +tuxpaint (1:0.9.15b-1ubuntu4) dapper; urgency=low + + * debian/rules: + - added dh_iconcache. + + -- Daniel Holbach Thu, 18 May 2006 13:17:15 +0200 + +tuxpaint (1:0.9.15b-1ubuntu3) dapper; urgency=low + + * src/tuxpaint.desktop.in: Add gettext domain to get language pack support. + + -- Martin Pitt Thu, 23 Feb 2006 18:53:48 +0100 + +tuxpaint (1:0.9.15b-1ubuntu2) dapper; urgency=low + + * debian/control: libpng3-dev -> libpng12-dev, libpng3-dev is going away. + + -- Martin Pitt Thu, 23 Feb 2006 12:23:50 +0100 + +tuxpaint (1:0.9.15b-1ubuntu1) dapper; urgency=low + + * removed dependency on netpbm + + -- Oliver Grawert Wed, 25 Jan 2006 18:04:30 +0100 + tuxpaint (1:0.9.15b-1) unstable; urgency=high * New upstream release. diff -u tuxpaint-0.9.21/debian/control tuxpaint-0.9.21/debian/control --- tuxpaint-0.9.21/debian/control +++ tuxpaint-0.9.21/debian/control @@ -1,14 +1,15 @@ Source: tuxpaint Section: graphics Priority: optional -Maintainer: Ben Armstrong -Build-Depends: debhelper (>= 5.0.51~), gettext, libfribidi-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev (>= 1.2.4-1.1), libsdl-ttf2.0-dev, libsdl-pango-dev, libpng3-dev, libvorbis-dev (>= 1.0.0-2), librsvg2-dev, libcairo2-dev, libpaper-dev, quilt +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ben Armstrong +Build-Depends: debhelper (>= 5.0.51~), gettext, libfribidi-dev, libsdl1.2-dev, libsdl-image1.2-dev, libsdl-mixer1.2-dev (>= 1.2.4-1.1), libsdl-ttf2.0-dev, libsdl-pango-dev, libpng12-dev, libvorbis-dev (>= 1.0.0-2), librsvg2-dev, libcairo2-dev, libpaper-dev, quilt Standards-Version: 3.8.2 Package: tuxpaint Architecture: any Depends: tuxpaint-plugins-default (>= 1:0.9.21-1) | tuxpaint-plugins, tuxpaint-data (= ${source:Version}), ${shlibs:Depends}, libvorbis0a (>= 1.0.0-2), libvorbisfile3 (>= 1.0.0-2), netpbm -Recommends: tuxpaint-config +Suggests: tuxpaint-config Description: A paint program for young children Tux Paint is meant to be a simple drawing program for young children. It is not meant as a general-purpose drawing tool. @@ -65,8 +66,8 @@ Architecture: all Conflicts: tuxpaint (<< 1:0.9.13-1), tuxpaint-stamps-default (<< 2003.12.23) Replaces: tuxpaint (<< 1:0.9.13-1), tuxpaint-stamps-default (<< 2003.12.23) -Depends: tuxpaint-stamps-default | tuxpaint-stamps, ttf-freefont -Recommends: tuxpaint +Depends: ttf-freefont +Recommends: tuxpaint, tuxpaint-stamps-default | tuxpaint-stamps Suggests: ttf-arabeyes, ttf-arphic-gbsn00lp, ttf-arphic-uming, ttf-baekmuk, ttf-gujarati-fonts, ttf-tamil-fonts, ttf-telugu-fonts, ttf-thai-tlwg, ttf-thryomanes Description: Data files for Tux Paint, a paint program for children Tux Paint is meant to be a simple drawing program for young diff -u tuxpaint-0.9.21/debian/patches/series tuxpaint-0.9.21/debian/patches/series --- tuxpaint-0.9.21/debian/patches/series +++ tuxpaint-0.9.21/debian/patches/series @@ -1 +1,4 @@ +fix-gettext-domain.patch +fix-inverted-args-tuxpaint.c.patch +fix-build-dep.patch fix-ftbfs.patch reverted: --- tuxpaint-0.9.21/src/tuxpaint-import.sh +++ tuxpaint-0.9.21.orig/src/tuxpaint-import.sh @@ -143,7 +143,7 @@ # For each picture list... for x in $(seq 1 $#) do + i="${!x}" - i=$(eval echo \$\{$x\}) if [ -e "$i" ]; then # Determine a filename for it: reverted: --- tuxpaint-0.9.21/src/manpage/tuxpaint.1 +++ tuxpaint-0.9.21.orig/src/manpage/tuxpaint.1 @@ -191,6 +191,7 @@ Show the license (GNU GPL) under which Tux Paint is released. .SH OPTIONS - INTERFACE +.l \fItuxpaint\fP accepts the following options to alter the interface. They can be used along with, instead of, or to override options set in configuration files. (See below.) @@ -352,7 +353,7 @@ mirrored by default. This can be useful when used by people who prefer things right-to-left over left-to-right. +.TB 8 -.TP 8 .B \-\-stampsize=\fIsize\fP \-\-stampsize=default Sets the default size of all stamps, relative to their possible sizes (determined by \fITux Paint\fP, based on the dimensions of both the stamps @@ -424,6 +425,7 @@ "\fI#000 Black\fP" and "\fI255 192 64 Orange\fP".) .SH OPTIONS - LANGUAGE +.l Various parts of \fITux Paint\fP have been translated into numerous languages. \fITux Paint\fP will try its best to honor your \fIlocale\fP setting (i.e., the \fILANG\fP environment variable), if possible. @@ -726,6 +728,7 @@ This option makes \fITux Paint\fP ignore the current lockfile. .SH ENVIRONMENT +.l While \fITux Paint\fP may refer to a number of environment variables indirectly (e.g., via \fISDL(3)\fP), it only directly accesses the following: .PP only in patch2: unchanged: --- tuxpaint-0.9.21.orig/debian/patches/fix-build-dep.patch +++ tuxpaint-0.9.21/debian/patches/fix-build-dep.patch @@ -0,0 +1,11 @@ +--- a/Makefile 2009-04-29 07:18:57.000000000 +0200 ++++ /bMakefile 2013-08-11 22:11:13.000000000 +0200 +@@ -834,7 +834,7 @@ + @echo "...Linking Tux Paint..." + $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(FRIBIDI_CFLAGS) $(DEFS) \ + -o tuxpaint $^ \ +- $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) ++ $(SDL_LIBS) $(SVG_LIB) $(ARCH_LINKS) -lpng12 + @$(RSRC_CMD) + @$(MIMESET_CMD) + only in patch2: unchanged: --- tuxpaint-0.9.21.orig/debian/patches/fix-gettext-domain.patch +++ tuxpaint-0.9.21/debian/patches/fix-gettext-domain.patch @@ -0,0 +1,7 @@ +--- a/src/tuxpaint.desktop.in 2008-07-08 01:18:57.000000000 +0200 ++++ b/src/tuxpaint.desktop.in 2013-08-11 22:11:13.000000000 +0200 +@@ -7,3 +7,4 @@ + Categories=Education;Art; + _GenericName=Drawing program + _Comment=A drawing program for children. ++X-Ubuntu-Gettext-Domain=tuxpaint only in patch2: unchanged: --- tuxpaint-0.9.21.orig/debian/patches/fix-inverted-args-tuxpaint.c.patch +++ tuxpaint-0.9.21/debian/patches/fix-inverted-args-tuxpaint.c.patch @@ -0,0 +1,11 @@ +--- a/src/tuxpaint.c 2009-06-18 22:51:58.000000000 +0200 ++++ b/src/tuxpaint.c 2013-08-11 22:11:13.000000000 +0200 +@@ -1130,7 +1130,7 @@ + + utfstr_max = (sizeof(char) * 4 * (wcslen(str) + 1)); + utfstr = (char *) malloc(utfstr_max); +- memset(utfstr, utfstr_max, 0); ++ memset(utfstr, 0, utfstr_max); + + j = 0; + for (i = 0; i < wcslen(str); i++)