Merge with Debian unstable

Bug #385413 reported by Robert Ancell
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
gnome-control-center (Ubuntu)
Fix Released
Wishlist
Ubuntu Desktop Bugs

Bug Description

Binary package hint: gnome-control-center

Merge with Debian

Changed in gnome-control-center (Ubuntu):
assignee: nobody → Robert Ancell (robert-ancell)
importance: Undecided → Wishlist
status: New → In Progress
Revision history for this message
Robert Ancell (robert-ancell) wrote :
Download full text (4.5 KiB)

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:
      - depen...

Read more...

summary: - Merge with Debian
+ Merge with Debian unstable
Changed in gnome-control-center (Ubuntu):
assignee: Robert Ancell (robert-ancell) → nobody
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks Robert, that seems good, I just did a small change to not move the autostart file which seems a debian unilateral decision and useless delta over GNOME and will upload

Changed in gnome-control-center (Ubuntu):
assignee: nobody → Ubuntu Desktop Bugs (desktop-bugs)
status: In Progress → Fix Committed
Revision history for this message
Launchpad Janitor (janitor) wrote :
Download full text (5.0 KiB)

This bug was fixed in the package gnome-control-center - 1:2.26.0-1ubuntu2

---------------
gnome-control-center (1:2.26.0-1ubuntu2) karmic; urgency=low

  * Upload to karmic
  * debian/capplets-data.install:
    - don't move the autostart to usr, that's a debian unilateral decision and
      should be discussed with upstream rather than distro changed
  * debian/capplets-data.postinst:
    - don't clean the moved file in etc since it's not moved in ubuntu

  [ Robert Ancell ]
  * debian/patches/95_desktop-effects-integration.patch:
    - Check array != NULL before calling g_array_free() (LP: #152844)
  * debian/patches/96_build_sound_capplet.patch:
    - Install 16x16, 22x22 and 32x32 icons (LP: #361425)

gnome-control-center (1:2.26.0-1ubuntu1) karmic; 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/...

Read more...

Changed in gnome-control-center (Ubuntu):
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.