~ubuntu-branches/ubuntu/precise/gnome-control-center/precise-updates

« back to all changes in this revision

Viewing changes to debian/patches/91_configure_cheese.patch

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha, Ken VanDine
  • Date: 2012-02-15 23:16:31 UTC
  • mfrom: (1.1.56)
  • Revision ID: package-import@ubuntu.com-20120215231631-vk7me0mhofpsq0hp
Tags: 1:3.3.5-0ubuntu1
* Upload the new serie, that will bring in quite some fixes, we revert
  some problematic or risky changes as well
* The new version includes those fixes:
  - "Change Password in User Accounts panel focuses "New password" field, 
     skipping "Current password"" (lp: #821759)
  - The dialog to add online accounts should have a title 
    (lp: #822380)
  - "Remove Profile" button clickable in Color panel when 
     no profile selected (lp: #869603)
  - Move Removable Media into System Info (lp: #835880)
  - Sound preferences: mouse scrolling balance only works for right.
    (lp: #918017)
  - gnome-control-center SIGSEGV in actualize_printers_list() 
    (lp: #903009)
  - selecting preffered applications is not an info (lp: #890143)
  - Add a keyboard shortcut by default for take screenshot of a selection"
    (lp: #625518)
* debian/patches/revert_git_datetime_port.patch:
  - revert use of datetimed, we don't use systemd and ubuntu-system-service 
    doesn't support it yet
* debian/patches/revert_git_drop_library.patch:
  - consolidate "01_allow_external_panels.patch", don't drop the library
    we use it from other components on ubuntu, the patch will be improved
    later to not use a copy of files like it does in that version
* debian/patches/revert_git_stop_using_gconf.patch,
  debian/patches/revert_ua_gsettings.patch,
  debian/patches/revert_git_keyboard_gsettings.patch:
  - revert keyboard porting to gsettings, compiz still use gconf and we
    didn't update gnome-shell to the new serie (yet)

[ Jeremy Bicha ]
* New upstream release (Thanks Rico Tzchichholz!)
* debian/control.in:
  - Bump minimum dependency versions and add libwacom dependency
* debian/rules: Build without -Wl,-z,defs
* debian/watch: Watch for unstable releases
* Refreshed patches:
  - 01_allow_external_panels.patch
  - 04_add_theme_selection.patch
  - 50_ubuntu_systemwide_prefs.patch
  - 58_ubuntu_icon_views_redesign.patch
  - 59_install_gcm_components_on_demand.patch
  - 91_configure_cheese.patch
* Dropped upstream patches:
  - 00git_handle_media_dialog_close.patch
  - 03_show_wacom_under_unity.patch
  - 90_git_sound_tab_order.patch
  - 91_git_build_use_fontconfig.patch
  - 92_git_minimal_output_height.patch
  - 93_change_window_role_on_panel_change.patch
  - 94_git_adding_shortcuts.patch
  - 95_git_ctrlw_shortcut.patch
  - git_extra_keywords.patch

[ Ken VanDine ]
* debian/patches/96_sound_nua_panel.patch
  - refreshed with latest changes from ronoc

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Index: gnome-control-center-3.2.2/configure.ac
 
1
Index: gnome-control-center-3.3.5/configure.ac
2
2
===================================================================
3
 
--- gnome-control-center-3.2.2.orig/configure.ac        2011-11-08 21:23:58.000000000 +0100
4
 
+++ gnome-control-center-3.2.2/configure.ac     2011-11-16 00:01:51.698051793 +0100
5
 
@@ -177,7 +177,7 @@
 
3
--- gnome-control-center-3.3.5.orig/configure.ac        2012-02-12 11:03:42.198272412 -0500
 
4
+++ gnome-control-center-3.3.5/configure.ac     2012-02-12 11:04:07.174396268 -0500
 
5
@@ -191,7 +191,7 @@
6
6
             with_cheese=auto)
7
7
 
8
8
 if test x"$with_cheese" != x"no" ; then
9
 
-   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
10
 
+   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese >= 2.91.91.1 cheese-gtk >= 2.91.91.1, [have_cheese=yes], [have_cheese=no])
 
9
-   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese-gtk >= 3.3.5, [have_cheese=yes], [have_cheese=no])
 
10
+   PKG_CHECK_MODULES(CHEESE, gstreamer-0.10 cheese >= 3.3.5 cheese-gtk >= 3.3.5, [have_cheese=yes], [have_cheese=no])
11
11
    if test x${have_cheese} = xyes; then
12
12
      AC_DEFINE(HAVE_CHEESE, 1, [Define to 1 to enable cheese webcam support])
13
13
    fi