-
Committer:
Bazaar Package Importer
-
Author(s):
Chris Coulson
-
Date:
2009-06-22 22:26:26 UTC
-
mfrom:
(1.1.55 upstream)
(2.1.3 squeeze)
-
Revision ID:
james.westby@ubuntu.com-20090622222626-070wcnv3l6mtby4j
Tags: 1:2.26.2-1ubuntu1
* Rebase on Debian unstable (LP: #388263):
- debian/add-indicator-applet.py, debian/indicator-applet.desktop:
+ Add indicator applet to existing panel configs on upgrade.
- debian/application-default-icon.png.uue:
+ Default icon for the menu entries.
- debian/control{.in}:
+ Add Vcs-Bzr info.
+ Build-depend on sharutils.
+ gnome-panel suggests menu-xdg rather than depends on it.
+ gnome-panel recommends indicator-applet.
- debian/fusa-applet.note.in, debian/migrate-fusa-config.py,
debian/patches/20_fusa_migration_note_i18n.patch:
+ Show an update-notifer hook about the FUSA applet and
add a script that can do the config migration.
- debian/gnome-panel-data.install, debian/ubuntu-about.desktop{.in}:
+ Install the "About Ubuntu" menu item.
- debian/gnome-panel-data.preinst:
+ Clean conffiles which are not in the new version on upgrade.
- debian/gnome-panel.install:
+ Install the files necessary to migrate existing panel configs
on upgrade, to add the FUSA and indicator applet.
- debian/gnome-panel.postinst:
+ Show note for adding FUSA applet on upgrade.
+ Add GConf defaults for directory fixup and indicator-applet
migration on upgrade.
- debian/gnome-panel.postrm:
- Remove GConf defaults on uninstall.
- debian/patches/01_layout.patch:
+ Changes to the panel layout.
- debian/patches/04_default_panel_config.patch:
+ Change to the default configuration.
- debian/patches/16_compiz_workspace_switcher.patch:
+ Allow the workspace switcher to change the desktop layout
when using compiz.
- debian/patches/17_about-ubuntu-translation.patch:
+ List ubuntu-about.desktop for translation.
- debian/patches/25_dynamic_fusa_detection.patch:
+ Removes the shutdown, logout and lock screen items when the
FUSA applet is on the panel (LP: #335242).
- debian/patches/25_inode_directory_fixup.patch:
+ Restore inode/directory association on upgrade from
Hardy (LP: #260492).
- debian/patches/30_disable-initial-animation.patch:
+ Patch to add build-time flag to disable the initial slide-in animation.
- debian/patches/70_relibtoolize.patch:
+ Updated for Ubuntu-specific changes.
- debian/patches/85_disable_shutdown_on_ltsp.patch:
+ Suppress the shutdown option in the panel if LTSP_CLIENT
is set. (LP: #282669)
- Dropped Debian-specific patches:
+ 01_panel_submenus.patch.
+ 02_panel_logout.patch.
+ 03_switch-user_lock.patch.
+ 04_gnome-panel-logout.patch
- debian/rules:
+ Don't call patch-translations.mk - none of the translations in
debian/po-up are applicable to Ubuntu.
+ Disable the initial slide-in animation.
+ Create debian/fusa-applet.note.
+ Update translations template.
+ Install the default menu icon.
* Closes LP: #327859