lp://staging/~ubuntu-branches/ubuntu/oneiric/gcompris/oneiric-201108242027

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp://staging/ubuntu/oneiric/gcompris

Ubuntu branches: Pending requested 2011-09-02

Diff: 136 lines (+80/-2) (has conflicts)

7 files modified

debian/gcompris-sound-af.files (+1/-0)
debian/gcompris-sound-sl.files (+1/-0)
debian/patches/90-submarine-set-but-unused-variables.patch (+37/-0)
debian/patches/91-dont-translate-nonexisting-files.patch (+24/-0)
debian/patches/series (+2/-0)
debian/source/format (+1/-0)
src/submarine-activity/submarine.c (+14/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

48. By Stephane Graber <stgraber@shell01> on 2011-08-24

releasing version 9.6.1-0ubuntu2

47. By Stephane Graber <stgraber@shell01> on 2011-08-24

releasing version 9.6.1-0ubuntu1

46. By Stephane Graber <stgraber@shell01> on 2011-08-24

Merge new upstream release from Jeremy Bicha

45. By Daniel T Chen on 2011-08-21

Apply patch from Mattias Lindblad resolving 2-click mode dropping
pieces. (LP: #777349) Patch applied upstream in git changeset
83850c4. Thanks, Mattias!

44. By Daniel T Chen on 2011-08-13

* Merge from Debian unstable. Remaining changes:
  - Rebuild with Python 2.7
  - Fix grammatical errors in Descriptions (debian/control).
    Thanks, Paul Stewart! (LP: #825448)
  - Backport upstream a3bb797 to fix unused warnings, FTBFS.
    (Closes: #632349)

43. By Matthias Klose on 2010-12-09

Rebuild with python 2.7 as the python default.

42. By Michael Bienia on 2010-09-28

src/goocanvas/src/Makefile.{am,in}: Drop -DGTK_DISABLE_DEPRECATED and
-DGDK_DISABLE_DEPRECATED to fix FTBFS.

41. By Yann Dirson <email address hidden> on 2010-06-27

* New upstream release.
* Drop GTK_DISABLE_DEPRECATED patch, useless for now.
* Provide RELEASE_NOTE_9.3.txt downloaded from sourceforge.
* New voice package for Asturian.

40. By Yann Dirson <email address hidden> on 2010-04-18

Build goocanvas without -DGTK_DISABLE_DEPRECATED since
GTK_WIDGET_HAS_FOCUS has been deprecated in gtk 2.20 (Closes: #577303).
Why do they use that flag for a *release version?!

39. By Ilya Barygin on 2010-02-19

03_deprecated.dpatch: replace deprecated GTK+ symbols to fix FTBFS.