gnome-control-center (1:2.26.0-1ubuntu1) UNRELEASED; urgency=low

  * Merge with Debian unstable, remaining changes: (LP: #385413) 
    - debian/patches/01_fix_libslab_build.patch:
      - Removed
    - debian/patches/01_remove_debian_default_applications.patch:
      - Remove the Debian entries from the default applications.
    - debian/patches/16_preferred_applications_list_cleanup.patch:
      - Don't list mozilla alternative as "Mozilla Mail"    
    - debian/patches/17_default_applications_firefox_3.patch:
      - Use the correct firefox3 icon
    - debian/patches/26_add_touchpad_to_mouse_settings.patch:
      - Recreate touchpad page in glade, the previous file didn't work there
        for some reason; attempt to make a slight UI improvement in the process.
      - Add setting to enable/disable touchpad and callbacks to toggle the
        sensitivity of the other widgets accordingly.
    - debian/patches/28_fixup_touchpad_config.patch:
      - Add touchpad configuration
    - debian/patches/50_ubuntu_systemwide_prefs.patch:
      - Ubuntu specific preferences
    - debian/patches/51_ubuntu_system_keyboard.patch:
      - Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings
    - debian/patches/71_at_properties_gksudo_gdmsetup.patch:
      - Use gksu to run the gdmsetup command
    - debian/patches/80_aspect_in_dropdown.patch:
      - Add aspect ratio to display selection drop-down menu
    - debian/patches/90_gnome-mouse-properties_small_screen.patch:
      - Add scrollbar on small screens in mouse properties
    - debian/patches/91_gnome-about-me_small_screen.patch:
      - Add scrollbar on small screens in about me
    - debian/patches/92_display_properties_fit_small_screen.patch:
      - Make the display properties capplet work correctly on screen which have low vertical resolution
    - debian/patches/95_desktop-effects-integration.patch:
      - Add desktop effects tab to the appearance capplet
    - debian/patches/96_build_sound_capplet.patch:
      - Reinstate upstream-removed sound capplet
    - debian/patches/97_subpixel_hinting_defaults.patch:
      - Change the default hinting level for subpixel rendering from "Full" to "Slight"
    - debian/patches/98_correct_shell_use.patch:
      - Correct shell use to fix build issue
    - debian/patches/70_relibtoolize.patch:
      - Renamed to 99_autoreconf.patch
    - debian/patches/99_autoreconf.patch:
      - Run autoreconf over source
    - debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch:
      - "no gksu/disable-grab option per gui in gnome-at-properties"
    - debian/patches/109_screen_resolution_extra.patch:
      - Automatically configure Virtual setting
    - debian/patches/110_screen_resolution_package.patch:
      - Make it possible to use Synaptic to install screen-resolution-extra from xrandr-capplet.c
    - debian/patches/111_screen_resolution_vendor_fallback.patch:
      - Fallback to vendor utilties if they are available and RR1.2 is not supported by the current driver
    - debian/patches/series: Use cdbs instead of quilt
    - debian/control.in:
      - dependencies?
      - Don't Build-Depends on libslab-dev, type-handling
      - build-depends on librsvg2-dev, libpango1.0-dev, libgnomekbdui-dev
      - gnome-control-center depends on ubuntu-system-service, gconf2-common
      - gnome-control-center recommends mousetweaks, iso-codes
      - gnome-control-center recommends screen-resolution-extra for 109_screen_resolution_extra.patch
      - Tighten the deps between capplets-data and gnome-control-center as
        otherwise Glade / code mismatches can cause breakage: g-c-c depends on
        capplets-data >= source:Version, not just gnome:Version; capplets-data
        breaks g-c-c <x source:Version.
    - debian/capplets-data.gconf-defaults: Don't set a keycode for multimedia keys there, the corresponding schemas
      is in gnome-settings-daemon now and already has keysyms set
    - debian/index.theme: Drop the Debian specific Default theme entry, it's confusing
    - libgnome-window-settings1.install: Handle installed files in wrong directory
    - debian/rules:
      - Use CDBS instead of quilt
      - Install icons for 95_desktop-effects-integration.patch
    - debian/visual-effects*.svg: Icons for 95_desktop-effects-integration.patch
    - debian/watch: Watch for unstable versions

 -- Robert Ancell <email address hidden>  Wed, 10 Jun 2009 10:57:51 +1000