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

« back to all changes in this revision

Viewing changes to debian/rules

  • 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
1
#!/usr/bin/make -f
2
2
 
 
3
include /usr/share/cdbs/1/rules/autoreconf.mk
3
4
include /usr/share/cdbs/1/rules/debhelper.mk
4
5
include /usr/share/cdbs/1/rules/utils.mk
5
 
include /usr/share/cdbs/1/rules/autoreconf.mk
6
6
include /usr/share/cdbs/1/class/gnome.mk
7
7
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
8
8
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
9
 
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
9
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
10
10
 
11
 
#LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
 
11
LDFLAGS += -Wl,-z,defs -Wl,-O1
12
12
 
13
13
DEB_CONFIGURE_EXTRA_FLAGS += \
14
14
                        --disable-scrollkeeper \
15
 
#                       --with-in-process-applets=all \
16
 
                        --disable-initial-animation
 
15
                        --with-in-process-applets=all \
 
16
                        --enable-telepathy-glib
17
17
ifneq ($(DEB_BUILD_GNU_SYSTEM),gnu)
18
18
        DEB_CONFIGURE_EXTRA_FLAGS += --enable-eds
19
19
endif
20
20
 
21
 
DEB_DH_MAKESHLIBS_ARGS_libpanel-applet2-0 += -V"libpanel-applet2-0 (>= 2.26.0)"
22
 
DEB_DH_MAKESHLIBS_ARGS_libpanel-applet3-0 += -V"libpanel-applet3-0 (>= 2.32.0)"
 
21
DEB_DH_MAKESHLIBS_ARGS_libpanel-applet-4-0 += -V"libpanel-applet-4-0 (>= 2.91.93)"
23
22
DEB_DH_MAKESHLIBS_ARGS_gnome-panel += --no-act
24
23
 
25
24
binary-install/gnome-panel::
26
25
        chmod a+x debian/gnome-panel/usr/lib/gnome-panel/*
27
26
        cd po; intltool-update -p --verbose
28
27
 
29
 
binary-install/gnome-panel-data::
30
 
        find debian/gnome-panel-data/usr/share -type f -exec chmod -R a-x {} \;
31
 
        cd debian/gnome-panel-data/usr/share/gconf && \
32
 
                mkdir defaults && \
33
 
                mv schemas/panel-default-setup.entries \
34
 
                   defaults/05_panel-default-setup.entries
35
 
 
36
 
binary-predeb/gir1.2-panelapplet-3.0::
37
 
        dh_girepository -p$(cdbs_curpkg)
38