lp://staging/~matttbe/ubuntu/raring/alacarte/lp1086369

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu/raring/alacarte

Sebastien Bacher: Approve on 2013-02-05

Diff: 272 lines (+215/-4)

6 files modified

.pc/applied-patches (+1/-0)
.pc/git_use_glib-gerror.patch/Alacarte/util.py (+174/-0)
Alacarte/util.py (+1/-4)
debian/changelog (+7/-0)
debian/patches/git_use_glib-gerror.patch (+31/-0)
debian/patches/series (+1/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1086369: alacarte crashed with ImportError in /usr/share/alacarte/Alacarte/util.py : cannot import name GError

Medium

Fix Released

Link a bug report

Related blueprints

67. By Matthieu Baerts on 2013-01-31

* debian/patches/git_use_glib-gerror.patch:
  - Use GLib.GError for catching errors (LP: #1086369)

66. By Matthieu Baerts on 2012-11-08

* debian/patches/50-xdg-menu-prefix.patch:
  - deal with the case of having no $XDG_MENU_PREFIX (LP: #1076318)

65. By Sebastien Bacher on 2012-11-06

* New upstream version
* debian/patches/40-xdg-menu-prefix: dropped, it's in the new version

64. By Lionel Le Folgoc on 2012-11-02

* debian/patches:
  - 40-xdg-menu-prefix: updated and reenabled to bring back support of
    $XDG_MENU_PREFIX. lp: #1069207

63. By Robert Ancell on 2012-08-27

New upstream release

62. By Robert Ancell on 2012-07-17

* New upstream release
* debian/control:
  - Bump build-depends on libgnome-menu-3-dev

61. By Robert Ancell on 2012-06-25

* New upstream release
* debian/patches/50-git_editable_top_level_menus:
* debian/patches/60_separators-typos.patch:
  - Applied upstream

60. By Iain Lane on 2012-06-11

* Resynchronise with Debian unstable, remianing changes
  - debian/patches/40-call-exo-d-i-e-on-xfce.patch: call
    exo-desktop-item-edit instead of gnome-desktop-item-edit when
    XDG_CURRENT_DESKTOP=XFCE.
* Disable 40_xdg_menu_prefix as this does not apply to Ubuntu.
* Cherry-pick patch from Debian SVN to add missing python-gi dep
* Cherry-pick upstream patch to not fix some typos relating to separators.
  Fixes some crashes.

59. By Iain Lane on 2012-06-04

* New upstream release.
* Drop several patches applied upstream / obsoleted and refresh the rest.
* Drop gettext domain and intltool-update changes; not relevant now we are
  in Universe.
* Switch to python-gi, per upstream.
* Bump BD to libgnome-menu-3-dev, also per upstream.

58. By Lionel Le Folgoc on 2012-02-05

* debian/patches/40-call-exo-d-i-e-on-xfce.patch: call exo-desktop-item-edit
  instead of gnome-desktop-item-edit when XDG_CURRENT_DESKTOP=XFCE.
* debian/control: add alternate deps on libgarcon-common for gnome-menus and
  alternate recommends on exo-utils for gnome-panel as they provide the
  features needed by alacarte to work on Xfce. lp: #925801