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

« back to all changes in this revision

Viewing changes to help/clock/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:
93
93
AUTOHEADER = @AUTOHEADER@
94
94
AUTOMAKE = @AUTOMAKE@
95
95
AWK = @AWK@
96
 
BONOBO_ACT_IDLDIR = @BONOBO_ACT_IDLDIR@
97
 
BONOBO_CFLAGS = @BONOBO_CFLAGS@
98
 
BONOBO_IDLDIR = @BONOBO_IDLDIR@
99
 
BONOBO_LIBS = @BONOBO_LIBS@
100
96
CATALOGS = @CATALOGS@
101
97
CATOBJEXT = @CATOBJEXT@
102
98
CC = @CC@
132
128
GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
133
129
GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
134
130
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
135
 
GIO_QUERYMODULES = @GIO_QUERYMODULES@
 
131
GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
136
132
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
137
133
GMOFILES = @GMOFILES@
138
134
GMSGFMT = @GMSGFMT@
139
135
GREP = @GREP@
 
136
GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
140
137
GTKDOC_CHECK = @GTKDOC_CHECK@
141
138
GTKDOC_MKPDF = @GTKDOC_MKPDF@
142
139
GTKDOC_REBASE = @GTKDOC_REBASE@
164
161
LD = @LD@
165
162
LDFLAGS = @LDFLAGS@
166
163
LIBOBJS = @LIBOBJS@
167
 
LIBPANEL_APPLET_BONOBO_CFLAGS = @LIBPANEL_APPLET_BONOBO_CFLAGS@
168
 
LIBPANEL_APPLET_BONOBO_LIBS = @LIBPANEL_APPLET_BONOBO_LIBS@
 
164
LIBPANEL_APPLET_API_VERSION = @LIBPANEL_APPLET_API_VERSION@
169
165
LIBPANEL_APPLET_CFLAGS = @LIBPANEL_APPLET_CFLAGS@
170
166
LIBPANEL_APPLET_LIBS = @LIBPANEL_APPLET_LIBS@
171
167
LIBS = @LIBS@
172
168
LIBTOOL = @LIBTOOL@
173
 
LIB_PANEL_APPLET_BONOBO_LT_VERSION = @LIB_PANEL_APPLET_BONOBO_LT_VERSION@
174
169
LIB_PANEL_APPLET_LT_VERSION = @LIB_PANEL_APPLET_LT_VERSION@
175
170
LIPO = @LIPO@
176
171
LN_S = @LN_S@
191
186
OBJDUMP = @OBJDUMP@
192
187
OBJEXT = @OBJEXT@
193
188
OMF_DIR = @OMF_DIR@
194
 
ORBIT_IDL = @ORBIT_IDL@
195
189
OTOOL = @OTOOL@
196
190
OTOOL64 = @OTOOL64@
197
191
PACKAGE = @PACKAGE@
204
198
PANEL_CFLAGS = @PANEL_CFLAGS@
205
199
PANEL_INTLTOOL_PANEL_APPLET_RULE = @PANEL_INTLTOOL_PANEL_APPLET_RULE@
206
200
PANEL_LIBS = @PANEL_LIBS@
207
 
PANEL_MODULE_BONOBO_CFLAGS = @PANEL_MODULE_BONOBO_CFLAGS@
208
 
PANEL_MODULE_BONOBO_LIBS = @PANEL_MODULE_BONOBO_LIBS@
209
201
PATH_SEPARATOR = @PATH_SEPARATOR@
210
202
PERL = @PERL@
211
203
PKG_CONFIG = @PKG_CONFIG@
226
218
SET_MAKE = @SET_MAKE@
227
219
SHELL = @SHELL@
228
220
STRIP = @STRIP@
 
221
TELEPATHY_GLIB_CFLAGS = @TELEPATHY_GLIB_CFLAGS@
 
222
TELEPATHY_GLIB_LIBS = @TELEPATHY_GLIB_LIBS@
229
223
TZ_CFLAGS = @TZ_CFLAGS@
230
224
TZ_LIBS = @TZ_LIBS@
231
225
USE_NLS = @USE_NLS@
253
247
am__tar = @am__tar@
254
248
am__untar = @am__untar@
255
249
appletsdir = @appletsdir@
 
250
appletsdir_pkgconfig = @appletsdir_pkgconfig@
256
251
bindir = @bindir@
257
252
build = @build@
258
253
build_alias = @build_alias@
265
260
docdir = @docdir@
266
261
dvidir = @dvidir@
267
262
exec_prefix = @exec_prefix@
 
263
gsettingsschemadir = @gsettingsschemadir@
268
264
host = @host@
269
265
host_alias = @host_alias@
270
266
host_cpu = @host_cpu@
685
681
_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
686
682
_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
687
683
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
688
 
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
 
684
_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
689
685
@ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
690
686
@ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
691
687
@ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml