Created by Iain Lane on 2012-05-21 and last modified on 2012-05-21
Get this branch:
bzr branch lp:~laney/gnome-menus/merge-3.4.2
Only Iain Lane can upload to this branch. If you are Iain Lane please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Iain Lane

Recent revisions

117. By Iain Lane on 2012-05-21


* Merge with Debian, remaining changes:
  - debian/gnome-menus.postinst:
    + Disable blacklist to not break old applications
  - debian/rules, debian/gnome-menus.maintscript:
    + Remove rule renaming applications.menu to gnome-applications.menu and
      ensure conffile is removed on upgrade
  - debian/gnome-menus.triggers: Drop "gmenucache".
  - debian/patches/09_app_install_entry.patch:
    + Include Software Center in menus
  - debian/patches/22_desktop-cache.patch:
    + Support a desktop.<localename>.cache file in e. g.
      /usr/share/applications/ to speed up menu loading. Those
      are generated with update-gnome-menus-cache <dir>.
  - debian/patches/70_ubuntu-directories.patch
    + Add Ubuntu-specific directories back to POTFILES.in
  - debian/patches/series: Disable 01_default_prefix.patch
* menus.blacklist: update to the latest KDE versions.
  Closes: #650017, #650019.
* New upstream release.
* Change section of gir1.2-gmenu-3.0 to introspection.
* debian/gnome-menus.maintscript: Use new versioning scheme as recommended
  by dpkg-maintscript-helper which better handles local modifications and
* debian/patches/05_debian_menu.patch: Refreshed.
* Drop explicit Build-Depends on gir1.2-glib-2.0 and bump
  libgirepository1.0-dev accordingly.
* Bump Stanards-Version to 3.9.3.
* debian/menus.blacklist:
  - Remove stale entries which are no longer relevant, mostly KDE3 related.
  - Remove KDE entries which use OnlyShowIn=KDE;
  - Add notes for which .desktop files bugs have been filed. Once they are
    fixed the corresponding entries should be removed again.
  - Add Thunar (XFCE) and related applications to blacklist.

116. By Robert Ancell on 2012-03-28

releasing version 3.4.0-0ubuntu1

115. By Ken VanDine on 2012-02-29

releasing version 3.3.5-0ubuntu2

114. By Martin Pitt on 2012-02-22

releasing version 3.3.5-0ubuntu1

113. By Martin Pitt on 2012-02-22

* New upstream release.
* Unfuzz patches.

112. By Didier Roche on 2012-02-08

merge aurelien's branch for g-c-c category icons

111. By Sebastien Bacher on 2012-02-08

releasing version

110. By Sebastien Bacher on 2012-02-08

* debian/gnome-menus.maintscript:
  - clean gnome-applications.menu on upgrade, it was installed by error
  - updated transition version for settings.menu there
* debian/rules: don't rename the .menus with a prefix "gnome-" like in
  Debian, we use the upstream names

109. By Michael Terry on 2011-12-23

* Merge from Debian testing, remaining changes:
  - debian/patches/09_app_install_entry.patch: Add Software Center
  - debian/patches/series: Disable 01_default_prefix.patch
  - debian/gnome-menus.postinst: Disable blacklist
  - debian/watch: Look for unstable tarballs
* Update po-up/ca.po.
* Upload to unstable.
* New upstream release
* Partial sync from Ubuntu, ensure we're using the same package names and
  initial 3.2.0 packaging
* debian/patches/01_default_prefix.patch: Refreshed
* debian/libgnome-menu-3-0.symbols: Add symbols file
* debian/gnome-menus.install: Install gmenu-simple-editor
* Remove pysupport depends, gnome-menus bindings go via GI now.
* debian/rules:
  - Call dh_python2 for gnome-menus, so python:Depends is set.
* debian/control.in:
  - Bump Build-Depends on python to (>= 2.6.6-3~) for dh_python2.
* Stop installing gmenu-simple-editor
* Add xterm to the blacklist.
* Use the .maintscript facility provided by dh_installdeb to cleanup the old
* Update the last unfixed version to 3.0.1-2 as we missed to remove the old
  conffile for users upgrading from 2.30.3-2+b1. Closes: #645446
* Upload to unstable.
* debian/control.in:
  - Set <email address hidden> as Maintainer.
  - Remove obsolete Build-Depends on dpkg-dev.
  - Remove old Conflicts and Replaces.
  - Bump Standards-Version to 3.9.2. No further changes.
  - Add Vcs-* fields.
* Bump debhelper compatibility level to 8.
  - Update Build-Depends on debhelper.
  - Strip debian/tmp/ from .install files.
* debian/watch:
  - Update to version 3.
  - Switch to .xz tarballs.
* Break alacarte < 0.13.2-2 (version without support for
* New upstream release.
* 08_settings-menus.patch: new patch. Move the old settings and system
  settings to submenus in the “system” submenu. This is merely so that
  they have a place until we clean them up entirely.
  + desktop-files/Settings{,-System}.directory.in: taken from the 2.30
  + Update translations accordingly.
* po-up/fr.po: add a missing French translation.
* Clean up old comments in translations.
* 09_games-menu.patch: refreshed.

108. By Martin Pitt on 2011-10-05

* Remove remaining menu cache stuff, as it is not being used any more:
  - Drop debian/update-gnome-menus-cache. (LP: #769349, #771196)
  - debian/gnome-menus.triggers: Drop "gmenucache".
  - Drop 22_desktop-cache.patch (already wasn't applied any more in series)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.