~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to data/32x32/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
size = 32x32
 
2
 
 
3
iconsdir = $(datadir)/icons/hicolor/$(size)/apps
 
4
 
 
5
icons_DATA =                                    \
 
6
        gnome-panel-clock.png                   \
 
7
        gnome-panel-fish.png                    \
 
8
        gnome-panel-force-quit.png              \
 
9
        gnome-panel-launcher.png                \
 
10
        gnome-panel-notification-area.png       \
 
11
        gnome-panel-separator.png               \
 
12
        gnome-panel.png                         \
 
13
        gnome-panel-window-list.png             \
 
14
        gnome-panel-window-menu.png             \
 
15
        gnome-panel-workspace-switcher.png
 
16
 
 
17
icons_SOURCE =                                  \
 
18
        gnome-panel-clock.svg                   \
 
19
        gnome-panel-fish.svg                    \
 
20
        gnome-panel-force-quit.svg              \
 
21
        gnome-panel-launcher.svg                \
 
22
        gnome-panel-notification-area.svg       \
 
23
        gnome-panel-separator.svg               \
 
24
        gnome-panel.svg                         \
 
25
        gnome-panel-window-list.svg             \
 
26
        gnome-panel-window-menu.svg             \
 
27
        gnome-panel-workspace-switcher.svg
 
28
 
 
29
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
 
30
 
 
31
install-data-hook: update-icon-cache
 
32
uninstall-hook: update-icon-cache
 
33
update-icon-cache:
 
34
        @-if test -z "$(DESTDIR)"; then \
 
35
                echo "Updating Gtk icon cache."; \
 
36
                $(gtk_update_icon_cache); \
 
37
        else \
 
38
                echo "*** Icon cache not updated. After (un)install, run this:"; \
 
39
                echo "***   $(gtk_update_icon_cache)"; \
 
40
        fi
 
41
 
 
42
EXTRA_DIST =            \
 
43
        $(icons_DATA)   \
 
44
        $(icons_SOURCE)
 
45
 
 
46
-include $(top_srcdir)/git.mk