r31147 - in /desktop/experimental/gnome-control-center/debian: ./ patches/

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Oct 30 10:13:07 UTC 2011


Author: sjoerd
Date: Sun Oct 30 10:13:07 2011
New Revision: 31147

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31147
Log:
* New upstream release
* Sync with Ubuntu
  + debian/libgnome-control-center1.symbols: Update symbols
  + debian/patches/90_force_fallback.patch: Updated
  + debian/patches/06_handle_passwd_with_ldap.patch: Added
  + debian/patches/08_dont_crash_on_null_territories.patch: Added
* debian/patches/02_https.patch: Removed, fixed upstream
* debian/patches/03_ppd_h.patch: Removed, fixed upstream
* debian/patches/91_configure_cheese.patch: Include cheese pkg-config flags
  as symbols of it are being used
* debian/control.in: Remove libgnome-control-center-dev package
* debian/control.in: Add build-dependency on libgoa-1.0-dev, libcolord-dev,
  and libnotify-dev

Added:
    desktop/experimental/gnome-control-center/debian/gnome-control-center-dev.install
    desktop/experimental/gnome-control-center/debian/patches/00git_handle_media_dialog_close.patch
    desktop/experimental/gnome-control-center/debian/patches/06_handle_passwd_with_ldap.patch
    desktop/experimental/gnome-control-center/debian/patches/08_dont_crash_on_null_territories.patch
    desktop/experimental/gnome-control-center/debian/patches/91_configure_cheese.patch
Removed:
    desktop/experimental/gnome-control-center/debian/patches/02_https.patch
    desktop/experimental/gnome-control-center/debian/patches/03_ppd_h.patch
