← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-settings-daemon/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/06_use_application_indicator.patch

  • Committer: Package Import Robot
  • Author(s): Rodrigo Moya
  • Date: 2011-09-19 17:05:48 UTC
  • mfrom: (1.1.51 upstream)
  • Revision ID: package-import@ubuntu.com-20110919170548-gegm8ewt6qf7v7lp
Tags: 3.1.92-0ubuntu1
* New upstream release
* debian/control:
  - Bump libcolord-dev build dependency
* debian/patches/00git_guard_against_division_by_0.patch:
* debian/patches/00git_dont_crash_if_session_not_ready.patch:
* debian/patches/00git_numlock_status.patch:
* debian/patches/00git_disconnect_callbacks.patch:
  - Remove upstream patches
* debian/patches/06_use_application_indicator.patch:
* debian/patches/16_use_synchronous_notifications.patch:
  - Rebased

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_use_application_indicator.patch
1
1
--- a/configure.ac
2
2
+++ b/configure.ac
3
 
@@ -53,6 +53,7 @@ GCONF_REQUIRED_VERSION=2.6.1
4
 
 GIO_REQUIRED_VERSION=2.26.0
 
3
@@ -54,6 +54,7 @@ GCONF_REQUIRED_VERSION=2.6.1
5
4
 GNOME_DESKTOP_REQUIRED_VERSION=3.1.5
6
5
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
 
6
 UPOWER_GLIB_REQUIRED_VERSION=0.9.1
7
7
+APPINDICATOR_REQUIRED_VERSION=0.3.0
8
8
 
9
9
 EXTRA_COMPILE_WARNINGS(yes)
182
182
 
183
183
                 manager->priv->status_icon = gtk_status_icon_new_from_icon_name ("preferences-desktop-accessibility");
184
184
@@ -1168,6 +1224,7 @@ gsd_a11y_keyboard_manager_ensure_status_
185
 
                                   G_CALLBACK (on_status_icon_activate),
 
185
                                   G_CALLBACK (on_status_icon_popup_menu),
186
186
                                   manager);
187
187
         }
188
188
+#endif
1110
1110
        $(PLUGIN_CFLAGS)                \
1111
1111
        $(SETTINGS_PLUGIN_CFLAGS)       \
1112
1112
+       $(APPINDICATOR_CFLAGS)          \
1113
 
        $(LIBGNOMEKBDUI_CFLAGS)         \
 
1113
        $(KEYBOARD_CFLAGS)              \
1114
1114
        $(AM_CFLAGS)
1115
1115
 
1116
1116
@@ -47,6 +50,7 @@ libkeyboard_la_LIBADD  =      \
1117
1117
        $(SETTINGS_PLUGIN_LIBS) \
1118
1118
        $(XF86MISC_LIBS)        \
1119
 
        $(LIBGNOMEKBDUI_LIBS)   \
 
1119
        $(KEYBOARD_LIBS)        \
1120
1120
+       $(APPINDICATOR_LIBS)    \
1121
1121
        $(NULL)
1122
1122