diff -Nru tuxpaint-0.9.22/debian/changelog tuxpaint-0.9.22/debian/changelog --- tuxpaint-0.9.22/debian/changelog 2014-10-26 15:43:06.000000000 +0100 +++ tuxpaint-0.9.22/debian/changelog 2014-12-17 23:28:05.000000000 +0100 @@ -1,3 +1,17 @@ +tuxpaint (1:0.9.22-1ubuntu1) vivid; urgency=low + + * Merge from Debian unstable. Remaining changes: + - debian/control: tuxpaint suggests (not recommends) tuxpaint-config. + - debian/control: tuxpaint-data recommends (not depends) on + tuxpaint-stamps-default | tuxpaint-stamps. + - debian/patches/fix-gettext-domain.patch. + - debian/patches/fix-build-dep.patch. + * Dropped ubuntu changes (applied upstream) + - debian/patches/fix-inverted-args-tuxpaint.c.patch: Fix inverted + arguments to memset() in src/tuxpaint.c::render_text_w(). + + -- Mattia Rizzolo Wed, 17 Dec 2014 23:26:10 +0100 + tuxpaint (1:0.9.22-1) unstable; urgency=low * New upstream release. (Closes: #722933) @@ -7,6 +21,23 @@ -- Ben Armstrong Sun, 26 Oct 2014 09:20:50 -0300 +tuxpaint (1:0.9.21-1.1ubuntu1) saucy; urgency=low + + * Merge from Debian unstable. (LP: #1211069). Remaining changes: + - debian/control: tuxpaint suggests (not recommends) tuxpaint-config. + - debian/control: tuxpaint-data recommends (not depends) on + tuxpaint-stamps-default | tuxpaint-stamps. + - debian/control: build dependency on libpng3-dev -> libpng12-dev. + - Remaining Ubuntu changes converted in quilt patches: + + debian/patches/fix-gettext-domain.patch: gettext domain in + src/tuxpaint.desktop.in. + + debian/patches/fix-inverted-args-tuxpaint.c.patch: Fix inverted + arguments to memset() in src/tuxpaint.c::render_text_w(). + + debian/patches/fix-build-dep.patch: Add missing png lib to link + to fix FTBFS. + + -- Mattia Rizzolo Sun, 11 Aug 2013 21:32:35 +0200 + tuxpaint (1:0.9.21-1.1) unstable; urgency=low * Non-maintainer upload. @@ -15,12 +46,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 @@ -42,6 +108,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. @@ -58,6 +144,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. @@ -71,6 +184,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. @@ -100,6 +239,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. @@ -115,6 +260,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 -Nru tuxpaint-0.9.22/debian/control tuxpaint-0.9.22/debian/control --- tuxpaint-0.9.22/debian/control 2014-10-26 16:52:10.000000000 +0100 +++ tuxpaint-0.9.22/debian/control 2014-12-17 23:21:49.000000000 +0100 @@ -1,14 +1,15 @@ Source: tuxpaint Section: graphics Priority: optional -Maintainer: Ben Armstrong +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, libpng-dev, libvorbis-dev (>= 1.0.0-2), librsvg2-dev, libcairo2-dev, libpaper-dev, gperf Standards-Version: 3.9.6 Package: tuxpaint Architecture: any Depends: tuxpaint-plugins-default (>= 1:0.9.22-1) | tuxpaint-plugins, tuxpaint-data (= ${source:Version}), ${shlibs:Depends}, libvorbis0a (>= 1.0.0-2), libvorbisfile3 (>= 1.0.0-2), netpbm, ${misc:Depends} -Recommends: tuxpaint-config +Suggests: tuxpaint-config Description: 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. @@ -62,8 +63,8 @@ Package: tuxpaint-data Architecture: all -Depends: tuxpaint-stamps-default | tuxpaint-stamps, fonts-freefont-ttf, ${misc:Depends} -Recommends: tuxpaint +Depends: fonts-freefont-ttf, ${misc:Depends} +Recommends: tuxpaint, tuxpaint-stamps-default | tuxpaint-stamps Suggests: fonts-arabeyes, fonts-arphic-gbsn00lp, fonts-arphic-uming, fonts-nanum, fonts-gujr, fonts-taml, fonts-telu, fonts-thai-tlwg Description: Data files for Tux Paint, a paint program for children Tux Paint is meant to be a simple drawing program for young diff -Nru tuxpaint-0.9.22/debian/patches/fix-build-dep.patch tuxpaint-0.9.22/debian/patches/fix-build-dep.patch --- tuxpaint-0.9.22/debian/patches/fix-build-dep.patch 1970-01-01 01:00:00.000000000 +0100 +++ tuxpaint-0.9.22/debian/patches/fix-build-dep.patch 2014-12-17 23:25:34.000000000 +0100 @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -987,7 +987,7 @@ + @echo "...Linking Tux Paint..." + $(CC) $(CFLAGS) $(LDFLAGS) $(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) + diff -Nru tuxpaint-0.9.22/debian/patches/fix-gettext-domain.patch tuxpaint-0.9.22/debian/patches/fix-gettext-domain.patch --- tuxpaint-0.9.22/debian/patches/fix-gettext-domain.patch 1970-01-01 01:00:00.000000000 +0100 +++ tuxpaint-0.9.22/debian/patches/fix-gettext-domain.patch 2014-12-17 23:22:57.000000000 +0100 @@ -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 diff -Nru tuxpaint-0.9.22/debian/patches/series tuxpaint-0.9.22/debian/patches/series --- tuxpaint-0.9.22/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ tuxpaint-0.9.22/debian/patches/series 2014-12-17 23:25:11.000000000 +0100 @@ -0,0 +1,2 @@ +fix-gettext-domain.patch +fix-build-dep.patch