Modified:
    desktop/experimental/gnome-control-center/debian/changelog
    desktop/experimental/gnome-control-center/debian/control
    desktop/experimental/gnome-control-center/debian/control.in
    desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols
    desktop/experimental/gnome-control-center/debian/patches/01_menu_category.patch
    desktop/experimental/gnome-control-center/debian/patches/90_force_fallback.patch
    desktop/experimental/gnome-control-center/debian/patches/series

Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=31147&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,3 +1,20 @@
+gnome-control-center (1:3.2.1-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Sync with Ubuntu
+    + debian/libgnome-control-center1.symbols: Update symbols
+    + debian/patches/90_force_fallback.patch: Updated
+    + debian/patches/06_handle_passwd_with_ldap.patch: Added
+    + debian/patches/08_dont_crash_on_null_territories.patch: Added
+  * debian/patches/02_https.patch: Removed, fixed upstream
+  * debian/patches/03_ppd_h.patch: Removed, fixed upstream
+  * debian/patches/91_configure_cheese.patch: Include cheese pkg-config flags
+    as symbols of it are being used
+  * debian/control.in: Remove libgnome-control-center-dev package
+  * debian/control.in: Add build-dependency on libgoa-1.0-dev, libcolord-dev,
+    and libnotify-dev
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 30 Oct 2011 10:45:05 +0100
+
 gnome-control-center (1:3.0.2-3) unstable; urgency=low
 
   * debian/control.in:

Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=31147&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Sun Oct 30 10:13:07 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Frederic Peters <fpeters at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.2
 Build-Depends: cdbs (>= 0.4.41),
                gnome-pkg-tools (>= 0.10),
@@ -23,10 +23,10 @@
                libcanberra-gtk3-dev,
                libgtk-3-dev (>= 3.0.2),
                libgdk-pixbuf2.0-dev (>= 2.23.0),
-               libglib2.0-dev (>= 2.25.11),
+               libglib2.0-dev (>= 2.29.14),
                libgconf2-dev,
                libgnome-desktop-3-dev (>= 2.91.0),
-               libgnome-menu-dev (>= 2.10.1),
+               libgnome-menu-3-dev,
                libdbus-1-dev (>= 0.32),
                libdbus-glib-1-dev (>= 0.32),
                libxml2-dev,
@@ -38,7 +38,7 @@
                desktop-file-utils,
                shared-mime-info,
                libgstreamer-plugins-base0.10-dev,
-               gsettings-desktop-schemas-dev,
+               gsettings-desktop-schemas-dev (>= 3.0.2),
                libpolkit-gobject-1-dev (>= 0.97),
                libcups2-dev,
                libgtop2-dev,
@@ -46,7 +46,10 @@
                libnm-glib-dev (>= 0.8.992) [linux-any],
                libnm-util-dev (>= 0.8.992) [linux-any],
                network-manager-dev (>= 0.8.992) [linux-any],
-               locales
+               locales,
+               libgoa-1.0-dev,
+               libcolord-dev,
+               libnotify-dev
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-control-center/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-control-center/
 
@@ -70,7 +73,8 @@
             gnome-session,
             policykit-1-gnome,
             mousetweaks,
-            iso-codes
+            iso-codes,
+            gnome-online-accounts
 Breaks: libglib2.0-0 (<< 2.28.6-2),
         gnome-session (<< 3.0),
         gnome-power-manager (<< 3.0)
@@ -86,13 +90,6 @@
  .
  It also contains a front end to these applets, which can also be
  accessed with the GNOME panel or the Nautilus file manager.
-
-Package: gnome-control-center-dev
-Architecture: all
-Section: devel
-Depends: ${misc:Depends}
-Description: utilities to configure the GNOME desktop
- This package contains the file required to get the keydirs location
 
 Package: gnome-control-center-data
 Architecture: all
@@ -113,14 +110,6 @@
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
 
-Package: libgnome-control-center-dev
-Architecture: any
-Section: libdevel
-Depends: ${misc:Depends},
-         libgnome-control-center1 (= ${binary:Version})
-Description: utilities to configure the GNOME desktop
- This package contains the files needed to build Control Center panels
-
 Package: libgnome-control-center1
 Architecture: any
 Section: libs

Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=31147&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Sun Oct 30 10:13:07 2011
@@ -18,10 +18,10 @@
                libcanberra-gtk3-dev,
                libgtk-3-dev (>= 3.0.2),
                libgdk-pixbuf2.0-dev (>= 2.23.0),
-               libglib2.0-dev (>= 2.25.11),
+               libglib2.0-dev (>= 2.29.14),
                libgconf2-dev,
                libgnome-desktop-3-dev (>= 2.91.0),
-               libgnome-menu-dev (>= 2.10.1),
+               libgnome-menu-3-dev,
                libdbus-1-dev (>= 0.32),
                libdbus-glib-1-dev (>= 0.32),
                libxml2-dev,
@@ -33,7 +33,7 @@
                desktop-file-utils,
                shared-mime-info,
                libgstreamer-plugins-base0.10-dev,
-               gsettings-desktop-schemas-dev,
+               gsettings-desktop-schemas-dev (>= 3.0.2),
                libpolkit-gobject-1-dev (>= 0.97),
                libcups2-dev,
                libgtop2-dev,
@@ -41,7 +41,10 @@
                libnm-glib-dev (>= 0.8.992) [linux-any],
                libnm-util-dev (>= 0.8.992) [linux-any],
                network-manager-dev (>= 0.8.992) [linux-any],
-               locales
+               locales,
+               libgoa-1.0-dev,
+               libcolord-dev,
+               libnotify-dev
 Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/gnome-control-center/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-control-center/
 
@@ -65,7 +68,8 @@
             gnome-session,
             policykit-1-gnome,
             mousetweaks,
-            iso-codes
+            iso-codes,
+            gnome-online-accounts
 Breaks: libglib2.0-0 (<< 2.28.6-2),
         gnome-session (<< 3.0),
         gnome-power-manager (<< 3.0)
@@ -108,14 +112,6 @@
  This package contains data files (icons, pixmaps, locales files) needed by
  the configuration applets in the gnome-control-center package.
 
-Package: libgnome-control-center-dev
-Architecture: any
-Section: libdevel
-Depends: ${misc:Depends},
-         libgnome-control-center1 (= ${binary:Version})
-Description: utilities to configure the GNOME desktop
- This package contains the files needed to build Control Center panels
-
 Package: libgnome-control-center1
 Architecture: any
 Section: libs

Added: desktop/experimental/gnome-control-center/debian/gnome-control-center-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/gnome-control-center-dev.install?rev=31147&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/gnome-control-center-dev.install (added)
+++ desktop/experimental/gnome-control-center/debian/gnome-control-center-dev.install [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,0 +1,1 @@
+usr/share/pkgconfig

Modified: desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols?rev=31147&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/libgnome-control-center1.symbols [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,9 +1,18 @@
 libgnome-control-center.so.1 libgnome-control-center1 #MINVER#
 * Build-Depends-Package: libgnome-control-center-dev
- cc_lock_button_get_permission at Base 1:2.91.91
- cc_lock_button_get_type at Base 1:2.91.91
- cc_lock_button_new at Base 1:2.91.91
- cc_marshal_VOID__STRING_POINTER at Base 1:2.91.2
+ cc_editable_entry_get_editable at Base 1:3.1.3
+ cc_editable_entry_get_scale at Base 1:3.1.3
+ cc_editable_entry_get_selectable at Base 1:3.1.4
+ cc_editable_entry_get_text at Base 1:3.1.3
+ cc_editable_entry_get_type at Base 1:3.1.3
+ cc_editable_entry_get_weight at Base 1:3.1.3
+ cc_editable_entry_new at Base 1:3.1.3
+ cc_editable_entry_set_editable at Base 1:3.1.3
+ cc_editable_entry_set_scale at Base 1:3.1.3
+ cc_editable_entry_set_selectable at Base 1:3.1.4
+ cc_editable_entry_set_text at Base 1:3.1.3
+ cc_editable_entry_set_weight at Base 1:3.1.3
+ cc_panel_get_permission at Base 1:3.1.3
  cc_panel_get_shell at Base 1:2.91.2
  cc_panel_get_type at Base 1:2.91.2
  cc_shell_get_active_panel at Base 1:2.91.2
@@ -11,23 +20,3 @@
  cc_shell_get_type at Base 1:2.91.2
  cc_shell_set_active_panel at Base 1:2.91.2
  cc_shell_set_active_panel_from_id at Base 1:2.91.2
- gconf_peditor_new_boolean at Base 1:2.91.2
- gconf_peditor_new_color at Base 1:2.91.2
- gconf_peditor_new_combo_box at Base 1:2.91.2
- gconf_peditor_new_combo_box_with_enum at Base 1:2.91.2
- gconf_peditor_new_enum_toggle at Base 1:2.91.2
- gconf_peditor_new_font at Base 1:2.91.2
- gconf_peditor_new_image at Base 1:2.91.2
- gconf_peditor_new_integer at Base 1:2.91.2
- gconf_peditor_new_numeric_range at Base 1:2.91.2
- gconf_peditor_new_select_radio at Base 1:2.91.2
- gconf_peditor_new_select_radio_with_enum at Base 1:2.91.2
- gconf_peditor_new_string at Base 1:2.91.2
- gconf_peditor_new_switch at Base 1:2.91.90
- gconf_peditor_new_tree_view at Base 1:2.91.2
- gconf_peditor_widget_set_guard at Base 1:2.91.2
- gconf_property_editor_get_key at Base 1:2.91.2
- gconf_property_editor_get_type at Base 1:2.91.2
- gconf_property_editor_get_ui_control at Base 1:2.91.2
- gconf_value_float_to_int at Base 1:2.91.2
- gconf_value_int_to_float at Base 1:2.91.2

Added: desktop/experimental/gnome-control-center/debian/patches/00git_handle_media_dialog_close.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/00git_handle_media_dialog_close.patch?rev=31147&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/00git_handle_media_dialog_close.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/00git_handle_media_dialog_close.patch [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,0 +1,34 @@
+From ea7a6ef806ac1b148c17d016e4effa6a7b7bee03 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Fri, 23 Sep 2011 20:25:32 -0400
+Subject: [PATCH] media: handle dialog closing consistently
+
+The 'Other media' dialog is just hidden when the close button is
+clicked (so that it can be shown again), but when closing it with
+the Escape key, it gets destroyed and an attempt to bring it up
+again just shows a sad empty little square.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=659940
+
+https://bugzilla.gnome.org/show_bug.cgi?id=659948
+---
+ panels/media/cc-media-panel.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/panels/media/cc-media-panel.c b/panels/media/cc-media-panel.c
+index 96be39c..3f50068 100644
+--- a/panels/media/cc-media-panel.c
++++ b/panels/media/cc-media-panel.c
+@@ -409,6 +409,10 @@ on_extra_options_button_clicked (GtkWidget    *button,
+                     "response",
+                     G_CALLBACK (on_extra_options_dialog_response),
+                     self);
++  g_signal_connect (dialog,
++                    "delete-event",
++                    G_CALLBACK (gtk_widget_hide_on_delete),
++                    NULL);
+   /* update other_application_combo */
+   other_type_combo_box_changed (GTK_COMBO_BOX (combo_box), self);
+   gtk_window_present (GTK_WINDOW (dialog));
+-- 
+1.7.6.2

Modified: desktop/experimental/gnome-control-center/debian/patches/01_menu_category.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/01_menu_category.patch?rev=31147&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/01_menu_category.patch [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/01_menu_category.patch [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,13 +1,13 @@
-Index: gnome-control-center-3.0.2/shell/gnome-control-center.desktop.in.in
-===================================================================
---- gnome-control-center-3.0.2.orig/shell/gnome-control-center.desktop.in.in	2011-09-04 18:34:49.414428107 +0200
-+++ gnome-control-center-3.0.2/shell/gnome-control-center.desktop.in.in	2011-09-04 18:34:53.882449957 +0200
+diff --git a/shell/gnome-control-center.desktop.in.in b/shell/gnome-control-center.desktop.in.in
+index a7160bd..b8c543f 100644
+--- a/shell/gnome-control-center.desktop.in.in
++++ b/shell/gnome-control-center.desktop.in.in
 @@ -5,7 +5,7 @@ Exec=gnome-control-center --overview
  Terminal=false
  Type=Application
  StartupNotify=true
 -Categories=GNOME;GTK;System;
 +Categories=GNOME;GTK;Settings;
- OnlyShowIn=GNOME;
+ OnlyShowIn=GNOME;Unity;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-control-center

Added: desktop/experimental/gnome-control-center/debian/patches/06_handle_passwd_with_ldap.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/06_handle_passwd_with_ldap.patch?rev=31147&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/06_handle_passwd_with_ldap.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/06_handle_passwd_with_ldap.patch [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,0 +1,17 @@
+Description: Handle the case where passwd re-asks for the current password when it was entered incorrectly (when using LDAP)
+ Based on a patch from Ryan Tandy
+Author: Chris Coulson <chris.coulson at canonical.com>
+Bug-Ubuntu: https:/launchpad.net/bugs/607357
+Forwarded: no
+
+--- a/panels/user-accounts/run-passwd.c
++++ b/panels/user-accounts/run-passwd.c
+@@ -408,7 +408,7 @@ io_watch_stdout (GIOChannel *source, GIO
+ 
+                         if (is_string_complete (str->str, "assword: ", "failure", "wrong", "error", NULL)) {
+ 
+-                                if (strstr (str->str, "assword: ") != NULL) {
++                                if (strstr (str->str, "assword: ") != NULL && strstr (str->str, "incorrect") == NULL) {
+                                         /* Authentication successful */
+ 
+                                         passwd_handler->backend_state = PASSWD_STATE_NEW;

Added: desktop/experimental/gnome-control-center/debian/patches/08_dont_crash_on_null_territories.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/08_dont_crash_on_null_territories.patch?rev=31147&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/08_dont_crash_on_null_territories.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/08_dont_crash_on_null_territories.patch [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,0 +1,19 @@
+diff --git a/panels/common/gdm-languages.c b/panels/common/gdm-languages.c
+index 2dfc436..50a1cd6 100644
+--- a/panels/common/gdm-languages.c
++++ b/panels/common/gdm-languages.c
+@@ -635,9 +635,11 @@ count_languages_and_territories (void)
+ 		count++;
+ 		g_hash_table_insert (gdm_language_count_map, g_strdup (locale->language_code), GINT_TO_POINTER (count));
+ 
+-		count = GPOINTER_TO_INT (g_hash_table_lookup (gdm_territory_count_map, locale->territory_code));
+-		count++;
+-		g_hash_table_insert (gdm_territory_count_map, g_strdup (locale->territory_code), GINT_TO_POINTER (count));
++		if (locale->territory_code != NULL) {
++			count = GPOINTER_TO_INT (g_hash_table_lookup (gdm_territory_count_map, locale->territory_code));
++			count++;
++			g_hash_table_insert (gdm_territory_count_map, g_strdup (locale->territory_code), GINT_TO_POINTER (count));
++		}
+         }
+ }
+ 

Modified: desktop/experimental/gnome-control-center/debian/patches/90_force_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/90_force_fallback.patch?rev=31147&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/90_force_fallback.patch [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/90_force_fallback.patch [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,17 +1,17 @@
-Index: gnome-control-center-3.0.2/panels/info/info.ui
+Index: gnome-control-center-3.1.92/panels/info/info.ui
 ===================================================================
---- gnome-control-center-3.0.2.orig/panels/info/info.ui	2011-09-04 14:24:36.525033824 +0200
-+++ gnome-control-center-3.0.2/panels/info/info.ui	2011-09-04 14:24:39.997050810 +0200
-@@ -656,7 +656,7 @@
+--- gnome-control-center-3.1.92.orig/panels/info/info.ui	2011-09-23 18:03:09.000000000 +0200
++++ gnome-control-center-3.1.92/panels/info/info.ui	2011-09-23 18:04:30.684825851 +0200
+@@ -661,7 +661,7 @@
                              </child>
                              <child>
-                               <object class="GtkLabel" id="label16">
+                               <object class="GtkLabel" id="fallback-label">
 -                                <property name="visible">True</property>
 +                                <property name="visible">False</property>
                                  <property name="can_focus">False</property>
                                  <property name="xalign">1</property>
-                                 <property name="label" translatable="yes" comments="Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.">Forced Fallback Mode</property>
-@@ -704,7 +704,7 @@
+                                 <property name="label" translatable="yes" comments="Hardware is not able to run GNOME 3's shell, so we might want to force running the 'Fallback' experience.">Forced _Fallback Mode</property>
+@@ -710,7 +710,7 @@
                              </child>
                              <child>
                                <object class="GtkHBox" id="graphics_fallback_switch_box">

Added: desktop/experimental/gnome-control-center/debian/patches/91_configure_cheese.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/91_configure_cheese.patch?rev=31147&op=file
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/91_configure_cheese.patch (added)
+++ desktop/experimental/gnome-control-center/debian/patches/91_configure_cheese.patch [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 7963abb..b1ca06e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -176,7 +176,7 @@ AC_ARG_WITH([cheese],
+             with_cheese=auto)
+ 
+ if test x"$with_cheese" != x"no" ; then
+-   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
++   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese >= 2.91.91.1 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
+    if test x${have_cheese} = xyes; then
+      AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
+    fi

Modified: desktop/experimental/gnome-control-center/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/patches/series?rev=31147&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/patches/series [utf-8] Sun Oct 30 10:13:07 2011
@@ -1,4 +1,6 @@
+00git_handle_media_dialog_close.patch
 01_menu_category.patch
-02_https.patch
-03_ppd_h.patch
+06_handle_passwd_with_ldap.patch
+08_dont_crash_on_null_territories.patch
 90_force_fallback.patch
+91_configure_cheese.patch




More information about the pkg-gnome-commits mailing list