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

« back to all changes in this revision

Viewing changes to doc/Makefile.in

  • 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:
108
108
AUTOHEADER = @AUTOHEADER@
109
109
AUTOMAKE = @AUTOMAKE@
110
110
AWK = @AWK@
111
 
BONOBO_ACT_IDLDIR = @BONOBO_ACT_IDLDIR@
112
 
BONOBO_CFLAGS = @BONOBO_CFLAGS@
113
 
BONOBO_IDLDIR = @BONOBO_IDLDIR@
114
 
BONOBO_LIBS = @BONOBO_LIBS@
115
111
CATALOGS = @CATALOGS@
116
112
CATOBJEXT = @CATOBJEXT@
117
113
CC = @CC@
147
143
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
148
144
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
149
145
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
150
 
GIO_QUERYMODULES = @GIO_QUERYMODULES@
 
146
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
151
147
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
152
148
GMOFILES = @GMOFILES@
153
149
GMSGFMT = @GMSGFMT@
154
150
GREP = @GREP@
 
151
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
155
152
GTKDOC_CHECK = @GTKDOC_CHECK@
156
153
GTKDOC_MKPDF = @GTKDOC_MKPDF@
157
154
GTKDOC_REBASE = @GTKDOC_REBASE@
179
176
LD = @LD@
180
177
LDFLAGS = @LDFLAGS@
181
178
LIBOBJS = @LIBOBJS@
182
 
LIBPANEL_APPLET_BONOBO_CFLAGS = @LIBPANEL_APPLET_BONOBO_CFLAGS@
183
 
LIBPANEL_APPLET_BONOBO_LIBS = @LIBPANEL_APPLET_BONOBO_LIBS@
 
179
LIBPANEL_APPLET_API_VERSION = @LIBPANEL_APPLET_API_VERSION@
184
180
LIBPANEL_APPLET_CFLAGS = @LIBPANEL_APPLET_CFLAGS@
185
181
LIBPANEL_APPLET_LIBS = @LIBPANEL_APPLET_LIBS@
186
182
LIBS = @LIBS@
187
183
LIBTOOL = @LIBTOOL@
188
 
LIB_PANEL_APPLET_BONOBO_LT_VERSION = @LIB_PANEL_APPLET_BONOBO_LT_VERSION@
189
184
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
190
185
LIPO = @LIPO@
191
186
LN_S = @LN_S@
206
201
OBJDUMP = @OBJDUMP@
207
202
OBJEXT = @OBJEXT@
208
203
OMF_DIR = @OMF_DIR@
209
 
ORBIT_IDL = @ORBIT_IDL@
210
204
OTOOL = @OTOOL@
211
205
OTOOL64 = @OTOOL64@
212
206
PACKAGE = @PACKAGE@
219
213
PANEL_CFLAGS = @PANEL_CFLAGS@
220
214
PANEL_INTLTOOL_PANEL_APPLET_RULE = @PANEL_INTLTOOL_PANEL_APPLET_RULE@
221
215
PANEL_LIBS = @PANEL_LIBS@
222
 
PANEL_MODULE_BONOBO_CFLAGS = @PANEL_MODULE_BONOBO_CFLAGS@
223
 
PANEL_MODULE_BONOBO_LIBS = @PANEL_MODULE_BONOBO_LIBS@
224
216
PATH_SEPARATOR = @PATH_SEPARATOR@
225
217
PERL = @PERL@
226
218
PKG_CONFIG = @PKG_CONFIG@
241
233
SET_MAKE = @SET_MAKE@
242
234
SHELL = @SHELL@
243
235
STRIP = @STRIP@
 
236
TELEPATHY_GLIB_CFLAGS = @TELEPATHY_GLIB_CFLAGS@
 
237
TELEPATHY_GLIB_LIBS = @TELEPATHY_GLIB_LIBS@
244
238
TZ_CFLAGS = @TZ_CFLAGS@
245
239
TZ_LIBS = @TZ_LIBS@
246
240
USE_NLS = @USE_NLS@
268
262
am__tar = @am__tar@
269
263
am__untar = @am__untar@
270
264
appletsdir = @appletsdir@
 
265
appletsdir_pkgconfig = @appletsdir_pkgconfig@
271
266
bindir = @bindir@
272
267
build = @build@
273
268
build_alias = @build_alias@
280
275
docdir = @docdir@
281
276
dvidir = @dvidir@
282
277
exec_prefix = @exec_prefix@
 
278
gsettingsschemadir = @gsettingsschemadir@
283
279
host = @host@
284
280
host_alias = @host_alias@
285
281
host_cpu = @host_cpu@