Merge with Debian 3.13.3-5

Bug #1421907 reported by Jackson Doak on 2015-02-14
This bug affects 1 person
Affects Status Importance Assigned to Milestone
gnome-menus (Ubuntu)

Bug Description

Please merge 3.13.3-5 from debian. debdiff attached.
I am not sure my work is good here, could someone with more experience with the package please check it.

Related branches

Revision history for this message
Jackson Doak (noskcaj) wrote :
Revision history for this message
Jackson Doak (noskcaj) wrote :
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

+ - gnome-menus.maintscript:
+ + Clean up after rename from /etc/xdg/menus/
+ to /etc/xdg/menus/

This is pre-Trusty, and thus no longer needed.

+ + Enable dh-autoreconf

This is probably also not needed, in Debian gnome-menus built fine on ppc64el and arm64.

Otherwise looks good.

Changed in gnome-menus (Ubuntu):
status: New → Triaged
importance: Undecided → Wishlist
Revision history for this message
Launchpad Janitor (janitor) wrote :
Download full text (3.3 KiB)

This bug was fixed in the package gnome-menus - 3.13.3-6ubuntu1

gnome-menus (3.13.3-6ubuntu1) wily; urgency=medium

  * Merge from Debian unstable. (LP: #1421907) Remaining changes:
    - debian/
      + Use ubuntu vcs
    - debian/desktop-files/
      + Update some of the directory icon names. lp:1201128
    - debian/gnome-menus.postinst, debian/gnome-menus.prerm:
      + Remove since they may cause issues with ubuntu-gnome-default-settings
    - debian/gnome-menus.triggers: Drop "gmenucache".
    - debian/patches/09_app_install_entry.patch:
      + Include Software Center in menus
    - debian/patches/70_ubuntu-directories.patch
      + Add Ubuntu-specific directories back to
    - debian/rules:
      + Enable parallel build

gnome-menus (3.13.3-6) unstable; urgency=medium

  * 31_nl_translation.patch: patch from Geert Stappers to fix seriously
    confusing translation. Closes: #776595.

gnome-menus (3.13.3-5) unstable; urgency=medium

  * 30_xdg_syntax.patch: fix typo in the patch as provided by upstream.
    Thanks Jerad Simpson.

gnome-menus (3.13.3-4) unstable; urgency=medium

  * menus.blacklist:
    + Add everything from xscreensaver-data. Closes: #771710.
  * 30_xdg_syntax.patch: patch from upstream git. Support multiple
    desktops in XDG_CURRENT_DESKTOP. Closes: #773013.

gnome-menus (3.13.3-3) unstable; urgency=medium

  * menus.blacklist:
    + Add vim.desktop (useful as MIME handler, not much so in the menu).
    + Add (v)prerex.desktop (texlive dependency).
    + Add nm-connection-editor.desktop (managed by control-center).
    + Add orca.desktop (managed by gnome-shell).
    + Add gnome-power-statistics.desktop (called from other places).
  * 12_alacarte.patch: new patch. Don’t exclude alacarte.

gnome-menus (3.13.3-2) unstable; urgency=low

  [ Pedro Beja ]
  * translate few bits: po-up/ pt, es. Thanks Rafael Belmonte. Closes:
  * translate few bits: po-up/ de, ru. Thanks Helge Kreutzmann and Andrey
    Kumykov. Closes: #715455, #636480.

  [ Iain Lane ]
  * Update gir package to install in MA libdir.

gnome-menus (3.13.3-1) unstable; urgency=medium

  [ Pierangelo Mancusi ]
  * New Upstream release.
    + Fix some crashes (Closes: #756197)
    + Fix some refcounting bugs
    + Fix some leaks
  * debian/
    + Bump Standards-Version to 3.9.5, no changes needed.

gnome-menus (3.10.1-1) unstable; urgency=low

  * Team upload.

  [ Emilio Pozuelo Monfort ]
  * debian/
    + Bump Standards-Version to 3.9.4, no changes needed.
  * debian/patches/20_show-admin-tools-for-admin-group.patch:
    + Removed. It was never used in Debian and doesn't apply anymore.

  [ Jeremy Bicha ]
  * debian/patches/04_fix_other.patch:
    - Fix apps showing in "Other" that already show in other categories.
  * debian/patches/08_settings-menus.patch:
    + Exclude "Sundry" items so that they aren't duplicated in the menus

  [ Fabian Greffrath ]
  * gnome-menus-blacklist: re-apply patch to correctly handle
    menu files with missing ending newlines. Closes: #692141.

  [ Pierangelo Mancusi ]
  * New upstream release.
  * debian/patches/30-gnome-calculator-desktop-file.patch:


Changed in gnome-menus (Ubuntu):
status: Triaged → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers