Please merge tuxpaint 0.9.21-1 (main) from Debian unstable (main)

[Caroline Ford]

Binary package hint: tuxpaint

Debian changelog:

tuxpaint (1:0.9.21-1) unstable; urgency=low

   * New upstream release.

 -- Ben Armstrong <email address hidden> Sun, 09 Aug 2009 11:17:59 -0300
2008

Karmic currently has 0.9.20-2ubuntu1

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 <email address hidden> Fri, 11 Jul 2008 18:35:11 +0100

[Daniel Holbach (dholbach)]

Are you going to perform the merge? This is a semi-manual thing.

https://wiki.ubuntu.com/UbuntuDevelopment/Merging

To me it seems like bug 415613 is Depending on this one first.

[Caroline Ford (secretlondon)]

I've tried to follow the instructions but I don't know what the script has actually done. I don't think I have time to learn how to do merges before feature freeze - sorry :(