--- gnome-control-center-2.32.1.orig/debian/libgnome-window-settings-dev.install +++ gnome-control-center-2.32.1/debian/libgnome-window-settings-dev.install @@ -0,0 +1,3 @@ +debian/tmp/usr/lib/libgnome-window-settings.so +debian/tmp/usr/include/gnome-window-settings-2.0 +debian/tmp/usr/lib/pkgconfig/gnome-window-settings-2.0.pc --- gnome-control-center-2.32.1.orig/debian/libgnome-window-settings-dev.debhelper.log +++ gnome-control-center-2.32.1/debian/libgnome-window-settings-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.postrm +++ gnome-control-center-2.32.1/debian/gnome-control-center.postrm @@ -0,0 +1,12 @@ +#! /bin/sh +set -e + +case "$1" in +purge) + rm -f /etc/gnome-settings-daemon/xrandr/monitors.xml || true + ;; +*) + ;; +esac + +#DEBHELPER# --- gnome-control-center-2.32.1.orig/debian/control-center2.xpm +++ gnome-control-center-2.32.1/debian/control-center2.xpm @@ -0,0 +1,186 @@ +/* XPM */ +static char *control-center2[] = { +/* columns rows colors chars-per-pixel */ +"32 32 148 2", +" c #000000", +". c #02070C", +"X c #04080A", +"o c #080807", +"O c #0C0C0B", +"+ c #010C16", +"@ c #090C10", +"# c #0C1217", +"$ c #100F0F", +"% c #11100F", +"& c #151514", +"* c #141619", +"= c #17191B", +"- c #191816", +"; c #1B1C1C", +": c #0C263E", +"> c #192023", +", c #1B252D", +"< c #172B3B", +"1 c #192B3C", +"2 c #22211E", +"3 c #232525", +"4 c #242529", +"5 c #21282B", +"6 c #292824", +"7 c #2C2B29", +"8 c #2B2E31", +"9 c #24313F", +"0 c #2D3135", +"q c #2F363B", +"w c #2F393B", +"e c #302E2C", +"r c #34322F", +"t c #333333", +"y c #363B3F", +"u c #3B3A35", +"i c #3A3A39", +"p c #0B2946", +"a c #112C42", +"s c #1E3344", +"d c #1C364C", +"f c #2C3A42", +"g c #343E47", +"h c #2F4658", +"j c #32414B", +"k c #3C4042", +"l c #334453", +"z c #264662", +"x c #304D67", +"c c #395168", +"v c #413D39", +"b c #42413E", +"n c #41484E", +"m c #4A4741", +"M c #4B4945", +"N c #4F4D4A", +"B c #4D565D", +"V c #555146", +"C c #52514F", +"Z c #50585E", +"A c #595754", +"S c #5E5C57", +"D c #585858", +"F c #455767", +"G c #43596A", +"H c #486278", +"J c #5B6869", +"K c #576B76", +"L c #586B79", +"P c #63615D", +"I c #656462", +"U c #6A6760", +"Y c #6B6A65", +"T c #6E6E6C", +"R c #6A737B", +"E c #73716C", +"W c #747370", +"Q c #7E7C74", +"! c #7E7D7A", +"~ c #5D758B", +"^ c #667C8E", +"/ c #637D94", +"( c #6E8395", +") c #6C8499", +"_ c #708597", +"` c #71879B", +"' c #74899A", +"] c #7B8D9D", +"[ c #758DA2", +"{ c #7B93A7", +"} c #86847E", +"| c #858482", +" . c #8A8782", +".. c #8C8A85", +"X. c #8C8C8B", +"o. c #838F9A", +"O. c #80919D", +"+. c #908E86", +"@. c #918F89", +"#. c #94938D", +"$. c #9A968E", +"%. c #999791", +"&. c #9C9A94", +"*. c #8597A6", +"=. c #859AAC", +"-. c #8A99A6", +";. c #899DAF", +":. c #859EB4", +">. c #8DA3B4", +",. c #8FA5B8", +"<. c #99A4AE", +"1. c #97A7B6", +"2. c #90A7B9", +"3. c #9CADBC", +"4. c #A29E97", +"5. c #A5A29B", +"6. c #ACA9A3", +"7. c #B1AFA7", +"8. c #B4B2AB", +"9. c #B9B6AE", +"0. c #BCB9B3", +"q. c #99AEC1", +"w. c #A0B2C2", +"e. c #ACBBC9", +"r. c #BDCBD7", +"t. c #C2BEB2", +"y. c #C6C3BC", +"u. c #CAC6BE", +"i. c #CCC8BE", +"p. c #CCC9C2", +"a. c #D1CDC5", +"s. c #D2CFC8", +"d. c #D4D0C7", +"f. c #D5D2CB", +"g. c #D9D6CD", +"h. c #DCD8CF", +"j. c #D6D5D3", +"k. c #D9D6D1", +"l. c #DDDAD5", +"z. c #DBDCDB", +"x. c #E2DFD7", +"c. c #E1DFDA", +"v. c #E5E2DD", +"b. c #E5E5E2", +"n. c #E9E7E1", +"m. c #EFEEEE", +"M. c #F1F0EC", +"N. c None", +/* pixels */ +"N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N. I W ; N.N.N.N.N.N.N. X # N.N.N.N.N.N.", +"N.N.N.N. - % ..z.8.U & N.N.N.N.N. X B X.t N.N.N.N.N.", +"N.N.N. O o & I y.s.! O N.N.N. F j.z.8.7 N.N.N.N.", +"N.N. A k.8.- N.N. . F k.x.j.7.g o N.N.N.N.", +" N. O O P l.6.O N.N. k z.b.b.l.E @ N.N.N.N.", +" X.&.* C p.t...O N. D m.b.v.#.* N.N.N.N.N.", +" ! z.%.i I l.x.9.| ; o N. T M.l.&.5 N.N.N.N.N.N.", +" & &.b.j.n.x.t.5.y.0.+.m O i g.0.Q t N.N.N.N.N.N.N.", +" & | z.f.#.m S 0.f.s.p.%.r o 3 0.&.e N.N.N.N.N.N.N.", +" o ; 7 $ o v $.g.g.a.i.#.P W - N.N. N.N.N.N.N.N.", +"N. $ Y p.x.p.a.p.$.u o N.N.N.", +"N.N. o v 5.l.l.p.d.a.+.u o N.N.N.", +"N.N.N. O v Y u.v.h.i.d.u.} ; o ", +"N.N.N.N. o C Q 6 r #.x.v.d.i.d.t.U 2 ", +"N.N.N.N.N.N. N. o y R n V V O $ M 0.n.v.i.i.s.8.Y - ", +"N.N.N.N.N.N.N.N. 3 R *.;.{ F 4 ; E f.n.h.i.i.9.%.2 ", +"N.N.N.N.N.N.N. 8 o.] ) ;./ z + t .x.v.8.v &.Y ", +"N.N.N.N.N.N. 0 ] ) [ 2.=.x p + O M 6.0...p.P ", +"N.N.N.N.N. q *.( ' ;.2.c : 1 N. 2 U 4.Q - ", +"N.N.N.N. t *.) [ :.2.H : l 4 N.N. O o ", +"N.N.N. 3 <.' [ >.2.~ : s k O N.N.N. ", +"N.N.N.o R 1.*.q.q./ a 1 g * N.N.N.N.N.N. ", +"N.N.N.* e.e.r.e.) d a g - N.N.N.N.N.N.N.N.N. ", +"N.N. , e.w.3.` h < j ; N.N.N.N.N.N.N.N.N.N.N. ", +"N.N.N.* ] ' / L g f > N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N. 9 G L J w & N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N. @ > ; O N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N. N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.", +"N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N.N." +}; --- gnome-control-center-2.32.1.orig/debian/control.in +++ gnome-control-center-2.32.1/debian/control.in @@ -0,0 +1,121 @@ +Source: gnome-control-center +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: @GNOME_TEAM@ +Standards-Version: 3.8.3 +Build-Depends: cdbs (>= 0.4.41), + hardening-wrapper, + gnome-pkg-tools (>= 0.10), + gnome-common, + quilt, + dpkg-dev (>= 1.13.19), + debhelper (>= 5.0.0), + docbook-to-man, + autotools-dev, + dh-autoreconf, + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.37.1), + libxt-dev, + libx11-dev, + libxss-dev, + libcanberra-gtk-dev, + libgtk2.0-dev (>= 2.20.0), + libglib2.0-dev (>= 2.17.4), + libgconf2-dev, + libgnome-desktop-dev (>= 2.29.4), + libgnome-menu-dev (>= 2.10.1), + libdbus-1-dev (>= 0.32), + libdbus-glib-1-dev (>= 0.32), + libxml2-dev, + libmetacity-dev (>= 1:2.23.1), + gnome-settings-daemon-dev (>= 2.22.0), + libxft-dev (>= 2.1.2), + libxcursor-dev, + libxi-dev (>= 2:1.2), + libgnomekbd-dev (>= 2.31.1), + libxklavier-dev (>= 4.0), + libebook1.2-dev (>= 1.7.90), + libunique-dev, + desktop-file-utils, + shared-mime-info, + scrollkeeper, + librsvg2-dev, + libpango1.0-dev (>= 1.17), + libgstreamer-plugins-base0.10-dev, + libappindicator-dev +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu + +Package: gnome-control-center +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, + ${misc:Depends}, + capplets-data (>= ${source:Version}), + capplets-data (<< ${gnome:NextVersion}), + libgnome-window-settings1 (= ${binary:Version}), + gnome-settings-daemon (>= 2.30), + gnome-menus (>= 2.12.0), + gnome-desktop-data, + gnome-icon-theme (>= 2.24), + desktop-file-utils, + gconf2-common (>= 2.23.2-0ubuntu3), + ubuntu-system-service (>= 0.1.10) +Recommends: bzip2, + evolution-data-server, + gnome-user-guide, + gnome-session, + policykit-1-gnome, + mousetweaks, + iso-codes +Conflicts: gnome-session (<< 2.22.0) +Suggests: libcanberra-gtk-module, + gnome-screensaver | xscreensaver, + x11-xserver-utils, + gstreamer0.10-alsa | gstreamer0.10-audiosink +Description: utilities to configure the GNOME desktop + This package contains configuration applets for the GNOME desktop, + allowing to set accessibility configuration, desktop fonts, keyboard + and mouse properties, sound setup, desktop theme and background, user + interface properties, screen resolution, and other GNOME parameters. + . + It also contains a front end to these applets, which can also be + accessed with the GNOME panel or the Nautilus file manager. + +Package: capplets-data +Architecture: all +Section: gnome +Depends: ${misc:Depends} +Recommends: gnome-control-center (>= ${source:Version}) +Breaks: gnome-control-center (<< ${source:Version}) +Description: configuration applets for GNOME - data files + This package contains data files (icons, pixmaps, locales files) needed by + the configuration applets in the gnome-control-center package. + +Package: libgnome-window-settings1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Utility library for getting window manager settings + This package contains the libwindow-settings library, which is used by + the GNOME window managers. + +Package: libgnome-window-settings-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgnome-window-settings1 (>= ${source:Version}) +Description: Utility library for getting window manager settings (headers) + This package contains the libwindow-settings library header files. + +Package: gnome-control-center-dev +Architecture: all +Section: devel +Conflicts: libgnome-settings-daemon-dev +Replaces: libgnome-settings-daemon-dev +Depends: ${misc:Depends} +Description: utilities to configure the GNOME desktop + This package contains the file required to get the keydirs location --- gnome-control-center-2.32.1.orig/debian/watch +++ gnome-control-center-2.32.1/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://ftp.gnome.org/pub/gnome/sources/gnome-control-center/([\d\.]+)\d/gnome-control-center-([\d\.]+)\.tar\.gz --- gnome-control-center-2.32.1.orig/debian/gnome-keyboard-properties.1 +++ gnome-control-center-2.32.1/debian/gnome-keyboard-properties.1 @@ -0,0 +1,54 @@ +.\" Copyright (C) 2007 Sven Arvidsson +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\"You should have received a copy of the GNU General Public License along +.\"with this program; if not, write to the Free Software Foundation, Inc., +.\"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +.TH gnome-keyboard-properties 1 "2007\-09\-27" "GNOME" +.SH NAME +gnome-keyboard-properties \- manage keyboard behaviour in GNOME +.SH SYNOPSIS +.B gnome-keyboard-properties +.RI [ OPTIONS... ] +.SH DESCRIPTION +Keyboard Preferences manages all settings related to the keyboard in a +GNOME environment. This includes key repeat delay, cursor blinking, +layouts and layout options. You can also configure a typing break +which locks the screen and enforces a break from work. +.SH OPTIONS +.TP +.B \-\-apply +Just apply settings and quit (compatibility only; now handled by daemon) +.TP +.B \-\-init\-session\-settings +Just apply settings and quit (compatibility only; now handled by daemon) +.TP +.B \-\-get\-legacy +Retrieve and store legacy settings +.TP +.B \-\-typing-break +Start the page with the typing break settings showing +.P +This program also accepts the standard GNOME and GTK options. +.SH AUTHORS +.B gnome-keyboard-properties +is written by Jonathan Blandford and others. +.P +This manual page was written by Sven Arvidsson , +for the Debian project (but may be used by others). +.SH SEE ALSO +.BR "gtk-options" (7), +.BR "gnome-options" (7) +.P +The online documentation available through the program's +.I Help +menu. --- gnome-control-center-2.32.1.orig/debian/rules +++ gnome-control-center-2.32.1/debian/rules @@ -0,0 +1,46 @@ +#!/usr/bin/make -f + +export DEB_BUILD_HARDENING=1 + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk +include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk +-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk + +DEB_AUTO_UPDATE_LIBTOOL=pre +DEB_AUTO_UPDATE_ACLOCAL=1.11 +DEB_AUTO_UPDATE_AUTOCONF=1 +DEB_AUTO_UPDATE_AUTOHEADER=1 +DEB_AUTO_UPDATE_AUTOMAKE=1.11 + +GNOME_MODULE := gnome-control-center + +LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \ + --enable-aboutme \ + --enable-gstreamer=0.10 \ + --disable-update-mimedb + +DEB_INSTALL_MANPAGES_gnome-control-center += debian/gnome-control-center.1 + +DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act +DEB_DH_MAKESHLIBS_ARGS_libgnome-window-settings1 = -V "libgnome-window-settings1 (>= 1:2.17.5)" + +build/gnome-control-center:: $(DEB_INSTALL_MANPAGES_gnome-control-center) + +%.1: %.sgml + /usr/bin/docbook-to-man $< >$@ + +clean:: + rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center) + +binary-post-install/capplets-data:: + rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache + rm -rf debian/capplets-data/usr/share/pkgconfig + dh_installmime -p$(cdbs_curpkg) --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.dirs +++ gnome-control-center-2.32.1/debian/gnome-control-center.dirs @@ -0,0 +1 @@ +/etc/gnome-settings-daemon/xrandr --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.postinst +++ gnome-control-center-2.32.1/debian/gnome-control-center.postinst @@ -0,0 +1,7 @@ +#! /bin/sh +set -e + +rm -f /etc/gnome-vfs-2.0/modules/theme-method.conf +rm -f /etc/gnome-vfs-2.0/modules/font-method.conf + +#DEBHELPER# --- gnome-control-center-2.32.1.orig/debian/capplets-data.install +++ gnome-control-center-2.32.1/debian/capplets-data.install @@ -0,0 +1,5 @@ +debian/tmp/etc/gconf +debian/tmp/etc/xdg/autostart +debian/tmp/etc/xdg/menus +debian/tmp/usr/share + --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.sgml +++ gnome-control-center-2.32.1/debian/gnome-control-center.sgml @@ -0,0 +1,313 @@ +Arnaud"> + Patard"> + Mars 22, 2004"> + 1"> + arnaud.patard@rtp-net.org"> + + gnome-control-center"> + + + Debian"> + GNU"> + GPL"> +]> + + + +
+ &dhemail; +
+ + &dhfirstname; + &dhsurname; + + + 2004 + &dhusername; + + &dhdate; + + + &dhucpackage; + + &dhsection; + + + &dhpackage; + + Desktop properties manager + + + + &dhpackage; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DESCRIPTION + + This manual page documents briefly the + &dhpackage; command. + + This manual page was written for the &debian; distribution + because the original program does not have a manual page. + + &dhpackage; is a front-end to configuration applets (capplets) + that lets you configure your GNOME desktop. You may set things such as the background, + the fonts, or the theme + + + + SEE ALSO + gtk-options (7). + + OPTIONS + + These programs follow the usual &gnu; command line syntax, + with long options starting with two dashes (`-'). A summary of + options is included below. + Theses options are mainly the standard command line options of gtk. + + + + + + + Show the help message. + + + + + + + Display brief usage message. + + + + + + + Prevent Gnome Control Center from using Nautilus + + + + + + + Enable Gdk debugging flags. + + + + + + + Disable Gdk debugging flags. + + + + + + + X display to use. + + + + + + + X screen to use. + + + + + + + Make X calls synchronous. + + + + + + + Program name as used by the window manager. + + + + + + + Program class as used by the window manager + + + + + + + Enable Gtk debugging flags. + + + + + + + Disable Gtk debugging flags. + + + + + + + Make all warnings fatal + + + + + + + Load an additional Gtk module. + + + + + + + File descriptor to print IOR on + + + + + + + IID to activate + + + + + + + Prevent registering of server with OAF + + + + + + + Disable sound server usage + + + + + + + Enable sound server usage + + + + + + + Host:port on which the sound server to use is running + + + + + + + Show version. + + + + + + + Specify session management ID + + + + + + + Specify prefix of saved configuration + + + + + + + Disable connection to session manager + + + + + + + Don't show crash dialog box. + + + + + + + AUTHOR + + This manual page was written by &dhusername; &dhemail; for + the &debian; system (but may be used by others). Permission is + granted to copy, distribute and/or modify this document under + the terms of the &gnu; General Public License, Version 2 any + later version published by the Free Software Foundation. + + + On Debian systems, the complete text of the GNU General Public + License can be found in /usr/share/common-licenses/GPL. + + + + + + + + --- gnome-control-center-2.32.1.orig/debian/gnome-control-center-dev.debhelper.log +++ gnome-control-center-2.32.1/debian/gnome-control-center-dev.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.links +++ gnome-control-center-2.32.1/debian/gnome-control-center.links @@ -0,0 +1 @@ +/usr/share/applications/gnomecc.desktop /usr/share/indicators/session/applications/gnomecc.desktop --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.debhelper.log +++ gnome-control-center-2.32.1/debian/gnome-control-center.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- gnome-control-center-2.32.1.orig/debian/capplets-data.debhelper.log +++ gnome-control-center-2.32.1/debian/capplets-data.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- gnome-control-center-2.32.1.orig/debian/control +++ gnome-control-center-2.32.1/debian/control @@ -0,0 +1,126 @@ +# This file is autogenerated. DO NOT EDIT! +# +# Modifications should be made to debian/control.in instead. +# This file is regenerated automatically in the clean target. + +Source: gnome-control-center +Section: gnome +Priority: optional +Maintainer: Ubuntu Desktop Team +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers +Standards-Version: 3.8.3 +Build-Depends: cdbs (>= 0.4.41), + hardening-wrapper, + gnome-pkg-tools (>= 0.10), + gnome-common, + quilt, + dpkg-dev (>= 1.13.19), + debhelper (>= 5.0.0), + docbook-to-man, + autotools-dev, + dh-autoreconf, + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.37.1), + libxt-dev, + libx11-dev, + libxss-dev, + libcanberra-gtk-dev, + libgtk2.0-dev (>= 2.20.0), + libglib2.0-dev (>= 2.17.4), + libgconf2-dev, + libgnome-desktop-dev (>= 2.29.4), + libgnome-menu-dev (>= 2.10.1), + libdbus-1-dev (>= 0.32), + libdbus-glib-1-dev (>= 0.32), + libxml2-dev, + libmetacity-dev (>= 1:2.23.1), + gnome-settings-daemon-dev (>= 2.22.0), + libxft-dev (>= 2.1.2), + libxcursor-dev, + libxi-dev (>= 2:1.2), + libgnomekbd-dev (>= 2.31.1), + libxklavier-dev (>= 4.0), + libebook1.2-dev (>= 1.7.90), + libunique-dev, + desktop-file-utils, + shared-mime-info, + scrollkeeper, + librsvg2-dev, + libpango1.0-dev (>= 1.17), + libgstreamer-plugins-base0.10-dev, + libappindicator-dev +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu + +Package: gnome-control-center +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, + ${misc:Depends}, + capplets-data (>= ${source:Version}), + capplets-data (<< ${gnome:NextVersion}), + libgnome-window-settings1 (= ${binary:Version}), + gnome-settings-daemon (>= 2.30), + gnome-menus (>= 2.12.0), + gnome-desktop-data, + gnome-icon-theme (>= 2.24), + desktop-file-utils, + gconf2-common (>= 2.23.2-0ubuntu3), + ubuntu-system-service (>= 0.1.10) +Recommends: bzip2, + evolution-data-server, + gnome-user-guide, + gnome-session, + policykit-1-gnome, + mousetweaks, + iso-codes +Conflicts: gnome-session (<< 2.22.0) +Suggests: libcanberra-gtk-module, + gnome-screensaver | xscreensaver, + x11-xserver-utils, + gstreamer0.10-alsa | gstreamer0.10-audiosink +Description: utilities to configure the GNOME desktop + This package contains configuration applets for the GNOME desktop, + allowing to set accessibility configuration, desktop fonts, keyboard + and mouse properties, sound setup, desktop theme and background, user + interface properties, screen resolution, and other GNOME parameters. + . + It also contains a front end to these applets, which can also be + accessed with the GNOME panel or the Nautilus file manager. + +Package: capplets-data +Architecture: all +Section: gnome +Depends: ${misc:Depends} +Recommends: gnome-control-center (>= ${source:Version}) +Breaks: gnome-control-center (<< ${source:Version}) +Description: configuration applets for GNOME - data files + This package contains data files (icons, pixmaps, locales files) needed by + the configuration applets in the gnome-control-center package. + +Package: libgnome-window-settings1 +Architecture: any +Section: libs +Depends: ${shlibs:Depends}, + ${misc:Depends} +Description: Utility library for getting window manager settings + This package contains the libwindow-settings library, which is used by + the GNOME window managers. + +Package: libgnome-window-settings-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, + ${misc:Depends}, + libgnome-window-settings1 (>= ${source:Version}) +Description: Utility library for getting window manager settings (headers) + This package contains the libwindow-settings library header files. + +Package: gnome-control-center-dev +Architecture: all +Section: devel +Conflicts: libgnome-settings-daemon-dev +Replaces: libgnome-settings-daemon-dev +Depends: ${misc:Depends} +Description: utilities to configure the GNOME desktop + This package contains the file required to get the keydirs location --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.menu +++ gnome-control-center-2.32.1/debian/gnome-control-center.menu @@ -0,0 +1,4 @@ +?package(gnome-control-center):needs="X11" section="Applications/System/Administration" \ + hints="Gnome" title="Gnome Control Center" \ + icon="/usr/share/pixmaps/control-center2.xpm" \ + command="/usr/bin/gnome-control-center" --- gnome-control-center-2.32.1.orig/debian/changelog +++ gnome-control-center-2.32.1/debian/changelog @@ -0,0 +1,2172 @@ +gnome-control-center (1:2.32.1-0ubuntu8) natty; urgency=low + + * debian/patches/00_git_dont_erase_background_xml.patch: + - from upstream, prevent removing background.xml which removes + manually added backgrounds. (LP: #584054) + Thanks to Kimiko Koopman for backporting it. + + -- Didier Roche Fri, 11 Mar 2011 11:40:00 +0100 + +gnome-control-center (1:2.32.1-0ubuntu7) natty; urgency=low + + * Add debian/gnome-control-center.links: Add gnomecc.desktop to + indicator-session extra menu list. (LP: #727823) + + -- Martin Pitt Fri, 11 Mar 2011 09:22:41 +0100 + +gnome-control-center (1:2.32.1-0ubuntu6) natty; urgency=low + + * Add 53_ubuntu_show_shell.patch: Show gnomecc.desktop, so that we can find + it in Unity. For classic GNOME we will disable it in + /etc/xdg/menus/settings.menu instead. (LP: #727823) + + -- Martin Pitt Mon, 07 Mar 2011 16:50:00 +0100 + +gnome-control-center (1:2.32.1-0ubuntu5) natty; urgency=low + + * debian/{control{,.in},rules}: enable PIE build for security hardening + of font thumbnailer (Closes: #613761). + + -- Kees Cook Wed, 16 Feb 2011 16:43:20 -0800 + +gnome-control-center (1:2.32.1-0ubuntu4) natty; urgency=low + + [ Sebastien Bacher ] + * Drop icons which were used in the desktop effect tab + + [ Dmitry Andreychuk ] + * debian/patches/52_button_layout_from_theme.patch: + - when saving custom theme to file also save current button + layout (LP: #589377) + - process button layout in theme_load_from_gconf() + - fixed copying button layout to custom theme + + -- Ken VanDine Thu, 10 Feb 2011 13:13:30 -0500 + +gnome-control-center (1:2.32.1-0ubuntu3) natty; urgency=low + + * 140_backport_default_internet_apps.patch: + - Backport default Internet app panel from 3.0 to 2.32. This lets one + set the new-style glib url handlers for web and mail. + * 141_set_default_internet_apps.patch: + - On startup, set the web and mail combo boxes to the current glib + value. Patch sent upstream. + * 142_fix_icons_for_default_apps.patch: + - Fix icon handling for web and mail combo boxes. Patch sent upstream. + * 143_write_default_internet_apps_to_gconf.patch: + - Until we update GNOME to 3.0, write back the current glib url + handlers to gconf for apps still directly using such keys rather than + the glib functions for launching apps. + + -- Michael Terry Thu, 06 Jan 2011 10:01:07 -0500 + +gnome-control-center (1:2.32.1-0ubuntu2) natty; urgency=low + + * 95_desktop-effects-integration.patch: drop the desktop effects tab, + the desktop environment selection is made on gdm nowadays and changing the + wm is a techinical task, not something that requires a graphical interface. + The capplet which is being patched for the desktop effects is going to be + deprecated in GNOME3 so in any case that would need to be rewritten. + + -- Sebastien Bacher Mon, 13 Dec 2010 18:39:24 +0100 + +gnome-control-center (1:2.32.1-0ubuntu1) natty; urgency=low + + * New upstream release + * debian/patches/98_fix_dso_linking.patch: + - Remove upstreamed patch + + -- Rodrigo Moya Thu, 18 Nov 2010 10:24:28 +0100 + +gnome-control-center (1:2.32.0-0ubuntu3) natty; urgency=low + + [ Martin Pitt ] + * Drop 109_screen_resolution_extra.patch, + 110_screen_resolution_package.patch, + 111_screen_resolution_vendor_fallback.patch, and drop + screen-resolution-extra recommends. This isn't necessary any more with + XRandR 1.2 capable drivers, and the proprietary fglrx/nvidia ones have + their own control panels. + + [ Didier Roche ] + * debian/patches/95_desktop-effects-integration.patch: + - correctly detect if compiz is running + - link against xcomposite to avoid DSO linking issue + * debian/control.in, debian/rules: + - use dh-autoreconf for previous patch + * debian/patches/98_fix_dso_linking.patch: + - one more dso linking issue + + -- Didier Roche Wed, 10 Nov 2010 16:52:50 +0100 + +gnome-control-center (1:2.32.0-0ubuntu2) maverick; urgency=low + + * Fix LP: #646076 - gnome-display-properties: cannot save systemwide + resolution. Ship /etc/gnome-settings-daemon/xrandr in the package + - add debian/gnome-control-center.dirs + - add debian/gnome-control-center.postrm + + -- Chris Coulson Mon, 04 Oct 2010 17:47:22 +0100 + +gnome-control-center (1:2.32.0-0ubuntu1) maverick; urgency=low + + * New upstream release. + + -- Michael Terry Mon, 27 Sep 2010 10:54:11 -0400 + +gnome-control-center (1:2.31.92.1-0ubuntu1) maverick; urgency=low + + * New upstream release: + - Don't silently ignore errors when pkexec(1) fails (Kalev Lember) + - Use translations from fprintd for finger ops (Bastien Nocera) + - Updated translations + - Add missing include to fix build (Vincent Untz) + + -- Didier Roche Mon, 20 Sep 2010 16:04:44 +0200 + +gnome-control-center (1:2.31.91-0ubuntu2) maverick; urgency=low + + * Fix LP: #631217 - Don't pass an uninitialized GError to + gnome_rr_config_save + - update debian/patches/109_screen_resolution_extra.patch + * Install the gnome-display-properties-install-systemwide helper + - update debian/gnome-control-center.install + * Don't try to apply the monitor configuration twice. Not only is this + not necessary, but it also causes gnome-display-properties to assert + the in apply() when applying the configuration for the second time, + because the DBusGConnection already exists + - update debian/patches/109_screen_resolution_extra.patch + + -- Chris Coulson Thu, 09 Sep 2010 01:06:00 +0100 + +gnome-control-center (1:2.31.91-0ubuntu1) maverick; urgency=low + + [ Robert Ancell ] + * New upstream release + * debian/patches/92_git_correct_escaping.patch: + - Applied upstream + + [ Didier Roche ] + * Readd dropped debian/patches/113_at_properties_add_visual_bell.patch + + -- Didier Roche Fri, 03 Sep 2010 19:12:11 +0200 + +gnome-control-center (1:2.31.90-0ubuntu1) maverick; urgency=low + + * New upstream release + * debian/control: + - Bump build-depends on libgtk2.0-dev, libgnomekbd-dev + * debian/patches/01_ml_po.patch: + * debian/patches/02_use_application_indicator.patch: + - Applied upstream + + -- Robert Ancell Wed, 01 Sep 2010 17:36:06 +1000 + +gnome-control-center (1:2.30.1-1ubuntu3) maverick; urgency=low + + * debian/patches/113_at_properties_add_visual_bell.patch + - Add checkbox to enable visual system bell (LP: #491821) + + -- Mackenzie Morgan Fri, 20 Aug 2010 20:31:34 -0400 + +gnome-control-center (1:2.30.1-1ubuntu2) maverick; urgency=low + + * debian/patches/92_git_correct_escaping.patch: + - git commit to fix an escaping issue, thanks Daniel van Eeden (lp: #428642) + + -- Sebastien Bacher Wed, 04 Aug 2010 18:51:46 +0200 + +gnome-control-center (1:2.30.1-1ubuntu1) maverick; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control.in: + - Rename package from control-center to gnome-control-center + - Build-depend on gnome-common to run autotools + - Don't build-depend on type-handling (?) + - Don't build-depend libxrandr-dev and libxrender-dev (?) + - Don't build-depend on libslab-dev - we aren't using the slab + - Build-depends on librsvg2-dev, libpango1.0-dev, + libgstreamer-plugins-base0.10-dev (?) + - Build-depend on libappindicator-dev for application indicator patch + - Add Vcs-Bzr link + - 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 Wed, 23 Jun 2010 15:59:34 +1000 + +control-center (1:2.30.1-1) unstable; urgency=low + + * New upstream release. + * Update build-dependencies. + * Require g-s-d 2.30. + * 01_fix_libslab_build.patch, 02_xrandr_assert.patch: dropped, merged + upstream. + * 70_relibtoolize.patch: updated for the new version. + * 01_ml_po.patch: new patch. Fix Malayalam translation that causes + GConf errors. + + -- Josselin Mouette Tue, 27 Apr 2010 20:22:38 +0200 + +control-center (1:2.28.1-2) unstable; urgency=low + + * Drop libxxf86misc-dev build-dependency, it is not used. + Closes: #559694. + * 02_xrandr_assert.patch: stolen upstream. Fix assertion when using + mirroring. Closes: #563094. + + -- Josselin Mouette Mon, 04 Jan 2010 18:26:06 +0100 + +control-center (1:2.28.1-1) unstable; urgency=low + + * New upstream release. + - debian/patches/70_relibtoolize.patch: + + Updated. + - debian/control.in: + + Stop build depending on libhal-dev, it's not needed anymore. + * debian/rules: Remove check-dist.mk include to upload to unstable. + + -- Emilio Pozuelo Monfort Thu, 22 Oct 2009 05:11:23 +0200 + +control-center (1:2.28.0-2) experimental; urgency=low + + * Build depend on a recent libslab-dev to build against one that doesn't + use libgnomeui, making gnome-control-center start again. Closes: #550461. + + -- Emilio Pozuelo Monfort Mon, 12 Oct 2009 01:58:10 +0200 + +control-center (1:2.28.0-1) experimental; urgency=low + + [ Loic Minier ] + * Drop --disable-mime-cache configure flag which was introduced in a Debian + specific patch which was dropped in 1:2.18.1-1. + + [ Emilio Pozuelo Monfort ] + * debian/patches/05_ta_po.patch: forwarded, add header. + + [ Josselin Mouette ] + * Require gnome-settings-daemon 2.26. Closes: #540418. + + [ Emilio Pozuelo Monfort ] + * New upstream release. + - debian/control.in: + + Bump libgtk2.0-dev and libgnomekbd-dev build dependencies. + + Build depend on libxklavier-dev >= 4.0 rather than libxklavier12-dev. + + Remove libglade2-dev, libpanel-applet2-dev and libgnomeui-dev build + dependencies. + + Add libunique-dev and libxi-dev build dependencies. + + Remove libpolkit-gnome-dev from build depends, recommend + policykit-1-gnome for PolicyKit 1 support. + - debian/patches/05_ta_po.patch: + + Removed, the issue is no longer present in the po file. + - debian/patches/01_fix_libslab_build.patch: + + Updated from https://bugzilla.gnome.org/show_bug.cgi?id=591428. + - debian/patches/25_window_manager_settings.patch, + debian/patches/70_relibtoolize.patch: + + Updated. + - debian/patches/04_path_xtra.patch: + + Removed, Debian's autoconf patch doesn't patch AC_PATH_XTRA to check + for its arguments anymore, so it's useless. + * debian/rules: + - Stop touching every file, it was done to workaround a broken tarball. + - Include check-dist.mk to avoid uploads to experimental. + * debian/control.in: + - Tighten libgnome-window-settings-dev dependency on the shared library. + - Standards-Version is 3.8.3, no changes needed. + - Remove old conflicts/replaces. + + -- Emilio Pozuelo Monfort Fri, 09 Oct 2009 20:54:05 +0200 + +control-center (1:2.26.0-1) unstable; urgency=low + + * Stop mentioning GNOME 2. + * Remove scrollkeeper dependency. + * New upstream release. + * Update build-dependencies. + * Remove build-deps unneeded thanks to the external libslab: librsvg, + pango. + * 02_build_libgnome.patch, 06_gnomedesktop_api.patch: removed, fixed + upstream. + * 03_a11y_logout.patch: removed, now uses the gnome-session dbus + interface. + * 05_ta_po.patch, 70_relibtoolize.patch: updated for the new version. + * Install the autostart file in /usr/share/gnome/autostart. + * capplets-data.postinst: remove the one in the old location. + + -- Josselin Mouette Fri, 29 May 2009 13:28:19 +0200 + +control-center (1:2.24.0.1-5) unstable; urgency=low + + * Remove useless build-dependency on libeel2-dev. + + -- Josselin Mouette Sat, 25 Apr 2009 13:18:24 +0200 + +control-center (1:2.24.0.1-4) unstable; urgency=low + + * Set the team as primary maintainer. Closes: #523535. + * 02_build_libgnome.patch: new patch. Fix build failure by linking + explicitly to libgnomeui for stuff incorrectly listing gnome-desktop + only as a requirement. Closes: #524308. + * 06_gnomedesktop_api.patch: patch to cope with the API changes in + GnomeRR 2.26. + * 70_relibtoolize.patch: regenerated. + * Bump build-dependency on gnome-desktop to 2.26. + + -- Josselin Mouette Thu, 16 Apr 2009 10:34:54 +0200 + +control-center (1:2.24.0.1-3) unstable; urgency=low + + * capplets-data.gconf-defaults: remove the keybinding settings. Now + that X.org returns correctly the XF86* keys, they must be used + instead. + * Add missing shortcuts for Home and Help. + + -- Josselin Mouette Fri, 10 Apr 2009 20:51:39 +0200 + +control-center (1:2.24.0.1-2) unstable; urgency=low + + [ Josselin Mouette ] + * Depend on gnome-settings-daemon >= 2.24. Closes: #510172. + * Standards version is 3.8.1. + * Upload to unstable. + + [ Emilio Pozuelo Monfort ] + * debian/rules, debian/shlibs.local: Call dh_makeshlibs for libgnome- + window-settings1 instead of using shlibs.local. It was likely + there to workaround dpkg-dev setting ignoring the dependency from + the Depends line and using that of dpkg-shlibdeps, but it's no + longer the case. As a side effect, this makes the shlibs + file be versioned as it should be. + + [ Loic Minier ] + * Demote the scrollkeeper dep of capplets-data to a Suggest on rarian-compat + | scrollkeeper; the scrollkeeper dep seems to have been added around 2002 + due to use of scrollkeeper-update in the postinst. + + -- Josselin Mouette Tue, 07 Apr 2009 09:11:09 +0200 + +control-center (1:2.24.0.1-1) experimental; urgency=low + + * 03_a11y_logout.patch: use gnome-panel-logout for logout when + available. + * New upstream release. + + Correctly sets background without nautilus. Closes: #472902. + + The about-me capplet correctly saves emails. Closes: #350651. + + Resolutions are sorted in the display capplet. Closes: #509899. + * Update build-dependencies. + * Build-depend on libeel 2.24 to build against the experimental + version. + * Suggest libcanberra-gtk-module instead of esound-clients. + * Remove obsolete files: libgnome-settings-daemon-dev.install, + gnome-control-center.dirs. + * Switch to quilt for managing patches; build-depend on quilt. + * 01_fix_libslab_build.patch: updated for the new version. + * 02_xklavier_utf8.patch: dropped, merged upstream + * 25_window_manager_settings.patch: don’t patch the Makefile.in’s. + * 70_relibtoolize.patch: regenerated. + * capplets-data.gconf-defaults: the /music key is renamed to /media. + * Don’t remove the GConf schemas in the installation target. + * *.install: simplify a lot the installation files. + + Remove the pkg-config files in capplets-data. + * Remove -1 suffix in build-deps. + * 99_ltmain_as-needed.patch: make --as-needed work for the library as + well. + * debian/gnome-control-center.postinst: remove gnome-vfs conffiles. + * 05_ta_po.patch: new patch. Fix Tamil translation of the GConf + defaults. + + -- Josselin Mouette Sun, 28 Dec 2008 12:38:50 +0100 + +control-center (1:2.22.2.1-2) unstable; urgency=low + + * 02_xklavier_utf8.patch: patch from upstream to accommodate the UTF8 + changes in libxklavier 3.5-2. + * Standards version is 3.8.0, no changes. + * Suggest x11-xserver-utils for xrdb instead of xbase-clients. + + -- Josselin Mouette Wed, 10 Sep 2008 12:34:52 +0200 + +control-center (1:2.22.2.1-1) unstable; urgency=low + + [ Josselin Mouette ] + * Suggest gstreamer0.10-alsa | gstreamer0.10-audiosink. + Closes: #482794. + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/70_relibtoolize.patch: + - Updated to apply cleanly again. + + debian/rules: + - Run touch on every file to fix up timestamps. + + -- Sebastian Dröge Thu, 29 May 2008 10:32:54 +0200 + +control-center (1:2.22.1-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/70_relibtoolize.patch: + - Updated for the new version. + + -- Sebastian Dröge Wed, 16 Apr 2008 11:03:33 +0200 + +control-center (1:2.22.0-2) unstable; urgency=low + + * Upload to unstable. + * debian/control.in, + debian/gnome-control-center.install: + + Use nautilus 2.20 for now. + + -- Sebastian Dröge Wed, 19 Mar 2008 02:14:49 +0100 + +control-center (1:2.22.0-1) experimental; urgency=low + + * New upstream stable release: + + Upload to experimental first because of intrusive changes. + + gnome-settings-daemon moved to it's own source package. + + Update build dependencies and dependencies. + + -- Sebastian Dröge Sat, 15 Mar 2008 19:06:48 +0100 + +control-center (1:2.20.3-3) unstable; urgency=low + + [ Josselin Mouette ] + * Conflict against gnome-session << 2.20.3-2 because earlier versions + require the dbus service file. + + [ Sebastian Dröge ] + * debian/control.in: + + Build depend on libxklavier12-dev | libxklavier-dev and rebuild against + the new soname. + + -- Sebastian Dröge Thu, 28 Feb 2008 10:03:20 +0100 + +control-center (1:2.20.3-2) unstable; urgency=low + + * capplets-data.install: don’t install the dbus service file, as g-s-d + should not be started through dbus. + * gnome-keyboard-properties.1: + + Fix missing space. + + Fix whatis entry. + * gnome-control-center.dirs: removed. + * Don’t run dh_makeshlibs for g-c-c. + * Update menu entry to the latest menu layout. + + -- Josselin Mouette Sat, 16 Feb 2008 14:58:03 +0100 + +control-center (1:2.20.3-1) unstable; urgency=low + + * New upstream bugfix release. + * debian/control.in: + + Update Standards-Version to 3.7.3, no additional changes needed. + * debian/patches/70_relibtoolize.patch: + + Updated for the new version. + + -- Sebastian Dröge Sat, 12 Jan 2008 07:34:06 +0100 + +control-center (1:2.20.1-2) unstable; urgency=high + + [ Josselin Mouette ] + * 30_pkgconfig-path.patch: provide the path to the + gnome-settings-daemon binary in the pkgconfig file. + + [ Loic Minier ] + * Upload with urgency high as we need this minor change for next + gnome-session. + + -- Loic Minier Tue, 27 Nov 2007 13:57:27 +0100 + +control-center (1:2.20.1-1) unstable; urgency=low + + * New upstream bugfix release: + + debian/patches/70_relibtoolize.patch: + - Regenerated for the new version. + + -- Sebastian Dröge Thu, 25 Oct 2007 19:45:06 +0200 + +control-center (1:2.20.0.1-1) unstable; urgency=low + + [ Loic Minier ] + * gnome-settings-daemon is in /usr/lib/control-center, not + gnome-control-center; closes: #443997. + * Drop the version of the scrollkeeper dependency. + + [ Josselin Mouette ] + * Run dh_installmime for capplets-data, otherwise cdbs runs it before + dh_install. + + [ Sven Arvidsson ] + * Add man page for gnome-keyboard-properties (Closes: #345818) + + [ Sebastian Dröge ] + * New upstream bugfix release: + + debian/patches/70_relibtoolize.patch: + - Updated for the new version. + + -- Sebastian Dröge Fri, 05 Oct 2007 08:45:45 +0200 + +control-center (1:2.20.0-1) unstable; urgency=low + + [ Loic Minier ] + * Bump up gnome-icon-theme dep to >= 2.16 for applications-internet etc. + * Bump up libpango1.0-dev b-dep to >= 1.17 to help experimental's sbuild to + install libgtk2.0-dev >= 2.11. + + [ Sebastian Dröge ] + * New upstream release: + + debian/patches/27_nobashizms.patch: + - Dropped, merged upstream. + + 70_relibtoolize.patch: + - Updated for the new version. + * Upload to unstable, drop check-dist include. + + -- Sebastian Dröge Sat, 22 Sep 2007 11:06:14 +0200 + +control-center (1:2.19.6-1) experimental; urgency=low + + * New upstream development release; no API change. + - Bump up libgtk2.0-dev build-dep to >= 2.11.6. + - Relibtoolize. + - Drop 99_ltmain_as-needed; fails to apply and not easy to update for me. + + -- Loic Minier Fri, 03 Aug 2007 10:28:44 +0200 + +control-center (1:2.19.5-2) experimental; urgency=low + + * Update defaults to string type by explicitely quoting them; + closes: #432933. + + -- Loic Minier Fri, 13 Jul 2007 11:14:52 +0200 + +control-center (1:2.19.5-1) experimental; urgency=low + + [ Josselin Mouette ] + * capplets-data.gconf-defaults: set the default keybindings, formerly + in patches/07_default_keys.patch. + * patches/07_default_keys.patch: removed. + * 99_ltmain_as-needed.patch: get --as-needed back to work. + + [ Loic Minier ] + * Drop DEB_CONFIGURE_LOCALSTATEDIR which seems to be useless since forever. + * Drop Marc Dequènes (Duck) from Uploaders; thanks! + * Cleanups. + * New upstream release series; these are development releases, the API may + still change incompatibly; no API change in this release though. + - Target at experimental; include check-dist. + - Set GNOME_MODULE and update watch and copyright files as the upstream + module was renamed to gnome-control-center; update debian/*.install and + *.links files for new pathnames. + - Update patch 01_fix_libslab_build. + - Update patch 02_xrdb to only patch + gnome-settings-daemon/gnome-settings-xrdb.c (same as Ubuntu package). + - Update patch 09_locate_pointer (from Ubuntu package). + - Drop patch 10_eggaccelerators, merged upstream. + - Drop patch 15_gconf_peditor which has no documentation and seems + completely obsolete. + - Update patch 19_extra_keybindings (from the Ubuntu package). + - Drop patch 24_theme_dont_require_metacity, deprecated with the new + version (from the Ubuntu package). + - Drop patch 36-compiz-keybindings-support, deprecated with the new + version (from the Ubuntu package). + - Update relibtoolizing patch, 70_relibtoolize. + - Drop patch 90_workaround_gnome_doc_utils_bug, workaround not required + anymore. + - Bump up libglib2.0-dev build-dep to >> 2.13. + - Drop private icon dir and png pixmaps from capplets-data.install. + - Drop gnome-font-properties, gnome-background-properties, + gnome-theme-manager, and gnome-ui-properties from + gnome-control-center.install. + - Add a (libxklavier11-dev >= 3.2) build-dep. + - Update GConf defaults for the music and calculator keybindings and bind + the rhythmbox command to the default media player. + - Install gnome-keybindings.pc in libgnome-settings-daemon-dev. + - Misc updates to *.install files. + - New patch, 27_nobashizms, fixes a bashism in gnome-at-commandline; found + in the Ubuntu package. + - Install all files under usr/bin to gnome-control-center to ease handling + of its install file. + + -- Loic Minier Tue, 10 Jul 2007 18:55:45 +0200 + +control-center (1:2.18.1-1) unstable; urgency=low + + [ Marco Cabizza ] + * New upstream release: + - gswitchit should be working as most of the keyboard-releated stuff + has been moved to libgnomekbd ( therefore depending on it ). + - dropping 12_sort_entries.patch, 22_bkg_capplet_follow_symlink.patch, + and 23_menu_files_conflict.patch due to code reorganisation. + - dropping 28_thunderbird-no-compose-flag.patch and + 29_iceweasel-icedove-preferred-apps.patch as they're merged upstream. + - fixing 02_xrdb.patch for the new upstream. + - don't create the libslab* packages, depend on gnome-main-menu's + libslab-dev. + - don't install the control-center schema as it's provided by slab. + * Fixing the .install files. + + [ Riccardo Setti ] + * Built with the libslab-dev package provided by gnome-main-menu + instead of the libslab shipped in the source + - 01_fix_libslab_build.patch + * Removed 06_disable_update_mime_at_install.patch. Use + --disable-update-mimedb directly from the configure switch. + * Updated 04_path_xtra.patch, 02_xrdb.patch + * Added 05_autotools.patch + * Dropped 30_pulseaudio.patch, merged upstream. + * Added 07_default_keys.patch (patch taken from the ubuntu package) + * Added 91_from_svn_fix_gstreamer_warning.patch: + patch from SVN, "Initialise threads early, and fix option context + translation". (patch taken from the ubuntu package) + + [ Loic Minier ] + * Drop commented out DEB_BUILDDIR completely; seems useless; cleanups. + * Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on + cdbs >= 0.4.41. + * New upstream release has API additions in gnome-settings-client.h, bump up + shlibs to >= 2.17.5. + * Suggest xrdb. + * Bump up intltool build-dep to 0.35.5. + * Build-depend on libpango1.0-dev, libgnomekbdui-dev. + * Drop build-dep on liborbit2-dev, libxklavier11-dev. + * Bump up dep on gnome-menus to >= 2.12.0. + * Version the libgnomekbd and libgnomekbdui build-deps to >= 0.1. + * New upstream release; no API change in libgnome-window-settings. + - Apply update to patch 07_default_keys, found in the Ubuntu package. + - Drop patch 91_from_svn_fix_gstreamer_warning, merged upstream. + - Rename patch 05_autotools to 70_relibtoolize and update it. + - New patch, 90_workaround_gnome_doc_utils_bug, works around a build + failure with newer gnome-doc-utils; from the Ubuntu package. + * New patch, 36-compiz-keybindings-support, permits configuring keybindings + when using compiz as window manager; from the Ubuntu package. + * Upload to unstable; drop check-dist include. + * Wrap build-deps and deps. + * Fix URL in copyright. + * Build-depend on scrollkeeper. + + -- Loic Minier Sun, 22 Apr 2007 13:48:12 +0200 + +control-center (1:2.16.3-1) experimental; urgency=low + + [ Sven Arvidsson ] + * New patch, 30_pulseaudio.patch, Polypaudio is now PulseAudio; + thanks Mike Hommey. + + [ Loic Minier ] + * Merge 1:2.14.2-6 and 1:2.14.2-7; SVN r7995:8671. + * New upstream stable release; bug fixes and translations. + - Update patch 25_window_manager_settings. + - Drop patch 30_null-terminate-font-list, merged upstream. + - Update patch 30_pulseaudio. + - Build-depend on scrollkeeper. + + -- Loic Minier Sat, 17 Mar 2007 15:49:26 +0100 + +control-center (1:2.16.2-3) experimental; urgency=low + + * Add a get-orig-source target to retrieve the upstream tarball. + * Include the new check-dist Makefile to prevent accidental uploads to + unstable; bump build-dep on gnome-pkg-tools to >= 0.10. + * Build-depend on libgtk2.0-dev >= 2.10 for multihead support and to build + typing-break which uses GtkStatusIcon, par of the 2.10 API. + * Bump up libgnomeui-dev build-dep to >= 2.16.0-2 to get a Gtk 2.10 + transitionned version. + + -- Loic Minier Sun, 4 Feb 2007 13:22:54 +0100 + +control-center (1:2.16.2-2) experimental; urgency=low + + * Conflict with gnome-session < 2.16. + + -- Josselin Mouette Mon, 27 Nov 2006 20:55:48 +0100 + +control-center (1:2.16.2-1) experimental; urgency=low + + [ Marco Cabizza ] + * New upstream release: + - gnome-settings-daemon doesn't crash anymore, hooray! (Closes: #372873) + - dropping merged patches 26_ignore_pmu_permissions.patch and 27_bzip2.patch + - adapting 19_extra_keybindings.patch + * Bumping dependencies: libgtk2.0-dev, libxklavier11-dev, libebook-dev + * Build-Depends on hal and dbus + * Splitting off some stuff (gnome-window-settings.pc and its headers) into + libgnome-window-settings-dev, and thus including the dbus .service in + capplets-data + * Updated the watch file + + [ Loic Minier ] + * Fix watch file to track stable releases and use HTTP. + + [ Josselin Mouette ] + * Merge 2.14.2-5. + * rules: call clean-la.mk. + * Build-depend on gnome-pkg-tools 0.7. + * 29_iceweasel-icedove-preferred-apps.patch: remove the tons of + useless translations of iceweasel and icedove by themselves. + + -- Josselin Mouette Sun, 26 Nov 2006 21:38:20 +0100 + +control-center (1:2.14.2-7) unstable; urgency=medium + + * Add a get-orig-source target to retrieve the upstream tarball. + * New patch, 30_null-terminate-font-list, fixes crash triggerred by missing + NULL terminator in name list; GNOME #356435. + + -- Loic Minier Mon, 26 Feb 2007 11:00:38 +0100 + +control-center (1:2.14.2-6) unstable; urgency=low + + * Update patch 29_iceweasel-icedove-preferred-apps to drop the -compose + flag, as in 28_thunderbird-no-compose-flag. + + -- Loic Minier Mon, 27 Nov 2006 16:52:30 +0100 + +control-center (1:2.14.2-5) unstable; urgency=low + + * Update patch 29_iceweasel-icedove-preferred-apps to change the mixed case + IceWeasel in Iceweasel. + + -- Loic Minier Sat, 25 Nov 2006 13:34:41 +0100 + +control-center (1:2.14.2-4) unstable; urgency=low + + * New patch, 29_iceweasel-icedove-preferred-apps, to offer IceWeasel and + Icedove in the list of preferred applications; thanks Sven Arvidsson; + closes: #393549. + + -- Loic Minier Sat, 25 Nov 2006 11:41:26 +0100 + +control-center (1:2.14.2-3) unstable; urgency=low + + [ Loic Minier ] + * New patch, 28_thunderbird-no-compose-flag, to fix the way browsers invoke + Thunderbird (drop the -compose flag which is added automatically for + mailto: URLs); thanks Manuel Bilderbeek. (Closes: #380284) + * Recommend gnome-user-guide instead of gnome2-user-guide; thanks Luk Claes. + (Closes: #378718) + + [ Marco Cabizza ] + * Set the correct path for bzip2 adding patches/27_bzip2.patch, and + Recommends: bzip2, (Closes: #378141) + + [ Josselin Mouette ] + * Suggest gnome-screensaver first, xscreensaver second. + * Make libgnome-window-settings-dev tolerate binNMUs. + * Depend on gnome-pkg-tools 0.6. + * Use ${gnome:Version} and ${gnome:NextVersion}. + * Call gnome-version.mk in rules. + + -- Josselin Mouette Fri, 1 Sep 2006 21:24:32 +0200 + +control-center (1:2.14.2-2) unstable; urgency=high + + [ Marco Cabizza ] + * debian/control, debian/control.in: + - libgnome-window-settings1 replaces capplets (Closes: #372804) + + [ Sjoerd Simons ] + * debian/patches/26_ignore_pmu_permissions.patch + - Added. Ignore errors when we can't open or use the pmu device for + brightness settings. A better fix would be to use hal instead. + (Closes: #373146) + + [ Loic Minier ] + * Fix versioned dependency of capplets-data on gnome-control-center. + * Let libgnome-window-settings1 conflict with capplets too. + * Drop capplets Provides. + + -- Loic Minier Fri, 7 Jul 2006 22:28:58 +0200 + +control-center (1:2.14.2-1) unstable; urgency=low + + * New upstream release + * debian/control, debian/control.in: + - libgnome-window-settings1, libgnome-window-settings-dev Replaces + gnome-control-center << 1:2.14.0-1 (Closes: #370211) + - New maintainer + * compat, libgnome-window-settings1.install, gnome-control-center.install: + - Debhelper compatibility is 5 + - Fixed some missing files errors + + -- Marco Cabizza Sun, 28 May 2006 18:53:48 +0200 + +control-center (1:2.14.1-1) unstable; urgency=low + + [ Marco Cabizza ] + * New upstream release. + - fixed the xkb releated bugs (Closes: #348809, #349399, #351798) + - evdev doesn't crash gnome-settings-daemon any more + (Closes: #362107, #362563) + - fixed the gnome-settings-daemon crash at startup (Closes: #347796) + * debian/control, debian/control.in: + - dropped the dependency on xlibs due to its deprecation and since + libxklavier depends on xkb-data (Closes: 342536, #365977) + - standards version is 3.7.2 + - Build-depend on libgtk2.0-dev (>= 2.8.12) and + libgstreamer-plugins-base0.10-dev + * debian/rules: + - append --enable-gstreamer=0.10 to configure + * debian/capplets-data.install: + - added usr/share/desktop-directories to the list + * debian/patches/02_xrdb.patch: + - updated to fit upstream + * debian/patches/08_pmu_fix.patch: + - dropped; already merged upstream + * New packages: + - Move libgnome-window-settings.so.1 in the newly created + libgnome-window-settings1 and add libgnome-window-settings1.shlibs + - Move the libwindow-settings' header files in the newly created + libgnome-window-settings-dev + * debian/patches/25_window_manager_settings.patch: + - rename /usr/lib/window-manager-settings to + /usr/lib/libgnome-window-settings1. + + [ Josselin Mouette ] + * Make the package binNMU-safe. + + Build-depend on dpkg-dev 1.13.19. + + Use ${source:Version}. + + -- Marco Cabizza Sat, 6 May 2006 17:01:39 +0200 + +control-center (1:2.12.3-2) unstable; urgency=medium + + * Build-depend on libxrender-dev, libx11-dev, and libxt-dev explicitely as + these are used in configure.in, fixes FTBFS. + [debian/control, debian/control.in] + * Add missing build-deps on libgconf2-dev, libbonoboui2-dev, libesd0-dev, + libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev. + [debian/control, debian/control.in] + * Fix old changelog entries: + - Fix the bug number closed in 1:2.12.1-2. + - Explain Marillat's joke in 1:2.4.0-8. (Closes: #244288) + + -- Loic Minier Tue, 21 Feb 2006 11:38:12 +0100 + +control-center (1:2.12.3-1) unstable; urgency=low + + * New upstream release. + * Recommend evolution-data-server since gnome-about-me seems to require it. + (Closes: #340419) + [debian/control, debian/control.in] + + -- Loic Minier Mon, 20 Feb 2006 18:27:00 +0100 + +control-center (1:2.12.2-2) unstable; urgency=low + + [ Gustavo Noronha Silva ] + * debian/control.in: + - increased debhelper b-dep to >= 4.1.0, because of cdbs + + [ Josselin Mouette ] + * Rebuild to get rid of libgamin0 dependency (closes: #348347). + + -- Josselin Mouette Mon, 16 Jan 2006 20:47:30 +0100 + +control-center (1:2.12.2-1) unstable; urgency=low + + * New upstream release + * debian/control.in: + - removed duplicated build-dep on libgnome-menu-dev, leaving + the bigger one (>= 2.12), thanks to Kurt Roeckx + for pointing out + + -- Gustavo Noronha Silva Sun, 8 Jan 2006 12:02:37 -0200 + +control-center (1:2.12.1-2) UNRELEASED; urgency=low + + * Only install /usr/share/applications/*.desktop, not + /usr/share/applications in capplets-data, and rm -rf + /usr/share/applications/mimeinfo.cache in + binary-post-install/capplets-data:: to be completely safe (the + update-desktop-database can't be deactivated via configure). + (Closes: #346062) + [debian/capplets-data.install, debian/rules] + + -- Loic Minier Sat, 7 Jan 2006 15:30:16 +0100 + +control-center (1:2.12.1-1) experimental; urgency=low + + [ Loic Minier ] + * New upstream releases. + - Update watch file. [debian/watch] + - Don't run scrollkeeper. [debian/rules] + - Bump libgtk2.0-dev build-dep to >= 2.6.0. + [debian/control, debian/control.in] + - Add a libxft-dev build-dep on >= 2.1.2. + [debian/control, debian/control.in] + - Version libgnome-menu-dev build-dep on >= 2.10.1. + [debian/control, debian/control.in] + - Enable about-me capplet. + . Update configure flags. [debian/rules] + . Add libebook1.2-dev build-dep. [debian/control, debian/control.in] + - Suggest gnome-screensaver. [debian/control, debian/control.in] + * Add CDBS' utils. [debian/rules] + * Don't overwrite DEB_CONFIGURE_EXTRA_FLAGS and + DEB_INSTALL_MANPAGES_gnome-control-center. [debian/rules] + + [ Sjoerd Simons ] + * debian/patches/12_sort_entries.patch + - Updated for new upstream + * debian/patches/20_gswitchit_dont_crash_when_no_xkb_config.patch + - Removed. fixed upstream + * debian/patches/22_bkg_capplet_follow_symlink.patch + - Updated for new upstream (from the ubuntu package) + * debian/patches/23_menu_files_conflict.patch + - Update for new upstream + * debian/patches/99_reautogenization.patch + - Removed + * Updated build-depends + * Install gnome-about-me and the nautilus extensions + * Use upstream versions of gnome-font-viewer.desktop and + themus-theme-applier.desktop + + -- Sjoerd Simons Mon, 21 Nov 2005 18:21:32 +0000 + +control-center (1:2.10.2-1) unstable; urgency=low + + [ Josselin Mouette ] + * Use again --as-needed. + + [ Marc Dequènes (Duck) ] + * New upstream release. + * Applied patch for gnome-font-viewer 'fonts:///' url capability from + Sam Morris (Closes: #316188). + * Fixed 'Apply theme' contextual entry in 'themes://' (corrected + 'debian/themus-theme-applier.desktop') (Closes #298360). + * Regenerated and merged reautogenization patches. + + -- Marc Dequènes (Duck) Fri, 30 Sep 2005 15:08:27 +0200 + +control-center (1:2.10.1-6) unstable; urgency=medium + + * Urgency medium because of FTBFS on sparc and alpha (binutils issue). + * Remove --as-needed from LD_FLAGS. + + -- Loic Minier Wed, 10 Aug 2005 12:48:11 +0200 + +control-center (1:2.10.1-5) unstable; urgency=high + + * Urgency high because of RC bugfix and because this holds the GNOME 2.10 + transition. + * Add missing build-deps on libxss-dev (Closes: #319971) and + libxinerama-dev. + + -- Loic Minier Tue, 26 Jul 2005 09:52:43 +0200 + +control-center (1:2.10.1-4) unstable; urgency=medium + + * Don't overwrite DEB_CONFIGURE_SCRIPT_ENV completely. + * 24_theme_dont_require_metacity.patch: make gnome-theme-manager work + without metacity being installed (closes: #315730). + * Use type-handling's Provides: feature to avoid hacking the control file. + * Remove the capplets package, which doesn't have a purpose anymore. Move + all package contents back to gnome-control-center. + * Remove most Replaces: and Conflicts:, not useful anymore. + * Standards-version is 3.6.2. + + -- Josselin Mouette Sat, 25 Jun 2005 19:11:37 +0200 + +control-center (1:2.10.1-3) unstable; urgency=low + + * Fix menu files conflict (renaming 'preferences.menu' to 'gnome- + preferences.menu') (causing control-center summary window to be + empty). + * Now building in 'debian/build/' directory (cleaner & avoid non- + idempotency hackerie). + * Updated 'debian/copyright' download URL. + * 'debian/rules' spring-cleaning. + + -- Marc Dequènes (Duck) Wed, 15 Jun 2005 00:47:05 +0200 + +control-center (1:2.10.1-2) unstable; urgency=low + + * Upload to unstable (GNOME Team upload) (Closes: #313217). + * Fixed in 2.10 : + + crashes at startup when loading settings (Closes: #251126). + + installing files from ~/.themes fails (Closes: #166983). + + bad icon themes install path (Closes: #257241). + + installing bad theme fails silently (Closes: #166982). + + incorrect position of volume dialog (Closes: #260277). + + cannot turn off sound events (Closes: #216927). + and probably some more... + * Buildsys not idempotent breaking next build because of missing + schema '.in' file worked around in clean rule (GNOME people should + really learn to test before releasing...). + + -- Marc Dequènes (Duck) Sun, 12 Jun 2005 19:43:28 +0200 + +control-center (1:2.10.1-1) experimental; urgency=low + + * New upstream release. + * debian/control.in: + - Updated build-dependencies + * debian/patches: + - 01_gnome-default-applications-properties-structs.c.patch: Removed as + Debian's default applications are included upstream + - 03_gsd_actions_makefile.am.patch: Not more needed + - 05_path_xtra-2.patch: Regenerated + - 06_disable_update_mime_at_install.patch: + - 07_disable_update_mime_at_install-2.patch: + Don't call update-desktop-database + - 11_sleepkey.patch: patch taken to seb128's package to use gdm-signal + - 12_sort_entries.patch: Sort entries in each categories + when suspending from keyboard key + - 21_show_xkb_warning_one_time.patch: should not be needed anymore + - 21_show_xkb_warning_one_time.patch: updated + - 17_locate_pointer.patch: + - 23_infinite_loop_theme_manager.patch: + This upstream version has theses patches + + -- Arnaud Patard Sat, 9 Apr 2005 01:00:12 +0200 + +control-center (1:2.8.2-3) unstable; urgency=medium + + * 20_gswitchit_dont_crash_when_no_xkb_config.patch: + + Reverse a wrong test condition. + + Don't check the "options" key (closes: #296434). + + -- Josselin Mouette Thu, 17 Mar 2005 22:28:32 +0100 + +control-center (1:2.8.2-2) unstable; urgency=low + + * debian/control: + - fixes the Build-Depends (Closes: #299753). + + -- Sebastien Bacher Wed, 16 Mar 2005 23:29:27 +0100 + +control-center (1:2.8.2-1) unstable; urgency=low + + * New upstream version: + - Fix theme thumbnailing + - Fix widget expansion in the keyboard preferences + - Handle backspace in multilayout setups correctly + - theme-thumbnailer doesn't require an absolute path + * debian/patches: + - 05_relibtoolised.patch : Removed as no more accurate + - 06_gst-fix.patch: Merged + - 14_gst-mixer-grab.patch : Merged + - 16_disable_text_editor_tab.patch: Merged + - 18_logout.patch: Merged + - 04_path_xtra.patch: Updated to patch only the configure.in file. The + configure update is now in 05_path_xtra.patch-2.patch + - 23_infinite_loop_theme_manager.patch: Forgotten patch in the 2.8.2 + release + * debian/rules: + - Pass --as-needed to LDFLAGS to reduce dependencies and removes + dependency upon libhowl0. (Closes: 298805) + * debian/control.in: + - Depends on libgnomeui >= 2.8.1-3 to be sure to remove the dependency on + the libhowl0 + + -- Arnaud Patard Wed, 9 Mar 2005 23:18:44 +0100 + +control-center (1:2.8.1-4) unstable; urgency=low + + * debian/patches: + - 17_locate_pointer.patch: fix the "locate pointer" when numlock is + activated. + - 18_logout.patch: fix the logout shortcut (Closes: #289009). + - 01_gnome-default-applications-properties-structs.c.patch: Corrected + Thunderbird command (Closes: #278762) + - Updated 08_pmu_fix.patch with patches from Sjoerd Simons and Sven Luther + as a fix for the pmu error message + - 19_extra_keybindings.patch: Add bindings for calculator and music + multimedia keys (Closes: #291917) + - 20_gswitchit_dont_crash_when_no_xkb_config.patch: Patch from kov to + prevent crash when used remotely (Closes: #286220) + - 21_show_xkb_warning_one_time.patch: Adopt a similar behaviour as for the + xmodmap warning (Closes: #287965) + - 22_bkg_capplet_follow_symlink.patch: Resolv symlink to generate the + thumbnails (Closes: #281657) + + -- Arnaud Patard Sun, 6 Feb 2005 19:13:04 +0100 + +control-center (1:2.8.1-3) unstable; urgency=low + + * debian/rules: + - Corrected erroneous line responsible for not including the .desktop + files (Closes: #274401) + * debian/patches: + - Suppressed 'Text Editor' in the "preferred applications" as it's useless + with the new mime type system. + + -- Arnaud Patard Thu, 25 Nov 2004 21:16:04 +0100 + +control-center (1:2.8.1-2) unstable; urgency=low + + * debian/rules,debian/capplets.install: + - Added manually a .desktop for fontilus taken from Gnome's cvs + (Closes: #274401) + - Added manually a .desktop for themes:///. Thanks to Dan Korostelev + + -- Arnaud Patard Wed, 17 Nov 2004 23:44:21 +0100 + +control-center (1:2.8.1-1) experimental; urgency=low + + * New upstream release + - Some tweaking of the available default applications + - Background capplet fixes + - keyboard patchs + - Patch leak in XKB code + - update translations + * Update the package with the modifications from the 2.6 package + * Added Evolution 2.0 to preferred applications (Closes: 279198) + * debian/patches: + - Removed 13_drw_monitor.patch + - Re-added an updated version of 14_gst-mixer-grab.patch as the bug + isn't fixed upstream + + -- Arnaud Patard Tue, 9 Nov 2004 00:24:23 +0100 + +control-center (1:2.8.0-1) experimental; urgency=low + + * GNOME Team Upload with Rtp's permission. + * New upstream release : + + fix french typo (Closes: #238387) (or even closed in 2.6). + + fix german typo (Closes: #267767) + * Removed 07_acme_position.patch and 11_default_app.patch now + applied upstream. + * Removed part of the 12_custom_browser.patch related to the dead + file-types capplet (due to mime system changes). + * Corrected 'patch unexpectedly ends in middle of line' in + 13_drw_monitor.patch. + * Removed 14_gst-mixer-grab.patch recoded upstream. + * Updated URL in 'debian/copyright'. + * Updated watch file. + * 'debian/control.in' : using ${misc:Depends} and updated versions. + * Added 'autotools-dev' to build dependencies to take advantage of the + CDBS automatic 'config.*' management. + * Regenerated relibtoolize patch. + * As not (yet) DD i'm not listed as GNOME Team member, so adding + myself to Uploaders to avoid this upload to be considered a NMU. + + -- Marc Dequènes (Duck) Wed, 15 Sep 2004 04:20:24 +0200 + +control-center (1:2.6.1-13) unstable; urgency=low + + * debian/patches: + - Added a sanity check on the type of gconf value before calling strcmp in + gconf_property_editor (Closes: #272358) + - Check that one is on a powerpc with a pmu before reporting that's + there is no /dev/pmu in 08_pmu_fix.patch (Closes: #273336) + - Updated 01_gnome-default-applications-properties-structs.c.patch to add + FireFox and ThunderBird (Closes: #265882) + - Added a check on self->priv in 14_gst-mixer-grab.patch in order to + provent a crash if something went wrong during initialiastion + (Closes: #269429) + - Updated 09_locate_pointer.patch XUngrabKeyboard call thanks to Sjoerd + Simons (Closes: #275723) + * debian/control{,.in},debian/rules: + - Patch from Robert Millan to build on kfreebsd-gnu (Closes: #272722) + + -- Arnaud Patard Tue, 12 Oct 2004 13:49:27 +0200 + +control-center (1:2.6.1-12) unstable; urgency=low + + * debian/patches: + - Corrected patch 11_default_app.patch so that it checks the pointer value + before calling strlen (Closes: #264288) + - Added a patch that close the mixer devices after 4s of inactivity + (Closes: #255793) + + -- Arnaud Patard Fri, 13 Aug 2004 12:47:09 +0200 + +control-center (1:2.6.1-11) unstable; urgency=low + + * debian/patches: + - Added a patch for fixing the default applications properties capplet + (Closes: #245237) + - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=123487 for + handling http,https, unknow urls with the custom browser setting + (Closes: #236297) + - Backported a patch from control-center 2.7 for preventing the typing + break to starts while watching a movie with totem + * debian/control.in: + - Updated the libgnomeui-dev build-depends to get gnutls11 + (Closes: #263609) + + -- Arnaud Patard Thu, 5 Aug 2004 17:46:37 +0200 + +control-center (1:2.6.1-10) unstable; urgency=low + + * debian/patch + - Added a patch so that using the 'locate cursor' mouse option doesn't + disable all multimedia keybinding (Closes: #257581) + - Corrected the patch for the pmu by suppressing the wrong test, as + discussed with upstream (Closes: #258105) + - Added a patch from http://bugzilla.gnome.org/show_bug.cgi?id=145271 to + ensure that all keysims in shortcuts exists in the keymap (Closes: 254745) + * debian + - Corrected some errors in the man page. + + -- Arnaud Patard Mon, 12 Jul 2004 23:32:27 +0200 + +control-center (1:2.6.1-9) unstable; urgency=low + + * debian/patch: + - Corrected the patch so that all modified files are in the diff + (Closes: #257352) + - Modified 06_gst-fix.patch to ensure the usage of the first soundcard on + system with multiple soundcards + + -- Arnaud Patard Sat, 3 Jul 2004 12:50:18 +0200 + +control-center (1:2.6.1-8) unstable; urgency=low + + * debian/capplets-data.install: + - Suppressed the line that was reponsible for copying Xresources two times + (Closes: #252324). + * debian/control.in: + - Added libgstreamer-plugins0.8-dev to build-depends + - Added some gstreamer sound plugin for the volume keybindings + * debian/patch: + - Added a patch from Sjoerd Simons to fix the gstreamer volume code + (Closes: #251831,#253416) + - Added a patch for setting the position of the volume window after + showing it (Closes: #254822) + - Added a patch for cleaning error messages for /dev/pmu from + http://bugzilla.gnome.org/show_bug.cgi?id=132655. It will be merged + in 2.7 (Closes: #252460) + + -- Arnaud Patard Thu, 1 Jul 2004 22:16:30 +0200 + +control-center (1:2.6.1-7) unstable; urgency=high + + * debian/control.in: + + removed libgstreamer-plugins0.8-dev from Build-Depends. + + -- Sebastien Bacher Sat, 19 Jun 2004 15:10:37 +0200 + +control-center (1:2.6.1-6) unstable; urgency=high + + * Rebuilt without gstreamer to try to get control-center in testing fast + to fix nautilus' breakage. + + -- Sebastien Bacher Fri, 18 Jun 2004 01:26:12 +0200 + +control-center (1:2.6.1-5) unstable; urgency=low + + * Rebuilt in a pbuilder, fix the crashe due to linkage with both libxft + (Closes: #254076). + + -- Sebastien Bacher Sat, 12 Jun 2004 23:22:42 +0200 + +control-center (1:2.6.1-4) unstable; urgency=low + + * Gnome Team Upload. + * Added a link to the gnome-settings-daemon in /usr/bin (Closes: #251953). + * debian/control.in: + + Depends on xlibs (Closes: #253287). + + Recommends gnome2-user-guide (Closes: #251992). + + -- Sebastien Bacher Thu, 10 Jun 2004 22:28:02 +0200 + +control-center (1:2.6.1-3) unstable; urgency=low + + * debian/rules : + - As gstreamer 0.8 as reached unstable, reactivate the default option to use + it with the keybindings. + * debian/control.in : + - Added build dependency on libgstreamer-plugins0.8-dev + - Removes dependency on libgnome-keyring-dev since no more needed. + - Added libXrandr-dev as build dependency (Closes: #251429). + * debian/patch : + - Added a patch for resolving conflictings ALSA_CFLAGS problems (Closes: + #249357). + - Added a pathc for using Debian's ac_path_xtra + - Modified the patch for relibtoolizing + + -- Arnaud Patard Sat, 29 May 2004 18:01:45 +0200 + +control-center (1:2.6.1-2) unstable; urgency=low + + * GNOME Team Upload. + * Upload in unstable. + + -- Sebastien Bacher Wed, 26 May 2004 17:30:32 +0200 + +control-center (1:2.6.1-1) experimental; urgency=low + + * New upstream release. + - Fix uniqueness test for binding special keys with no name + - Fix theme manager selection when not running metacity + - Match nautilus' interpretation of icons in desktop files + - Add Evolution 1.5 and 1.6 to "Preferred Applications" (Closes: #243973). + * debian/patches: + - Removes patch for keyboards + - Updates patch for libtool + * debian.control: + - Added a dependency on gconf2 for capplets-data (Closes: #243894). + + -- Arnaud Patard Fri, 16 Apr 2004 12:50:54 +0200 + +control-center (1:2.6.0.3-2) experimental; urgency=low + + * debian/patch: + - Added a patch from gnome cvs for fixing issues with multimedia + keybindings (see http://bugs.gnome.org/show_bug.cgi?id=139190). + - Added a patch to regenerate libtool files. + + -- Arnaud Patard Wed, 7 Apr 2004 01:44:10 +0200 + +control-center (1:2.6.0.3-1) experimental; urgency=low + + * New upstream release + - Fix some keyboard problems + (see http://bugzilla.gnome.org/show_bug.cgi?id=138701). + * control.in: + - Added versionning informations on depend for capplets (needed to ensure + having right version of capplets when upgrapding). + + -- Arnaud Patard Sun, 4 Apr 2004 15:39:57 +0200 + +control-center (1:2.6.0.2-1) experimental; urgency=low + + * New Upstream release. + + Disabled GStreamer (as it now depends on it by default and the package + is not yet upgraded) + * control.in: + + Updated dependencies to libnautilus2 2.6.0. + + Added a conflict on acme, since it's now a part of control-center + + Changed the build dependency on libxrender-dev to libxcursor-dev + (Closes #240483) + + -- Arnaud Patard Thu, 1 Apr 2004 00:09:52 +0200 + +control-center (1:2.5.4-1) experimental; urgency=low + + * New maintainer (Closes: #238876) + * New upstream release + - fix implicitly conversion (Closes: #226554). + - support icon themes now (Closes: #215851). + * debian/control.in, debian/rules: + - now, it uses cdbs. + - adapted for the gnome team packaging. + * Modified patch 01_gnome-default-applications-properties-structs.c.patch to + fit with new version. + + -- Arnaud Patard Thu, 25 Mar 2004 00:07:35 +0100 + +control-center (1:2.4.0-9) unstable; urgency=low + + * Debian/control set Maintainer to Debian QA Group + + -- Christian Marillat Sat, 20 Mar 2004 09:34:15 +0100 + +control-center (1:2.4.0-8) unstable; urgency=low + + * You need + * Notes by Loic Minier : the above changelog message was + meant to be some sort of joke, a message split between many source + packages. No actual change besides orphaning was done in this version. + You can read the full story at: + + + -- Christian Marillat Fri, 19 Mar 2004 15:08:21 +0100 + +control-center (1:2.4.0-7) unstable; urgency=low + + * debian/control capplets package need to depends on capplets-data (Closes: #237311) + + -- Christian Marillat Thu, 11 Mar 2004 09:07:06 +0100 + +control-center (1:2.4.0-6) unstable; urgency=low + + * Split the package. The gnome-control-center binary like nautilus is + simply a front-end for capplets, thus move all capplets in a separate + package (capplets) and add a dependency to 'gnome-control-center | + nautilus | gnome-panel' for that package. Also move data files in + capplets-data package. + * Remove /usr/lib/libgnome-window-settings.{a,la,so}, + gnome-window-settings-2.0.pc and include files. These files are not + needed and should not be packaged (Closes: #221283) + + -- Christian Marillat Sun, 29 Feb 2004 17:40:37 +0100 + +control-center (1:2.4.0-5) unstable; urgency=low + + * debian/prerm Unregister schemas file from the database. + * Patch from bugzilla to fix "symlink" in fontilus (Closes: #231639) + + -- Christian Marillat Thu, 12 Feb 2004 14:35:46 +0100 + +control-center (1:2.4.0-4) unstable; urgency=low + + * Move Xresources files in /etc/gnome/config and disable all resources. + + -- Christian Marillat Mon, 27 Oct 2003 15:51:37 +0100 + +control-center (1:2.4.0-3) unstable; urgency=low + + * Update gnome-desktop-data version in Replaces field (Closes: #217284) + + -- Christian Marillat Fri, 24 Oct 2003 18:56:02 +0200 + +control-center (1:2.4.0-2) unstable; urgency=low + + * Suggest xbase-clients for xrdb + * Rebuild to remove liblinc dependency in the -dev package (Closes: #216722) + * Don't package .la files for modules (Closes: #182873) + * Run libtoolize, I don't know but something is broken in the original tarball. + + -- Christian Marillat Tue, 21 Oct 2003 21:56:55 +0200 + +control-center (1:2.4.0-1) unstable; urgency=low + + * New upstream release. + * Conflicts with drwright and fontilus. + * Need to Build-Depends on libnautilus2-dev + * Add gok and gnopernicus in suggests + + -- Christian Marillat Sat, 18 Oct 2003 16:54:45 +0200 + +control-center (1:2.2.2-3) unstable; urgency=low + + * debian/control Should suggests xscreensaver (Closes: #212737) + + -- Christian Marillat Fri, 26 Sep 2003 14:39:18 +0200 + +control-center (1:2.2.2-2) unstable; urgency=low + + * debian/rules fix DEB_BUILD_OPTIONS=noopt (Closes: #199189) + * Don't need to depends on xbase-clients + * Suggests esound-clients (Closes: #205700) + * Create /usr/share/themes/metacity-1 directory to remove warning (Closes: #211182) + * Add hack to remove libtool rpath + * Add libxrender-dev in Builde-Depends + + -- Christian Marillat Sun, 21 Sep 2003 10:17:00 +0200 + +control-center (1:2.2.2-1) unstable; urgency=low + + * New upstream release. + * New patches : + * 02_network-preferences + fix range of proxy port (Closes: #195644) + * 01_gnome-default-applications-properties-structs.c: + add epiphany in ww-browser list (Closes: #192241) + * Add icon for Debian menu + * Fix linkage bug (Closes: #187368) + * debian/control Remove Suggests: xscreensaver-gnome + + -- Christian Marillat Mon, 23 Jun 2003 11:18:45 +0200 + +control-center (1:2.2.1-2) unstable; urgency=low + + * Update section + * Move metacity-properties package in control-center (Closes: #188077) + + -- Christian Marillat Mon, 7 Apr 2003 22:42:55 +0200 + +control-center (1:2.2.1-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 14 Mar 2003 15:17:56 +0100 + +control-center (1:2.2.0.1-1) unstable; urgency=low + + * New upstream release. + * Hack the Icon tag in Advanced.directory (Closes: #179593) + + -- Christian Marillat Wed, 5 Feb 2003 09:49:20 +0100 + +control-center (1:2.2.0-2) unstable; urgency=low + + * Add flex and autotools-dev in Build-Depends (Closes: #178702) + * Move the metacity capplet in a new package metacity-properties + + -- Christian Marillat Thu, 30 Jan 2003 18:40:33 +0100 + +control-center (1:2.2.0-1) unstable; urgency=low + + * New upstream release. + * Add a default theme. Thanks to Johannes Rohr + * Drag and drop for theme work (Closes: #166980) + * Themes aren't sorted case-sensitively (Closes: #166981) + * Should fix key gnome binding properties and metacity key bindings (Closes: #172380) + + -- Christian Marillat Thu, 23 Jan 2003 16:32:09 +0100 + +control-center (1:2.0.3.2-3) unstable; urgency=low + + * Remove duplicate advanced-directory.png + + -- Christian Marillat Sat, 18 Jan 2003 11:54:29 +0100 + +control-center (1:2.0.3.2-2) unstable; urgency=low + + * Use sensible-browser as default browser. + * Add replaces with gnome-desktop-data (Closes: #177141, #176977) + + -- Christian Marillat Fri, 17 Jan 2003 16:10:52 +0100 + +control-center (1:2.0.3.2-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Fri, 20 Dec 2002 13:27:59 +0100 + +control-center (1:2.0.3-2) unstable; urgency=low + + * Should depends on scrollkeeper (Closes: #169850) + + -- Christian Marillat Sun, 24 Nov 2002 16:11:14 +0100 + +control-center (1:2.0.3-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 24 Nov 2002 15:27:52 +0100 + +control-center (1:2.0.2.91-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 17 Nov 2002 00:52:21 +0100 + +control-center (1:2.0.1.1-5) unstable; urgency=low + + * Upload to unstable + * Call scrollkeeper-update with -q (Closes: #166625) + * New upstream release (Closes: #110004) + * keyboard setup are correctly restored (Closes: #156856) + * Bugs related to the old interface (Closes: #62491, #81299, #131440, #71042) + * No more problem when rescaling an image (Closes: #72602) + * Sould build correctly under mips (Closes: #163604) + * Can center large image (Closes: #68651) + + -- Christian Marillat Mon, 28 Oct 2002 11:46:53 +0100 + +control-center (1:2.0.1.1-4) experimental; urgency=low + + * Upload with the new original tarball + + -- Christian Marillat Sun, 29 Sep 2002 17:22:15 +0200 + +control-center2 (1:2.0.1.1-3) experimental; urgency=low + + * Update package veriosn to 1:2.0.1.1-3 to supersedes the unstable version + which is 1:1.4.0.5-6 + + -- Christian Marillat Sat, 28 Sep 2002 20:07:45 +0200 + +control-center2 (2.0.1.1-2) experimental; urgency=low + + * Update to standards version 3.5.7 + * Upload withtout the 2 suffix + + -- Christian Marillat Sat, 28 Sep 2002 18:05:58 +0200 + +control-center2 (2.0.1.1-1) experimental; urgency=low + + * New upstream release. + * Remove fam from recommends should be in libgnomevfs2-0 package. + + -- Christian Marillat Thu, 22 Aug 2002 15:44:13 +0200 + +control-center2 (2.0.1-2) experimental; urgency=low + + * Build against the latest libgnomevfs2-dev 2.0.2-4 + + -- Christian Marillat Fri, 16 Aug 2002 17:44:03 +0200 + +control-center2 (2.0.1-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Wed, 7 Aug 2002 12:33:10 +0200 + +control-center2 (2.0.0-3) experimental; urgency=low + + * Should recommends fame. + + -- Christian Marillat Thu, 25 Jul 2002 15:28:22 +0200 + +control-center2 (2.0.0-2) experimental; urgency=low + + * Add x-terminal-emulator in the list of terminal. + * Build against the latest libzvt + + -- Christian Marillat Sun, 7 Jul 2002 20:44:23 +0200 + +control-center2 (2.0.0-1) experimental; urgency=low + + * New upstream release. + * Add support for DEB_HOST_GNU_TYPE DEB_BUILD_GNU_TYPE and + DEB_BUILD_OPTIONS + + -- Christian Marillat Tue, 18 Jun 2002 12:34:40 +0200 + +control-center2 (1.99.10-2) experimental; urgency=low + + * debian/rules Add GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 in install target. + * Install schemas file in postinst. + * debian/postinst check if schemas files are present before calling + gconftool-2 + * debian/postrm call scrollkeeper-update with -q + * Removed old package in suggests + * Update the menu file with the rigth binary name + + -- Christian Marillat Sun, 9 Jun 2002 20:29:30 +0200 + +control-center2 (1.99.10-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 12 May 2002 14:59:06 +0200 + +control-center2 (1.99.9-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Tue, 30 Apr 2002 10:47:01 +0200 + +control-center2 (1.99.7-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 22 Apr 2002 18:17:28 +0200 + +control-center2 (1.99.6-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 14 Apr 2002 17:43:36 +0200 + +control-center2 (1.99.4-3) experimental; urgency=low + + * Need to Depends on gnome-desktop-data + + -- Christian Marillat Wed, 13 Mar 2002 11:17:58 +0100 + +control-center2 (1.99.4-2) experimental; urgency=low + + * Need to Depends on gnome-session2 (Closes: #137961) + + -- Christian Marillat Wed, 13 Mar 2002 11:05:26 +0100 + +control-center2 (1.99.4-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 11 Mar 2002 14:49:29 +0100 + +control-center2 (1.99.3-2) experimental; urgency=low + + * Remove duplicate session.desktop file. + + -- Christian Marillat Mon, 25 Feb 2002 18:14:07 +0100 + +control-center2 (1.99.3-1) experimental; urgency=low + + * New upstream release + + -- Christian Marillat Fri, 15 Feb 2002 00:35:49 +0100 + +control-center2 (1.99.0-1) experimental; urgency=low + + * New upstream release. + + -- Christian Marillat Sun, 20 Jan 2002 18:08:37 +0100 + +control-center (1:1.5.11-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 17 Dec 2001 17:49:00 +0100 + +control-center (1:1.5.8-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Sat, 6 Oct 2001 19:12:41 +0200 + +control-center (1:1.5.4-1) unstable; urgency=low + + * New upstream release. + * debian/*.sgml Use docbook 4.1 + + -- Christian Marillat Mon, 6 Aug 2001 15:30:44 +0200 + +control-center (1:1.4.0.1-11) unstable; urgency=low + + * Update config.sub and config.guess (Closes: #103733, #103903) + * Remove libtool hack. + + -- Christian Marillat Sun, 8 Jul 2001 11:36:30 +0200 + +control-center (1:1.4.0.1-10) unstable; urgency=low + + * Switch to debhelper V3 + * Change the WPrefs location in WindowMaker.desktop (Closes: #101148) + * Change libraries versionning to (>= 1:1.4.0.1-6) instead of the latest + package number. + + -- Christian Marillat Fri, 22 Jun 2001 16:48:15 +0200 + +control-center (1:1.4.0.1-9) unstable; urgency=low + + * Rewrote the callbacks.c patch (not complete) (Closes: #98085) + + -- Christian Marillat Sun, 20 May 2001 09:36:48 +0200 + +control-center (1:1.4.0.1-8) unstable; urgency=low + + * Depends on gnome-bin (Closes: #97677) + * Depends on xbase-clients + + -- Christian Marillat Fri, 18 May 2001 00:06:13 +0200 + +control-center (1:1.4.0.1-7) unstable; urgency=low + + * Patch callbacks.c to reflect change in the new xscreensaver package (3.32-1) + and update the suggests field. Thaks to Roderich Schupp. (Closes: #96542) + + -- Christian Marillat Sun, 6 May 2001 22:34:12 +0200 + +control-center (1:1.4.0.1-6) unstable; urgency=low + + * Build against the latest gnome-libs 1.2.13-5. + + -- Christian Marillat Tue, 24 Apr 2001 12:39:50 +0200 + +control-center (1:1.4.0.1-5) unstable; urgency=low + + * Typo in build depends (Closes: #93267) + * Rewrote Flame.desktop + + -- Christian Marillat Sat, 14 Apr 2001 15:32:28 +0200 + +control-center (1:1.4.0.1-4) unstable; urgency=low + + * Really add docbook-to-man in build-depends (Closes: #93190) + * Replace libungif3g-dev by libungif4-dev in build-depends (Closes: #93197) + + -- Christian Marillat Sat, 7 Apr 2001 12:18:03 +0200 + +control-center (1:1.4.0.1-3) unstable; urgency=low + + * Remove unused Flame.desktop (Closes: #92850) + * Patch po/Makefile.in.in to use DESTDIR + * Add scrollkeeper in depends (Closes: #93007) + + -- Christian Marillat Thu, 5 Apr 2001 18:30:35 +0200 + +control-center (1:1.4.0.1-2) unstable; urgency=low + + * Add docbook-to-man in build-depends (Closes: #92421) + * Don't compress control-center.sgml (Closes: #92603) + * Call scrollkeeper-update in postinst and prerm for gnome-control-center + + -- Christian Marillat Mon, 2 Apr 2001 21:35:15 +0200 + +control-center (1:1.4.0.1-1) unstable; urgency=low + + * New upstream release. + * Write 12 manpages (Closes: #87098) + + -- Christian Marillat Fri, 30 Mar 2001 19:38:51 +0200 + +control-center (1:1.4.0-1) unstable; urgency=low + + * New upstream release. + * debian/control build-depends on libgnome-vfs-dev and xml-i18n-tools + + -- Christian Marillat Mon, 19 Mar 2001 11:10:30 +0100 + +control-center (1:1.2.4-1) unstable; urgency=low + + * New upstream release. + * Add libgdk-pixbuf-dev in build-depends (Closes: #87416) + * debian/menu The session properties capplet is now on the gnome-core + package, remove this menu entry. + + -- Christian Marillat Thu, 8 Mar 2001 00:12:29 +0100 + +control-center (1:1.2.3-1) unstable; urgency=low + + * New upstream release. + * Removed locale and callback patchs included by upstream. + * No more lockup while closing desktop (Closes: #76215) + + -- Christian Marillat Sun, 18 Feb 2001 15:57:25 +0100 + +control-center (1:1.2.2-10) unstable; urgency=low + + * Build against the latest gnome-libs 1.2.11 + + -- Christian Marillat Mon, 5 Feb 2001 14:53:58 +0100 + +control-center (1:1.2.2-9) unstable; urgency=low + + * Remove xpm4g-dev from Build-depends (Closes: #82556) + + -- Christian Marillat Wed, 17 Jan 2001 10:04:01 +0100 + +control-center (1:1.2.2-8) unstable; urgency=low + + * Patch to show the right debian version (Closes: #82391) + + -- Christian Marillat Mon, 15 Jan 2001 15:35:59 +0100 + +control-center (1:1.2.2-7) unstable; urgency=low + + * Remove imlib-progs from depends. Move gnome-core from depends to Suggests. + + -- Christian Marillat Thu, 30 Nov 2000 11:59:04 +0100 + +control-center (1:1.2.2-6) unstable; urgency=low + + * Change fonts attribute in callback.dpatch (Closes: #75320) + * Install symlinks in /usr/share/doc for -dev package. + + -- Christian Marillat Thu, 2 Nov 2000 17:48:11 +0100 + +control-center (1:1.2.2-5) unstable; urgency=low + + * Patch all capplets to add a call to setlocale(LC_ALL, ""). + + -- Christian Marillat Fri, 20 Oct 2000 15:55:34 +0200 + +control-center (1:1.2.2-4) unstable; urgency=low + + * Add a patch to display russian and other 8 byte character correctly + thanks to ChiDeok Hwang + * New version close this old bug (Closes: #58797) + + -- Christian Marillat Wed, 11 Oct 2000 17:54:29 +0200 + +control-center (1:1.2.2-3) unstable; urgency=low + + * Fix bad symlink in gnome-control-center (Closes: #74279) + + -- Christian Marillat Mon, 9 Oct 2000 15:02:57 +0200 + +control-center (1:1.2.2-2) unstable; urgency=low + + * Arrange documentation for dhelp. + + -- Christian Marillat Fri, 6 Oct 2000 17:09:54 +0200 + +control-center (1:1.2.2-1) unstable; urgency=low + + * Return to the 1.2 branch, because 1.3 is ... + * Switch to debhelper V2. + * New/old GUI (Closes: #71043, #71040, #71039, #71038) + + -- Christian Marillat Mon, 25 Sep 2000 17:33:23 +0200 + +control-center (1.3.0-5) unstable; urgency=low + + * Add debhelper in Build-Depends (Closes: #70220) + * Build against libungif4g (Closes: #71236) + + -- Christian Marillat Sun, 10 Sep 2000 00:48:36 +0200 + +control-center (1.3.0-4) unstable; urgency=low + + * Patch configure to install session-properties-capplet. + + -- Christian Marillat Thu, 24 Aug 2000 20:35:38 +0200 + +control-center (1.3.0-3) unstable; urgency=low + + * Install screensaver-properties.desktop in the right place (Closes: #69502). + * Install Documents.directory and Session.directory files. + + -- Christian Marillat Mon, 21 Aug 2000 00:59:43 +0200 + +control-center (1.3.0-2) unstable; urgency=low + + * debian/control Added imlib-progs in the dependencies field (Closes: #69427). + + -- Christian Marillat Sat, 19 Aug 2000 22:31:37 +0200 + +control-center (1.3.0-1) unstable; urgency=low + + * New upstream release. + + -- Christian Marillat Mon, 14 Aug 2000 15:32:43 +0200 + +control-center (1.2.1-1) unstable; urgency=low + + * New upstrem release. + * debian/patches Added 2 patches for IceWM.desktop and WindowMaker.desktop + (Closes: #47353, #48099). + * New e-mail address. + * Removed 2 undocumented manpages (bell-properties-capplet.1, e-conf.1). + * Removed property-background patche. + * debian/menu removed entry for bell-properties and put all entrys in + System/Gnome. + + -- Christian Marillat Wed, 2 Aug 2000 09:03:59 +0200 + +control-center (1.2.0-2) unstable; urgency=low + + * Updated the Build-depends field. (Closes: #64904) + + -- Christian Marillat Tue, 30 May 2000 10:15:38 +0200 + +control-center (1.2.0-1) unstable; urgency=low + + * New upstream source (Closes: #64584) + * debian/control removed depends libcapplet0 provided by shlibs:Depends. + * Updated Standards-Version to 3.1.1.1 added Build-depends field. + + -- Christian Marillat Thu, 25 May 2000 19:21:14 +0200 + +control-center (1.0.53-1) unstable; urgency=low + + * New upstream source. + + -- Christian Marillat Fri, 31 Mar 2000 11:32:47 +0200 + +control-center (1.0.51-5) frozen unstable; urgency=low + + * debian/copyright updated to the new directory. + + -- Christian Marillat Wed, 22 Mar 2000 23:17:17 +0100 + +control-center (1.0.51-4) frozen unstable; urgency=low + + * Apply a patch I wrote to fix the RCB. Closes: #51568 + * New maintainer. Christian Marillat is taking the package over. + I'm sponsoring him for the moment ... + * Changed the description. Removed the part about beta software. + Closes: #54979 + * Applied the patch for centering the background picture. + Closes: #54285 + * Added patch-on-the-fly support to debian/rules. + + -- Raphael Hertzog Tue, 21 Mar 2000 20:31:20 +0100 + +control-center (1.0.51-3) frozen unstable; urgency=low + + * NMU. + * Fixes RC bug #56769, WindowMaker wm settings fixed. + + -- Chris McKillop Thu, 3 Feb 2000 07:13:39 -0500 + +control-center (1.0.51-2) frozen unstable; urgency=low + + * Orphaned. + + -- Michael Alan Dorman Thu, 3 Feb 2000 07:13:29 -0500 + +control-center (1.0.51-1) unstable; urgency=low + + * Officially claimed as my own. + * libcapplet has been stripped for a while (closes: bug#31245) + * We've updated... (closes: bug#44136) + * Correct xworm definition for screensaver (closes: bug#51514) + * The libc/libglib issues are resolved now (closes: bug#37535) + * control-center is much more stable, and should work with window-maker (closes: bug#38706) + * gnomecc seems to respect current bg color better (closes: bug#38917) + * Couldn't reproduce this error with current versions (closes: bug#38995) + * Invoking individual capplets seems to work now (closes: bug#39135) + * Screensavers seem to be more stable now (closes: bug#41992) + * URL handler assignments seems to work now (closes: bug#44983) + * Fudged dependency on esd to get rid of versioned depends (closes: bug#52353) + * Totally revamped build process (closes: bug#33848, bug#38344) + * Appears to have been fixed (closes: bug#33736, bug#33472)) + + -- Michael Alan Dorman Mon, 20 Dec 1999 14:19:48 -0500 + +control-center (1.0.51-0.2) unstable; urgency=low + + * Fix from Christian Marillat for wm-properties + + -- Michael Alan Dorman Tue, 19 Oct 1999 14:22:43 -0400 + +control-center (1.0.51-0.1) unstable; urgency=low + + * New upstream version. NMU. + + -- Michael Alan Dorman Sun, 10 Oct 1999 16:48:39 -0400 + +control-center (1.0.50-0.1) unstable; urgency=low + + * New upstream version. NMU + + -- Michael Alan Dorman Thu, 30 Sep 1999 22:24:11 -0400 + +control-center (1.0.5-2) unstable; urgency=low + + * Actually changed maintainer address in debian/control + * Fixed up WindowMaker and IceWM paths for wm-properties + + -- Steve Haslam Thu, 27 May 1999 02:05:10 +0100 + +control-center (1.0.5-1) unstable; urgency=low + + * New maintainer. + * Moved "xscreensaver" to "Suggests:" field. (Bug#32724) + * Called dh_strip when making libcapplet-dev + + -- Steve Haslam Thu, 20 May 1999 03:50:25 +0100 + +control-center (1.0.5-0.1) unstable; urgency=low + + * Non-maintainer upload + * New upstream version + + -- Steve Haslam Mon, 19 Apr 1999 10:08:13 +0100 + +control-center (1.0.1-0.1) unstable; urgency=low + + * NMU for GNOME-1.0 + + -- Jules Bean Fri, 5 Mar 1999 10:34:56 +0000 + +control-center (0.99.3-3) unstable; urgency=low + + * Patched to remove #define HAVE_REDHAT_SCREENSAVER_RPM. + Also, added Recommends: xscreensaver + Fixes: BUG#32462 + + -- Jim Pick Wed, 27 Jan 1999 21:40:24 -0800 + +control-center (0.99.3-2) unstable; urgency=low + + * Recompiled due to dependencies. + + -- Jim Pick Sun, 24 Jan 1999 01:11:12 -0800 + +control-center (0.99.3-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 21 Jan 1999 21:31:48 -0800 + +gnome-core (0.30-2) frozen unstable; urgency=low + + * Recompiled with new libs. + * Fixed reference to /usr/X11R6 in README.Debian. + * Added warnings (Gnome is ALPHA). + * Patched dialer_applet to use pon/poff. + * Patched drivemount_applet to default to /floppy. + + -- Jim Pick Tue, 24 Nov 1998 10:56:08 -0800 + +gnome-core (0.30-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 24 Sep 1998 21:28:02 -0700 + +gnome-core (0.28.1-1) unstable; urgency=low + + * New upstream release. + * Hopefully fixes panel applet bug. + + -- Jim Pick Wed, 19 Aug 1998 20:12:25 -0700 + +gnome-core (0.28-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 17 Aug 1998 12:59:26 -0700 + +gnome-core (0.27-1) unstable; urgency=low + + * New upstream release. + * Added /usr/doc/gnome + + -- Jim Pick Sat, 15 Aug 1998 14:21:06 -0700 + +gnome-core (0.25-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Thu, 6 Aug 1998 22:51:22 -0700 + +gnome-core (0.20-2) unstable; urgency=low + + * Added Debian menu-method for gnome-panel. Fixed Bug #24025 + (Thanks to Ray Dassen for reporting the bug, and Riku Voipio + who wrote the menu method for Gnome 0.12) + + -- Jim Pick Wed, 22 Jul 1998 20:22:00 -0700 + +gnome-core (0.20-1) unstable; urgency=low + + * New upstream release. + + -- Jim Pick Mon, 8 Jun 1998 12:00:08 -0700 + +gnome-core (0.13-1) unstable; urgency=low + + * Initial Release. + + -- Jim Pick Mon, 16 Mar 1998 15:27:43 -0800 + + --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.install +++ gnome-control-center-2.32.1/debian/gnome-control-center.install @@ -0,0 +1,3 @@ +debian/control-center2.xpm usr/share/pixmaps +debian/tmp/usr/bin +debian/tmp/usr/sbin --- gnome-control-center-2.32.1.orig/debian/libgnome-window-settings1.debhelper.log +++ gnome-control-center-2.32.1/debian/libgnome-window-settings1.debhelper.log @@ -0,0 +1 @@ +dh_autoreconf_clean --- gnome-control-center-2.32.1.orig/debian/gnome-control-center-dev.install +++ gnome-control-center-2.32.1/debian/gnome-control-center-dev.install @@ -0,0 +1 @@ +debian/tmp/usr/share/pkgconfig --- gnome-control-center-2.32.1.orig/debian/copyright +++ gnome-control-center-2.32.1/debian/copyright @@ -0,0 +1,26 @@ +This package was debianized by Jim Pick jim@jimpick.com on +Sat, 14 Mar 1998 20:12:23 -0800. + +It was downloaded from: + http://ftp.gnome.org/pub/GNOME/sources/gnome-control-center/ + +Copyright: 1998,99,2000 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, + USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + --- gnome-control-center-2.32.1.orig/debian/compat +++ gnome-control-center-2.32.1/debian/compat @@ -0,0 +1 @@ +5 --- gnome-control-center-2.32.1.orig/debian/libgnome-window-settings1.install +++ gnome-control-center-2.32.1/debian/libgnome-window-settings1.install @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libgnome-window-settings.so.* +debian/tmp/usr/lib/libgnome-window-settings1/*.so --- gnome-control-center-2.32.1.orig/debian/gnome-control-center.manpages +++ gnome-control-center-2.32.1/debian/gnome-control-center.manpages @@ -0,0 +1 @@ +debian/gnome-keyboard-properties.1 --- gnome-control-center-2.32.1.orig/debian/patches/03_use_libunique.patch +++ gnome-control-center-2.32.1/debian/patches/03_use_libunique.patch @@ -0,0 +1,165 @@ +Description: Use libunique so only one instance of the about-me capplet is opened +Author: Mikkel Kamstrup Erlandsen +Bug: https://bugs.launchpad.net/bugs/531974 + +=== modified file 'gnome-control-center-2.29.91/capplets/about-me/Makefile.am' +Index: gnome-control-center-2.30.0/capplets/about-me/Makefile.am +=================================================================== +--- gnome-control-center-2.30.0.orig/capplets/about-me/Makefile.am 2009-08-24 12:54:41.000000000 +0200 ++++ gnome-control-center-2.30.0/capplets/about-me/Makefile.am 2010-03-29 17:01:49.013545896 +0200 +@@ -31,7 +31,7 @@ + if BUILD_ABOUTME + bin_PROGRAMS = gnome-about-me + +-gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) ++gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(UNIQUE_LIBS) $(LIBEBOOK_LIBS) + gnome_about_me_LDFLAGS = -export-dynamic + + @INTLTOOL_DESKTOP_RULE@ +@@ -44,6 +44,7 @@ + + INCLUDES = \ + $(GNOMECC_CAPPLETS_CFLAGS) \ ++ $(UNIQUE_CFLAGS) \ + $(LIBEBOOK_CFLAGS) \ + -DDATADIR="\"$(datadir)\"" \ + -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ +Index: gnome-control-center-2.30.0/capplets/about-me/gnome-about-me.c +=================================================================== +--- gnome-control-center-2.30.0.orig/capplets/about-me/gnome-about-me.c 2010-03-29 16:22:56.000000000 +0200 ++++ gnome-control-center-2.30.0/capplets/about-me/gnome-about-me.c 2010-03-29 17:03:35.768549194 +0200 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #define GNOME_DESKTOP_USE_UNSTABLE_API + #include +@@ -835,7 +836,7 @@ + me->disable_fingerprint_button); + } + +-static gint ++static GtkWindow* + about_me_setup_dialog (void) + { + GtkWidget *widget; +@@ -856,7 +857,7 @@ + + if (dialog == NULL) { + about_me_destroy (); +- return -1; ++ return NULL; + } + + me->dialog = dialog; +@@ -891,7 +892,7 @@ + "Evolution Data Server can't handle the protocol")); + g_clear_error (&error); + about_me_destroy (); +- return -1; ++ return NULL; + } + + g_clear_error (&error); +@@ -979,27 +980,80 @@ + + gtk_widget_show_all (main_dialog); + +- return 0; ++ return GTK_WINDOW (main_dialog); ++} ++ ++static UniqueResponse ++message_received_cb (UniqueApp *app, ++ UniqueCommand command, ++ UniqueMessageData *message, ++ guint time, ++ gpointer user_data) ++{ ++ UniqueResponse res; ++ GtkWindow *main_dialog; ++ ++ main_dialog = GTK_WINDOW (user_data); ++ ++ switch (command) { ++ case UNIQUE_ACTIVATE: ++ /* move the main window to the screen that sent us the command */ ++ /* FIXME: This does not appear to be working */ ++ gtk_window_set_screen (main_dialog, ++ unique_message_data_get_screen (message)); ++ ++ gtk_window_present_with_time (main_dialog, time); ++ ++ res = UNIQUE_RESPONSE_OK; ++ break; ++ default: ++ res = UNIQUE_RESPONSE_PASSTHROUGH; ++ break; ++ } ++ ++ return res; + } + + int + main (int argc, char **argv) + { +- int rc = 0; +- ++ GtkWindow *main_dialog; ++ UniqueApp *unique_app; ++ + capplet_init (NULL, &argc, &argv); + + if (!g_thread_supported ()) + g_thread_init (NULL); ++ ++ unique_app = unique_app_new ("org.gnome.gnome-about-me", NULL); ++ if (unique_app_is_running (unique_app)) { ++ int retval = 0; ++ ++ UniqueResponse response; ++ response = unique_app_send_message (unique_app, ++ UNIQUE_ACTIVATE, ++ NULL); ++ retval = (response != UNIQUE_RESPONSE_OK); ++ ++ g_object_unref (unique_app); ++ return retval; ++ } + + dbus_g_object_register_marshaller (fprintd_marshal_VOID__STRING_BOOLEAN, +- G_TYPE_NONE, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_INVALID); ++ G_TYPE_NONE, G_TYPE_STRING, ++ G_TYPE_BOOLEAN, G_TYPE_INVALID); + +- rc = about_me_setup_dialog (); ++ main_dialog = about_me_setup_dialog (); + +- if (rc != -1) { ++ if (main_dialog != NULL) { ++ unique_app_watch_window (unique_app, main_dialog); ++ g_signal_connect (unique_app, "message-received", ++ G_CALLBACK (message_received_cb), main_dialog); + gtk_main (); ++ return 0; ++ } else { ++ g_critical ("Failed to build main dialog"); ++ return 1; + } + +- return rc; + } +Index: gnome-control-center-2.30.0/configure.ac +=================================================================== +--- gnome-control-center-2.30.0.orig/configure.ac 2010-03-29 17:01:08.000000000 +0200 ++++ gnome-control-center-2.30.0/configure.ac 2010-03-29 17:01:49.013545896 +0200 +@@ -125,6 +125,7 @@ + PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES) + PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1) + PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnome-menu unique-1.0) ++PKG_CHECK_MODULES(UNIQUE, unique-1.0) + PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1) + PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0) + PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0) --- gnome-control-center-2.32.1.orig/debian/patches/142_fix_icons_for_default_apps.patch +++ gnome-control-center-2.32.1/debian/patches/142_fix_icons_for_default_apps.patch @@ -0,0 +1,287 @@ +Description: Fix icons for new glib url handlers +Author: Michael Terry +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638775 + +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-05 16:05:40.623854462 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-05 16:12:03.030460004 -0500 +@@ -35,7 +35,7 @@ + + enum + { +- PIXBUF_COL, ++ ICON_COL, + TEXT_COL, + N_COLUMNS + }; +@@ -193,33 +193,6 @@ + gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active); + } + +-static void +-refresh_combo_box_icons (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) +-{ +- GList *entry; +- GnomeDAItem *item; +- GtkTreeModel *model; +- GtkTreeIter iter; +- GdkPixbuf *pixbuf; +- +- for (entry = app_list; entry != NULL; entry = g_list_next (entry)) { +- item = (GnomeDAItem *) entry->data; +- +- model = gtk_combo_box_get_model (combo_box); +- +- if (item->icon_path && gtk_tree_model_get_iter_from_string (model, &iter, item->icon_path)) { +- pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL); +- +- gtk_list_store_set (GTK_LIST_STORE (model), &iter, +- PIXBUF_COL, pixbuf, +- -1); +- +- if (pixbuf) +- g_object_unref (pixbuf); +- } +- } +-} +- + static struct { + const gchar *name; + const gchar *icon; +@@ -246,13 +219,6 @@ + icon = gtk_builder_get_object (capplet->builder, icons[i].name); + set_icon (GTK_IMAGE (icon), theme, icons[i].icon); + } +- +- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); +- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers); +- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players); +- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); +- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats); +- refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); + } + + static void +@@ -397,33 +363,31 @@ + } + + static void +-fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom) ++fill_combo_box (GtkComboBox *combo_box, GList *app_list, gboolean add_custom) + { + GList *entry; + GtkTreeModel *model; + GtkCellRenderer *renderer; + GtkTreeIter iter; +- GdkPixbuf *pixbuf; +- +- if (theme == NULL) { +- theme = gtk_icon_theme_get_default (); +- } + + if (add_custom) { + gtk_combo_box_set_row_separator_func (combo_box, is_separator, + GINT_TO_POINTER (g_list_length (app_list)), NULL); + } + +- model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); ++ model = GTK_TREE_MODEL (gtk_list_store_new (2, G_TYPE_ICON, G_TYPE_STRING)); + gtk_combo_box_set_model (combo_box, model); + + renderer = gtk_cell_renderer_pixbuf_new (); + + /* not all cells have a pixbuf, this prevents the combo box to shrink */ +- gtk_cell_renderer_set_fixed_size (renderer, -1, 22); ++ gtk_cell_renderer_set_fixed_size (renderer, -1, 24); ++ g_object_set (G_OBJECT (renderer), ++ "stock-size", GTK_ICON_SIZE_LARGE_TOOLBAR, ++ NULL); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, +- "pixbuf", PIXBUF_COL, ++ "gicon", ICON_COL, + NULL); + + renderer = gtk_cell_renderer_text_new (); +@@ -436,18 +400,11 @@ + GnomeDAItem *item; + item = (GnomeDAItem *) entry->data; + +- pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL); +- + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, +- PIXBUF_COL, pixbuf, ++ ICON_COL, item->icon, + TEXT_COL, item->name, + -1); +- +- item->icon_path = gtk_tree_model_get_string_from_iter (model, &iter); +- +- if (pixbuf) +- g_object_unref (pixbuf); + } + + if (add_custom) { +@@ -455,7 +412,7 @@ + gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); + gtk_list_store_append (GTK_LIST_STORE (model), &iter); + gtk_list_store_set (GTK_LIST_STORE (model), &iter, +- PIXBUF_COL, NULL, ++ ICON_COL, NULL, + TEXT_COL, _("Custom"), + -1); + } +@@ -528,12 +485,12 @@ + g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); + screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); + +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); ++ fill_combo_box (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); ++ fill_combo_box (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); ++ fill_combo_box (GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); ++ fill_combo_box (GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); ++ fill_combo_box (GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); ++ fill_combo_box (GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); + + set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); + set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c 2011-01-05 16:04:48.644316418 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c 2011-01-05 16:05:40.653854197 -0500 +@@ -79,8 +79,8 @@ + g_free (item->generic.name); + g_free (item->generic.executable); + g_free (item->generic.command); +- g_free (item->generic.icon_name); +- g_free (item->generic.icon_path); ++ if (item->generic.icon) ++ g_object_unref (item->generic.icon); + + g_object_unref (item->app_info); + +@@ -95,8 +95,8 @@ + g_free (item->generic.name); + g_free (item->generic.executable); + g_free (item->generic.command); +- g_free (item->generic.icon_name); +- g_free (item->generic.icon_path); ++ if (item->generic.icon) ++ g_object_unref (item->generic.icon); + + g_free (item); + } +@@ -109,8 +109,8 @@ + g_free (item->generic.name); + g_free (item->generic.executable); + g_free (item->generic.command); +- g_free (item->generic.icon_name); +- g_free (item->generic.icon_path); ++ if (item->generic.icon) ++ g_object_unref (item->generic.icon); + + g_free (item->exec_flag); + +@@ -125,8 +125,8 @@ + g_free (item->generic.name); + g_free (item->generic.executable); + g_free (item->generic.command); +- g_free (item->generic.icon_name); +- g_free (item->generic.icon_path); ++ if (item->generic.icon) ++ g_object_unref (item->generic.icon); + + g_free (item); + } +@@ -139,8 +139,8 @@ + g_free (item->generic.name); + g_free (item->generic.executable); + g_free (item->generic.command); +- g_free (item->generic.icon_name); +- g_free (item->generic.icon_path); ++ if (item->generic.icon) ++ g_object_unref (item->generic.icon); + + g_free (item); + } +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h 2011-01-05 16:04:48.684316062 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h 2011-01-05 16:05:40.653854197 -0500 +@@ -35,8 +35,7 @@ + gchar *name; + gchar *executable; + gchar *command; +- gchar *icon_name; +- gchar *icon_path; ++ GIcon *icon; + }; + + struct _GnomeDASimpleItem { +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c 2011-01-05 16:04:48.624316596 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c 2011-01-05 16:05:40.653854197 -0500 +@@ -152,7 +152,7 @@ + term_item->generic.name = gnome_da_xml_get_string (element, "name"); + term_item->generic.executable = executable; + term_item->generic.command = gnome_da_xml_get_string (element, "command"); +- term_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); ++ term_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); + + term_item->exec_flag = gnome_da_xml_get_string (element, "exec-flag"); + +@@ -173,7 +173,7 @@ + media_item->generic.name = gnome_da_xml_get_string (element, "name"); + media_item->generic.executable = executable; + media_item->generic.command = gnome_da_xml_get_string (element, "command"); +- media_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); ++ media_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); + + media_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); + +@@ -194,7 +194,7 @@ + visual_item->generic.name = gnome_da_xml_get_string (element, "name"); + visual_item->generic.executable = executable; + visual_item->generic.command = gnome_da_xml_get_string (element, "command"); +- visual_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); ++ visual_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); + + visual_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup"); + +@@ -215,7 +215,7 @@ + mobility_item->generic.name = gnome_da_xml_get_string (element, "name"); + mobility_item->generic.executable = executable; + mobility_item->generic.command = gnome_da_xml_get_string (element, "command"); +- mobility_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); ++ mobility_item->generic.icon = g_themed_icon_new (gnome_da_xml_get_string (element, "icon-name")); + + mobility_item->run_at_startup = gnome_da_xml_get_bool (element, "run-at-startup"); + +@@ -246,12 +246,18 @@ + executable = g_app_info_get_executable (app_info); + if (is_executable_valid (executable)) { + GnomeDAURLItem *url_item; ++ GIcon *icon; + + url_item = gnome_da_url_item_new (); + url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); + url_item->generic.executable = g_strdup (executable); + url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); +- url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); ++ ++ icon = g_app_info_get_icon (app_info); ++ if (icon != NULL) { ++ url_item->generic.icon = g_object_ref (icon); ++ } ++ + /* Steal the reference */ + url_item->app_info = app_info; + --- gnome-control-center-2.32.1.orig/debian/patches/51_ubuntu_system_keyboard.patch +++ gnome-control-center-2.32.1/debian/patches/51_ubuntu_system_keyboard.patch @@ -0,0 +1,201 @@ +Description: Implement the global keyboard spec at https://wiki.ubuntu.com/DefaultKeyboardSettings +Author: ? + +Index: gnome-control-center-2.31.90/capplets/keyboard/gnome-keyboard-properties-dialog.ui +=================================================================== +--- gnome-control-center-2.31.90.orig/capplets/keyboard/gnome-keyboard-properties-dialog.ui 2010-09-01 17:42:53.322617002 +1000 ++++ gnome-control-center-2.31.90/capplets/keyboard/gnome-keyboard-properties-dialog.ui 2010-09-01 17:42:55.822617000 +1000 +@@ -710,6 +710,26 @@ + 6 + end + ++ ++ True ++ True ++ True ++ ++ ++ True ++ 4 ++ 4 ++ ++ ++ True ++ Apply System-Wide... ++ ++ ++ ++ ++ ++ ++ + + _Options... + True +Index: gnome-control-center-2.31.90/capplets/keyboard/gnome-keyboard-properties-xkb.c +=================================================================== +--- gnome-control-center-2.31.90.orig/capplets/keyboard/gnome-keyboard-properties-xkb.c 2010-09-01 17:42:53.312617002 +1000 ++++ gnome-control-center-2.31.90/capplets/keyboard/gnome-keyboard-properties-xkb.c 2010-09-01 17:42:55.822617000 +1000 +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + + #include "capplet-util.h" + #include "gconf-property-editor.h" +@@ -124,6 +125,142 @@ + xkb_gconf_client = NULL; + } + ++// mvo: make default entry the system wide default ++static void ++make_default (GtkWidget * button, GtkBuilder * dialog) ++{ ++ GkbdKeyboardConfig kbd; ++ GError *error = NULL; ++ gboolean dbus_ret, res; ++ DBusGConnection *systembus, *sessionbus; ++ DBusGProxy *dbus_proxy; ++ int default_group; ++ gchar model[128] = {0,}; ++ gchar layout[128] = {0,}; ++ gchar variant[128] = {0,}; ++ gchar options[256] = {0,}; ++ ++ // get current settings ++ gkbd_keyboard_config_init (&kbd, xkb_gconf_client, engine); ++ gkbd_keyboard_config_load_from_gconf (&kbd, &initial_config); ++ default_group = gconf_client_get_int(xkb_gconf_client, ++ "/desktop/gnome/peripherals/keyboard/general/defaultGroup", ++ NULL); ++ ++ // convert so that its apprioriate for the dbus backend ++ strncpy(model, kbd.model, sizeof(model)); ++ ++ // Copy GSList layouts and variants into gchar* with commas ++ // Put default layout first - index == -1 ++ gchar* p_variant = variant; ++ gchar* p_layout = layout; ++ GSList* group = kbd.layouts_variants; ++ gint index; ++ for (index = -1; group != NULL; index++) ++ { ++ gchar* data; ++ if (index >= 0) { ++ data = (gchar*) group->data; ++ group = g_slist_next(group); ++ } else ++ data = (gchar*)g_slist_nth_data(group, default_group); ++ if (data == NULL || index == default_group) ++ continue; ++ ++ gchar** layout_variant = g_strsplit(data, "\t", -1); ++ strncpy(p_layout, layout_variant[0], ++ sizeof(layout) - (p_layout-layout+1)*sizeof(gchar)); ++ p_layout += strlen(p_layout); ++ (*p_layout++) = ','; ++ ++ if(g_strv_length(layout_variant) > 1) { ++ p_variant = strncpy(p_variant, layout_variant[1], ++ sizeof(variant) - (p_variant-variant+1)*sizeof(gchar)); ++ p_variant += strlen(p_variant); ++ } ++ (*p_variant++) = ','; ++ ++ g_strfreev(layout_variant); ++ } ++ (*--p_layout) = 0; ++ (*--p_variant) = 0; ++ ++ // build options string ++ GString *options_str = g_string_new(""); ++ GSList *l = kbd.options; ++ if (l && l->data) { ++ gchar** options_v = g_strsplit(l->data,"\t",-1); ++ options_str = g_string_append(options_str, options_v[1]); ++ g_strfreev(options_v); ++ } ++ while(l = g_list_next(l)) { ++ options_str = g_string_append(options_str, ","); ++ gchar** options_v = g_strsplit(l->data,"\t",-1); ++ options_str = g_string_append(options_str, options_v[1]); ++ g_strfreev(options_v); ++ } ++ strncpy(options, options_str->str, sizeof(options)); ++ g_string_free(options_str, TRUE); ++ gkbd_keyboard_config_term (&kbd); ++ ++ // the console does not deal very well with evdev, we let ++ // the auto detection handle this for now ++ if (strcmp(model,"evdev") == 0) ++ strcpy(model,""); ++ ++#if 0 ++ printf("model: %s\n", model); ++ printf("layout: '%s'\n", layout); ++ printf("variant: '%s'\n", variant); ++ printf("options: '%s'\n", options); ++#endif ++ ++ // now do the dbus stuff ++ sessionbus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); ++ if (sessionbus == NULL) { ++ g_printerr ("Failed to open connection to bus: %s\n", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ systembus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); ++ dbus_proxy = dbus_g_proxy_new_for_name (systembus, ++ "com.ubuntu.SystemService", ++ "/", ++ "com.ubuntu.SystemService"); ++ if (dbus_proxy == NULL) { ++ g_printerr ("Failed to get dbus proxy: %s\n", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "set_keyboard", &error, ++ G_TYPE_STRING, model, ++ G_TYPE_STRING, layout, ++ G_TYPE_STRING, variant, ++ G_TYPE_STRING, options, ++ G_TYPE_INVALID, ++ G_TYPE_BOOLEAN, &res, ++ G_TYPE_INVALID); ++ if (!dbus_ret) { ++ if (error->domain == DBUS_GERROR && ++ error->code == DBUS_GERROR_REMOTE_EXCEPTION) ++ g_printerr ("Caught remote method exception %s: %s", ++ dbus_g_error_get_name (error), ++ error->message); ++ else ++ g_printerr ("Error: %s\n", error->message); ++ g_error_free (error); ++ return; ++ } ++ ++ ++ //printf("res: %i\n", res); ++ g_object_unref (dbus_proxy); ++} ++ + static void + reset_to_defaults (GtkWidget * button, GtkBuilder * dialog) + { +@@ -219,6 +356,11 @@ + "toggled", (GCallback) + chk_new_windows_inherit_layout_toggled, dialog); + ++ // mvo: global keyboard setting ++ g_signal_connect (G_OBJECT (WID ("button_make_default")), ++ "clicked", G_CALLBACK (make_default), ++ dialog); ++ + g_signal_connect_swapped (G_OBJECT (WID ("xkb_layout_options")), + "clicked", + G_CALLBACK (xkb_options_popup_dialog), --- gnome-control-center-2.32.1.orig/debian/patches/143_write_default_internet_apps_to_gconf.patch +++ gnome-control-center-2.32.1/debian/patches/143_write_default_internet_apps_to_gconf.patch @@ -0,0 +1,108 @@ +Description: Write new glib url handling values back to gconf for compatibility + This patch can go away in Ubuntu 11.10 because by then, gnome-control-center + will be all gsettings. This is just to provide a bridge between the new glib + and any program still listening to the old gconf values. This only sets the + values, it does not read them. +Author: Michael Terry +Forwarded: not-needed + +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-06 09:04:37.637883006 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-06 09:37:03.383415569 -0500 +@@ -64,6 +64,47 @@ + } + + static void ++web_combo_write_to_gconf (GtkComboBox *combo, GnomeDACapplet *capplet) ++{ ++ guint current_index; ++ ++ current_index = gtk_combo_box_get_active (combo); ++ ++ if (current_index < g_list_length (capplet->web_browsers)) { ++ GnomeDAURLItem *item; ++ GConfChangeSet *cs; ++ gchar *short_browser, *pos; ++ ++ item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index); ++ if (item == NULL) ++ return; ++ ++ cs = gconf_change_set_new (); ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_HTTP_EXEC, item->generic.command); ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, item->generic.command); ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, item->generic.command); ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, item->generic.command); ++ ++ pos = strstr (item->generic.command, " "); ++ if (pos == NULL) ++ short_browser = g_strdup (item->generic.command); ++ else ++ short_browser = g_strndup (item->generic.command, pos - item->generic.command); ++ gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser); ++ g_free (short_browser); ++ ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, FALSE); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, FALSE); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, FALSE); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, FALSE); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, FALSE); ++ gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, FALSE); ++ gconf_client_commit_change_set (capplet->gconf, cs, TRUE, NULL); ++ gconf_change_set_unref (cs); ++ } ++} ++ ++static void + web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) + { + guint current_index; +@@ -84,6 +125,29 @@ + g_error_free (error); + } + } ++ web_combo_write_to_gconf (combo, capplet); ++} ++ ++static void ++mail_combo_write_to_gconf (GtkComboBox *combo, GnomeDACapplet *capplet) ++{ ++ guint current_index; ++ ++ current_index = gtk_combo_box_get_active (combo); ++ ++ if (current_index < g_list_length (capplet->mail_readers)) { ++ GnomeDAURLItem *item; ++ GConfClient *client; ++ ++ item = (GnomeDAURLItem*) g_list_nth_data (capplet->mail_readers, current_index); ++ if (item == NULL) ++ return; ++ ++ client = gconf_client_get_default (); ++ gconf_client_set_string (client, DEFAULT_APPS_KEY_MAILER_EXEC, item->generic.command, NULL); ++ gconf_client_set_bool (client, DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, FALSE, NULL); ++ g_object_unref (client); ++ } + } + + /* FIXME: Refactor these two functions below into one... */ +@@ -106,6 +170,7 @@ + g_warning (_("Error setting default mailer: %s"), error->message); + g_error_free (error); + } ++ mail_combo_write_to_gconf (combo, capplet); + } + + } +@@ -495,6 +560,9 @@ + set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); + set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); + ++ web_combo_write_to_gconf (GTK_COMBO_BOX (capplet->web_combo_box), capplet); ++ mail_combo_write_to_gconf (GTK_COMBO_BOX (capplet->mail_combo_box), capplet); ++ + g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); + g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet); + g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet); --- gnome-control-center-2.32.1.orig/debian/patches/04_keyboard_layout_gconf_names.patch +++ gnome-control-center-2.32.1/debian/patches/04_keyboard_layout_gconf_names.patch @@ -0,0 +1,46 @@ +From c38d135826147ff5a299fcd1ae2398201be71638 Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Wed, 24 Mar 2010 09:16:22 +0100 +Subject: [PATCH] keyboard: Fix layout gconf key initialization for empty variants + +There is currently an inconsistency in how g-keyboard-properties and +gdm/g-s-d's $GDM_KEYBOARD_LAYOUT handle keyboard layouts without variants. +gdm/gsd create them just like "us", while g-k-p creates them as "us\t" after +reordering. + +This causes duplication of layouts when restarting g-s-d, since that will then +add another "us" (since $GDM_KEYBOARD_LAYOUT == "us"). + +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=613775 +Bug-Ubuntu: https://launchpad.net/bugs/460328 +--- + .../keyboard/gnome-keyboard-properties-xkblt.c | 14 ++++++++++---- + 1 files changed, 10 insertions(+), 4 deletions(-) + +Index: gnome-control-center-2.31.90/capplets/keyboard/gnome-keyboard-properties-xkblt.c +=================================================================== +--- gnome-control-center-2.31.90.orig/capplets/keyboard/gnome-keyboard-properties-xkblt.c 2010-08-17 02:46:46.000000000 +1000 ++++ gnome-control-center-2.31.90/capplets/keyboard/gnome-keyboard-properties-xkblt.c 2010-09-01 17:39:26.502617000 +1000 +@@ -95,12 +95,18 @@ + GCONF_VALUE_STRING, NULL); + if (retval == NULL) { + GSList *cur_layout; ++ gchar *layout; ++ int len; + + for (cur_layout = initial_config.layouts_variants; +- cur_layout != NULL; cur_layout = cur_layout->next) +- retval = +- g_slist_prepend (retval, +- g_strdup (cur_layout->data)); ++ cur_layout != NULL; cur_layout = cur_layout->next) { ++ layout = g_strdup (cur_layout->data); ++ /* chop off empty variants to avoid duplicates */ ++ len = strlen (layout); ++ if (layout[len - 1] == '\t') ++ layout[len - 1] = '\0'; ++ retval = g_slist_prepend (retval, layout); ++ } + + retval = g_slist_reverse (retval); + } --- gnome-control-center-2.32.1.orig/debian/patches/141_set_default_internet_apps.patch +++ gnome-control-center-2.32.1/debian/patches/141_set_default_internet_apps.patch @@ -0,0 +1,53 @@ +Description: When starting up, read current web and mail values +Author: Michael Terry +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=638771 + +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-05 15:02:37.406338902 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-05 15:02:44.836276440 -0500 +@@ -111,6 +111,34 @@ + } + + static void ++set_combo_to_default_for_scheme (GtkComboBox *combo, GList *handlers, const gchar *scheme) ++{ ++ GAppInfo *type_default; ++ GList *l; ++ int index; ++ ++ type_default = g_app_info_get_default_for_uri_scheme (scheme); ++ index = 0; ++ ++ if (type_default == NULL) ++ return; ++ ++ for (l = handlers; l != NULL; l = l->next) { ++ GnomeDAURLItem *handler = l->data; ++ if (g_app_info_equal(handler->app_info, type_default)) { ++ break; ++ } ++ ++index; ++ } ++ ++ if (l != NULL) { ++ gtk_combo_box_set_active (combo, index); ++ } ++ ++ g_object_unref (type_default); ++} ++ ++static void + media_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) + { + guint current_index; +@@ -507,6 +535,9 @@ + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); + fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); + ++ set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, "http"); ++ set_combo_to_default_for_scheme (GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, "mailto"); ++ + g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); + g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet); + g_signal_connect (capplet->term_combo_box, "changed", G_CALLBACK (terminal_combo_changed_cb), capplet); --- gnome-control-center-2.32.1.orig/debian/patches/00_git_dont_erase_background_xml.patch +++ gnome-control-center-2.32.1/debian/patches/00_git_dont_erase_background_xml.patch @@ -0,0 +1,46 @@ +diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance-desktop.c gnome-control-center-2.32.0.new/capplets/appearance/appearance-desktop.c +--- a/capplets/appearance/appearance-desktop.c 2010-09-21 08:54:55.000000000 -0400 ++++ b/capplets/appearance/appearance-desktop.c 2010-11-05 20:51:53.867234128 -0400 +@@ -1225,6 +1225,7 @@ desktop_init (AppearanceData *data, + GtkCellRenderer *cr; + char *url; + ++ data->wp_xml_list_loaded = FALSE; + data->wp_update_gconf = TRUE; + + data->wp_uris = NULL; +diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/appearance.h gnome-control-center-2.32.0.new/capplets/appearance/appearance.h +--- a/capplets/appearance/appearance.h 2010-09-21 08:54:55.000000000 -0400 ++++ b/capplets/appearance/appearance.h 2010-11-05 20:51:58.050214779 -0400 +@@ -41,6 +41,7 @@ typedef struct + + /* desktop */ + GHashTable *wp_hash; ++ gboolean wp_xml_list_loaded; + gboolean wp_update_gconf; + GtkIconView *wp_view; + GtkTreeModel *wp_model; +diff -rupN gnome-control-center-2.32.0.old/capplets/appearance/gnome-wp-xml.c gnome-control-center-2.32.0.new/capplets/appearance/gnome-wp-xml.c +--- a/capplets/appearance/gnome-wp-xml.c 2010-09-21 08:54:55.000000000 -0400 ++++ b/capplets/appearance/gnome-wp-xml.c 2010-11-05 20:54:03.198634367 -0400 +@@ -378,6 +378,8 @@ void gnome_wp_xml_load_list (AppearanceD + gnome_wp_xml_load_from_dir (WALLPAPER_DATADIR, data); + + gnome_wp_load_legacy (data); ++ ++ data->wp_xml_list_loaded = TRUE; + } + + static void gnome_wp_list_flatten (const gchar * key, GnomeWPItem * item, +@@ -394,6 +396,11 @@ void gnome_wp_xml_save_list (AppearanceD + GSList * list = NULL; + gchar * wpfile; + ++ if (!data->wp_xml_list_loaded) { ++ g_hash_table_destroy (data->wp_hash); ++ return; ++ } ++ + g_hash_table_foreach (data->wp_hash, + (GHFunc) gnome_wp_list_flatten, &list); + g_hash_table_destroy (data->wp_hash); --- gnome-control-center-2.32.1.orig/debian/patches/99_ltmain_as-needed.patch +++ gnome-control-center-2.32.1/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: gnome-control-center-2.31.90/ltmain.sh +=================================================================== +--- gnome-control-center-2.31.90.orig/ltmain.sh 2010-08-17 02:32:10.000000000 +1000 ++++ gnome-control-center-2.31.90/ltmain.sh 2010-09-01 17:43:07.392617000 +1000 +@@ -4716,6 +4716,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -5067,6 +5072,15 @@ + lib= + found=no + case $deplib in ++ -Wl,--as-needed) ++ if test "$linkmode,$pass" = "prog,link"; then ++ compile_deplibs="$deplib $compile_deplibs" ++ finalize_deplibs="$deplib $finalize_deplibs" ++ else ++ deplibs="$deplib $deplibs" ++ fi ++ continue ++ ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" --- gnome-control-center-2.32.1.orig/debian/patches/91_gnome-about-me_small_screen.patch +++ gnome-control-center-2.32.1/debian/patches/91_gnome-about-me_small_screen.patch @@ -0,0 +1,89 @@ +Descrption: Add scrollbar on small screens in about me +Author: ? + +Index: gnome-control-center-2.30.1/capplets/about-me/gnome-about-me.c +=================================================================== +--- gnome-control-center-2.30.1.orig/capplets/about-me/gnome-about-me.c 2010-06-23 16:16:52.988187001 +1000 ++++ gnome-control-center-2.30.1/capplets/about-me/gnome-about-me.c 2010-06-23 16:17:11.008187001 +1000 +@@ -860,6 +860,81 @@ + return NULL; + } + ++ if (gdk_screen_get_default () != NULL && gdk_screen_get_height (gdk_screen_get_default ()) <= 600) { ++ GtkWidget *scrolledWindow1024x600, *viewport; ++ GtkWidget *dialogWindow = NULL; ++ GtkWidget *child, *mother, *childtablabel, *childmenulabel; ++ gchar* childlabeltext; ++ int pagenum; ++ ++ /* add scrolledbar to vbox57 */ ++ child = GTK_WIDGET (gtk_builder_get_object (dialog, "vbox57")); ++ if (child != NULL) { ++ mother = gtk_widget_get_parent (child); ++ pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (mother), child); ++ childtablabel = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mother), child); ++ childmenulabel = gtk_notebook_get_menu_label (GTK_NOTEBOOK (mother), child); ++ childlabeltext = g_strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (child))); ++ scrolledWindow1024x600 = gtk_scrolled_window_new (NULL, NULL); ++ if (scrolledWindow1024x600 != NULL) { ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow1024x600), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ } ++ viewport = gtk_viewport_new (NULL, NULL); ++ gtk_container_add (GTK_CONTAINER (scrolledWindow1024x600), GTK_WIDGET (viewport)); ++ gtk_widget_show (scrolledWindow1024x600); ++ gtk_widget_show (viewport); ++ gtk_widget_reparent (GTK_WIDGET (child), GTK_WIDGET (viewport)); ++ gtk_notebook_insert_page_menu (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600), NULL, childmenulabel, pagenum); ++ gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600), childlabeltext); ++ } ++ /* add scrolledbar to vbox60 */ ++ child = GTK_WIDGET (gtk_builder_get_object (dialog, "vbox60")); ++ if (child != NULL) { ++ mother = gtk_widget_get_parent (child); ++ pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (mother), child); ++ childtablabel = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mother), child); ++ childmenulabel = gtk_notebook_get_menu_label (GTK_NOTEBOOK (mother), child); ++ childlabeltext = g_strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (child))); ++ scrolledWindow1024x600 = gtk_scrolled_window_new (NULL, NULL); ++ if (scrolledWindow1024x600 != NULL) { ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow1024x600), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ } ++ viewport = gtk_viewport_new (NULL, NULL); ++ gtk_container_add (GTK_CONTAINER (scrolledWindow1024x600), GTK_WIDGET (viewport)); ++ gtk_widget_show (scrolledWindow1024x600); ++ gtk_widget_show (viewport); ++ gtk_widget_reparent (GTK_WIDGET (child), GTK_WIDGET (viewport)); ++ gtk_notebook_insert_page_menu (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600), NULL, childmenulabel, pagenum); ++ gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600), childlabeltext); ++ } ++ /* add scrolledbar to vbox59 */ ++ child = GTK_WIDGET (gtk_builder_get_object (dialog, "vbox59")); ++ if (child != NULL) { ++ mother = gtk_widget_get_parent (child); ++ pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (mother), child); ++ childtablabel = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mother), child); ++ childmenulabel = gtk_notebook_get_menu_label (GTK_NOTEBOOK (mother), child); ++ childlabeltext = g_strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (child))); ++ scrolledWindow1024x600 = gtk_scrolled_window_new (NULL, NULL); ++ if (scrolledWindow1024x600 != NULL) { ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow1024x600), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ } ++ viewport = gtk_viewport_new (NULL, NULL); ++ gtk_container_add (GTK_CONTAINER (scrolledWindow1024x600), GTK_WIDGET (viewport)); ++ gtk_widget_show (scrolledWindow1024x600); ++ gtk_widget_show (viewport); ++ gtk_widget_reparent (GTK_WIDGET (child), GTK_WIDGET (viewport)); ++ gtk_notebook_insert_page_menu (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600), NULL, childmenulabel, pagenum); ++ gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600), childlabeltext); ++ gtk_widget_set_size_request (scrolledWindow1024x600, -1, 200); ++ } ++ /* set default size of dialog smaller */ ++ dialogWindow = GTK_WIDGET (gtk_builder_get_object (dialog, "about-me-dialog")); ++ if (dialogWindow != NULL) { ++ gtk_window_set_default_size (GTK_WINDOW (dialogWindow), -1, 448); ++ } ++ } ++ + me->dialog = dialog; + + /* Connect the close button signal */ --- gnome-control-center-2.32.1.orig/debian/patches/113_at_properties_add_visual_bell.patch +++ gnome-control-center-2.32.1/debian/patches/113_at_properties_add_visual_bell.patch @@ -0,0 +1,117 @@ +Index: gnome-control-center-2.30.1/capplets/accessibility/at-properties/at-enable-dialog.ui +=================================================================== +--- gnome-control-center-2.30.1.orig/capplets/accessibility/at-properties/at-enable-dialog.ui 2010-08-20 20:10:39.451730011 -0400 ++++ gnome-control-center-2.30.1/capplets/accessibility/at-properties/at-enable-dialog.ui 2010-08-20 20:14:55.139510013 -0400 +@@ -120,6 +120,28 @@ + 2 + + ++ ++ ++ True ++ True ++ Enable _visual system bell ++ True ++ True ++ ++ ++ ++ ++ ++ Changes to visual system bell take effect immediately. ++ ++ ++ ++ ++ False ++ False ++ 3 ++ ++ + + + 1 +Index: gnome-control-center-2.30.1/capplets/accessibility/at-properties/main.c +=================================================================== +--- gnome-control-center-2.30.1.orig/capplets/accessibility/at-properties/main.c 2010-08-20 20:15:08.126000011 -0400 ++++ gnome-control-center-2.30.1/capplets/accessibility/at-properties/main.c 2010-08-20 20:28:08.716100014 -0400 +@@ -23,6 +23,8 @@ + #define ACCESSIBILITY_KEY_DIR "/desktop/gnome/interface" + #define GKSU_NO_GRAB_KEY "/apps/gksu/disable-grab" + #define GKSU_NO_GRAB_KEY_DIR "/apps/gksu" ++#define VISUAL_BELL_KEY "/apps/metacity/general/visual_bell" ++#define VISUAL_BELL_KEY_DIR "/apps/metacity/general" + + static gboolean initial_state; + +@@ -248,6 +250,41 @@ + g_object_unref (client); + } + ++static void ++at_visual_bell_update (GConfClient *client, ++ GtkBuilder *builder) ++{ ++ gboolean is_enabled = gconf_client_get_bool (client, VISUAL_BELL_KEY, NULL); ++ GObject *button = gtk_builder_get_object (builder, "at_visual_bell_toggle"); ++ ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ++ is_enabled); ++} ++ ++ ++static void ++at_visual_bell_changed (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ at_visual_bell_update (client, user_data); ++} ++ ++ ++static void ++at_visual_bell_toggled (GtkToggleButton *toggle_button, ++ GtkBuilder *builder) ++{ ++ GConfClient *client = gconf_client_get_default (); ++ gboolean is_enabled = gtk_toggle_button_get_active (toggle_button); ++ ++ gconf_client_set_bool (client, VISUAL_BELL_KEY, ++ is_enabled, ++ NULL); ++ g_object_unref (client); ++} ++ + + static void + setup_dialog (GtkBuilder *builder) +@@ -279,6 +316,28 @@ + at_gksudo_changed, + builder, NULL, NULL); + ++ ++ // Visual bell toggle ++ gconf_client_add_dir (client, VISUAL_BELL_KEY_DIR, ++ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); ++ ++ object = gtk_builder_get_object (builder, "at_visual_bell_toggle"); ++ ++ g_signal_connect (object, "toggled", ++ G_CALLBACK (at_visual_bell_toggled), ++ builder); ++ ++ peditor = gconf_peditor_new_boolean (NULL, VISUAL_BELL_KEY, ++ GTK_WIDGET (object), ++ NULL); ++ ++ at_visual_bell_update (client, builder); ++ ++ gconf_client_notify_add (client, VISUAL_BELL_KEY_DIR, ++ at_visual_bell_changed, ++ builder, NULL, NULL); ++ ++ + gconf_client_add_dir (client, ACCESSIBILITY_KEY_DIR, + GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); + --- gnome-control-center-2.32.1.orig/debian/patches/112_banshee_in_media_dropdown.patch +++ gnome-control-center-2.32.1/debian/patches/112_banshee_in_media_dropdown.patch @@ -0,0 +1,18 @@ +Descrption: Update preferred applications xml file for banshee to use banshee-1 instead of banshee executable +Bug: bugs.launchpad.net/bugs/533888 + +Index: gnome-control-center-2.30.1/capplets/default-applications/gnome-default-applications.xml.in +=================================================================== +--- gnome-control-center-2.30.1.orig/capplets/default-applications/gnome-default-applications.xml.in 2010-06-23 16:16:51.308187001 +1000 ++++ gnome-control-center-2.30.1/capplets/default-applications/gnome-default-applications.xml.in 2010-06-23 16:17:02.858187000 +1000 +@@ -297,8 +297,8 @@ + + + <_name>Banshee Music Player +- banshee +- banshee ++ banshee-1 ++ banshee-1 + music-player-banshee + false + --- gnome-control-center-2.32.1.orig/debian/patches/16_preferred_applications_list_cleanup.patch +++ gnome-control-center-2.32.1/debian/patches/16_preferred_applications_list_cleanup.patch @@ -0,0 +1,48 @@ +Description: Don't list Mozilla commands which are compatibility symlinks +Bug: http://bugzilla.gnome.org/show_bug.cgi?id=499327 +Bug-Ubuntu: http://bugs.launchpad.net/bugs/55963 + +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.3/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.27.3.new/capplets/default-applications/gnome-default-applications.xml.in +--- gnome-control-center-2.27.3/capplets/default-applications/gnome-default-applications.xml.in 2009-07-13 19:45:12.376642974 +0100 ++++ gnome-control-center-2.27.3.new/capplets/default-applications/gnome-default-applications.xml.in 2009-07-13 19:45:14.536643756 +0100 +@@ -74,26 +74,6 @@ + iceweasel -new-window "%s" + + +- <_name>Mozilla 1.6 +- mozilla-1.6 +- mozilla-1.6 %s +- mozilla-icon +- false +- true +- mozilla-1.6 -remote "openurl(%s,new-tab)" +- mozilla-1.6 -remote "openurl(%s,new-window)" +- +- +- <_name>Mozilla +- mozilla +- mozilla %s +- mozilla-icon +- false +- true +- mozilla -remote "openurl(%s,new-tab)" +- mozilla -remote "openurl(%s,new-window)" +- +- + <_name>SeaMonkey + seamonkey + seamonkey %s +@@ -185,13 +165,6 @@ + false + + +- <_name>Mozilla Mail +- mozilla +- mozilla -mail %s +- mozilla-mail-icon +- false +- +- + <_name>SeaMonkey Mail + seamonkey + seamonkey -mail %s --- gnome-control-center-2.32.1.orig/debian/patches/series +++ gnome-control-center-2.32.1/debian/patches/series @@ -0,0 +1,23 @@ +00_git_dont_erase_background_xml.patch +01_remove_debian_default_applications.patch +03_use_libunique.patch +04_keyboard_layout_gconf_names.patch +100_at_properties_readd_gksudo_disable_grab_toggle.patch +112_banshee_in_media_dropdown.patch +113_at_properties_add_visual_bell.patch +16_preferred_applications_list_cleanup.patch +25_window_manager_settings.patch +50_ubuntu_systemwide_prefs.patch +51_ubuntu_system_keyboard.patch +52_button_layout_from_theme.patch +53_ubuntu_show_shell.patch +80_aspect_in_dropdown.patch +90_gnome-mouse-properties_small_screen.patch +91_gnome-about-me_small_screen.patch +96_hide_accessible_login.patch +97_subpixel_hinting_defaults.patch +99_ltmain_as-needed.patch +140_backport_default_internet_apps.patch +141_set_default_internet_apps.patch +142_fix_icons_for_default_apps.patch +143_write_default_internet_apps_to_gconf.patch --- gnome-control-center-2.32.1.orig/debian/patches/140_backport_default_internet_apps.patch +++ gnome-control-center-2.32.1/debian/patches/140_backport_default_internet_apps.patch @@ -0,0 +1,1241 @@ +Description: Backport interface to new glib url handling for web and mail +Origin: http://git.gnome.org/browse/gnome-control-center/log/ + +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.c 2011-01-05 12:44:35.349640872 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.c 2011-01-05 16:05:06.924153944 -0500 +@@ -64,83 +64,26 @@ + } + + static void +-web_radiobutton_toggled_cb (GtkWidget *togglebutton, GnomeDACapplet *capplet) +-{ +- gint index; +- GnomeDAWebItem *item; +- const gchar *command; +- GError *error = NULL; +- +- index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box)); +- +- if (index == -1) +- return; +- +- item = (GnomeDAWebItem *) g_list_nth_data (capplet->web_browsers, index); +- if (item == NULL) +- return; +- +- if (togglebutton == capplet->new_win_radiobutton) { +- command = item->win_command; +- } +- else if (togglebutton == capplet->new_tab_radiobutton) { +- command = item->tab_command; +- } +- else { +- command = item->generic.command; +- } +- +- gconf_client_set_string (capplet->gconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error); +- +- gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command); +- +- if (error != NULL) { +- g_warning (_("Error saving configuration: %s"), error->message); +- g_error_free (error); +- } +-} +- +-static void + web_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) + { + guint current_index; +- gboolean is_custom_active; +- gboolean has_net_remote; +- GnomeDAWebItem *item; +- GtkWidget *active = NULL; + + current_index = gtk_combo_box_get_active (combo); + + if (current_index < g_list_length (capplet->web_browsers)) { ++ GnomeDAURLItem *item; ++ GError *error = NULL; + +- item = (GnomeDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index); +- has_net_remote = item->netscape_remote; +- is_custom_active = FALSE; +- +- } +- else { +- has_net_remote = FALSE; +- is_custom_active = TRUE; +- } +- gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote); +- gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote); +- gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote); +- +- gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active); +- gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active); +- gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active); +- +- if (has_net_remote) { +- +- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton))) +- active = capplet->new_win_radiobutton; +- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton))) +- active = capplet->new_tab_radiobutton; +- else +- active = capplet->default_radiobutton; ++ item = (GnomeDAURLItem*) g_list_nth_data (capplet->web_browsers, current_index); ++ if (item == NULL) ++ return; ++ ++ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/http", &error) || ++ !g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/https", &error)) { ++ g_warning (_("Error setting default browser: %s"), error->message); ++ g_error_free (error); ++ } + } +- +- web_radiobutton_toggled_cb (active, capplet); + } + + /* FIXME: Refactor these two functions below into one... */ +@@ -148,14 +91,23 @@ + mail_combo_changed_cb (GtkComboBox *combo, GnomeDACapplet *capplet) + { + guint current_index; +- gboolean is_custom_active; + + current_index = gtk_combo_box_get_active (combo); +- is_custom_active = (current_index >= g_list_length (capplet->mail_readers)); + +- gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active); +- gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active); +- gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active); ++ if (current_index < g_list_length (capplet->mail_readers)) { ++ GnomeDAURLItem *item; ++ GError *error = NULL; ++ ++ item = (GnomeDAURLItem*) g_list_nth_data (capplet->mail_readers, current_index); ++ if (item == NULL) ++ return; ++ ++ if (!g_app_info_set_as_default_for_type (item->app_info, "x-scheme-handler/mailto", &error)) { ++ g_warning (_("Error setting default mailer: %s"), error->message); ++ g_error_free (error); ++ } ++ } ++ + } + + static void +@@ -285,7 +237,7 @@ + if (capplet->icon_theme != NULL) { + g_signal_handlers_disconnect_by_func (capplet->icon_theme, theme_changed_cb, capplet); + } +- g_signal_connect (theme, "changed", G_CALLBACK (theme_changed_cb), capplet); ++ capplet->theme_changed_id = g_signal_connect (theme, "changed", G_CALLBACK (theme_changed_cb), capplet); + theme_changed_cb (theme, capplet); + + capplet->icon_theme = theme; +@@ -297,221 +249,6 @@ + return (strcmp (((GnomeDAItem *) list_item)->command, (gchar *) command)); + } + +-static gint +-web_item_comp (gconstpointer item, gconstpointer command) +-{ +- GnomeDAWebItem *web_list_item; +- +- web_list_item = (GnomeDAWebItem *) item; +- +- if (strcmp (web_list_item->generic.command, (gchar *) command) == 0) +- return 0; +- +- if (web_list_item->netscape_remote) { +- if (strcmp (web_list_item->tab_command, (gchar *) command) == 0) +- return 0; +- +- if (strcmp (web_list_item->win_command, (gchar *) command) == 0) +- return 0; +- } +- +- return (strcmp (web_list_item->generic.command, (gchar *) command)); +-} +- +-static void +-web_gconf_changed_cb (GConfPropertyEditor *peditor, gchar *key, GConfValue *value, GnomeDACapplet *capplet) +-{ +- GConfChangeSet *cs; +- GError *error = NULL; +- GList *list_entry; +- +- /* This function is used to update HTTPS,ABOUT and UNKNOWN handlers, which +- * should also use the same value as HTTP +- */ +- +- if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) { +- gchar *short_browser, *pos; +- const gchar *value_str = gconf_value_get_string (value); +- +- cs = gconf_change_set_new (); +- +- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value); +- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value); +- gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value); +- pos = strstr (value_str, " "); +- if (pos == NULL) +- short_browser = g_strdup (value_str); +- else +- short_browser = g_strndup (value_str, pos - value_str); +- gconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser); +- g_free (short_browser); +- +- list_entry = g_list_find_custom (capplet->web_browsers, +- value_str, +- (GCompareFunc) web_item_comp); +- +- if (list_entry) { +- GnomeDAWebItem *item = (GnomeDAWebItem *) list_entry->data; +- +- gconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote); +- } +- +- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); +- +- if (error != NULL) { +- g_warning (_("Error saving configuration: %s"), error->message); +- g_error_free (error); +- error = NULL; +- } +- +- gconf_change_set_unref (cs); +- } +- else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) { +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton), +- gconf_value_get_bool (value)); +- +- cs = gconf_change_set_new (); +- +- gconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value); +- gconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value); +- gconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value); +- gconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value); +- +- gconf_client_commit_change_set (capplet->gconf, cs, TRUE, &error); +- +- if (error != NULL) { +- g_warning (_("Error saving configuration: %s"), error->message); +- g_error_free (error); +- error = NULL; +- } +- +- gconf_change_set_unref (cs); +- } +-} +- +-static void +-web_browser_update_radio_buttons (GnomeDACapplet *capplet, const gchar *command) +-{ +- GList *entry; +- gboolean has_net_remote; +- +- entry = g_list_find_custom (capplet->web_browsers, command, (GCompareFunc) web_item_comp); +- +- if (entry) { +- GnomeDAWebItem *item = (GnomeDAWebItem *) entry->data; +- +- has_net_remote = item->netscape_remote; +- +- if (has_net_remote) { +- /* disable "toggle" signal emitting, thus preventing calling this function twice */ +- g_signal_handlers_block_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, +- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); +- g_signal_handlers_block_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, +- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); +- g_signal_handlers_block_matched (capplet->new_win_radiobutton,G_SIGNAL_MATCH_FUNC, 0, +- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); +- +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->default_radiobutton), +- strcmp (item->generic.command, command) == 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton), +- strcmp (item->tab_command, command) == 0); +- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton), +- strcmp (item->win_command, command) == 0); +- +- g_signal_handlers_unblock_matched (capplet->default_radiobutton, G_SIGNAL_MATCH_FUNC, 0, +- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); +- g_signal_handlers_unblock_matched (capplet->new_tab_radiobutton, G_SIGNAL_MATCH_FUNC, 0, +- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); +- g_signal_handlers_unblock_matched (capplet->new_win_radiobutton, G_SIGNAL_MATCH_FUNC, 0, +- 0, NULL, G_CALLBACK (web_radiobutton_toggled_cb), NULL); +- } +- } +- else { +- has_net_remote = FALSE; +- } +- +- gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote); +- gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote); +- gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote); +-} +- +-static GConfValue* +-web_combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) +-{ +- GConfValue *ret; +- GList *entry, *handlers; +- const gchar *command; +- gint index; +- GnomeDACapplet *capplet; +- +- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); +- +- command = gconf_value_get_string (value); +- handlers = capplet->web_browsers; +- +- if (handlers) +- { +- entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp); +- if (entry) +- index = g_list_position (handlers, entry); +- else +- index = g_list_length (handlers) + 1; +- } +- else +- { +- /* if the item has no handlers lsit then select the Custom item */ +- index = 1; +- } +- +- web_browser_update_radio_buttons (capplet, command); +- +- ret = gconf_value_new (GCONF_VALUE_INT); +- gconf_value_set_int (ret, index); +- +- return ret; +-} +- +-static GConfValue* +-web_combo_conv_from_widget (GConfPropertyEditor *peditor, const GConfValue *value) +-{ +- GConfValue *ret; +- GList *handlers; +- gint index; +- GnomeDAWebItem *item; +- const gchar *command; +- GnomeDACapplet *capplet; +- +- g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); +- +- index = gconf_value_get_int (value); +- handlers = capplet->web_browsers; +- +- item = g_list_nth_data (handlers, index); +- +- ret = gconf_value_new (GCONF_VALUE_STRING); +- if (!item) +- { +- /* if item was not found, this is probably the "Custom" item */ +- /* XXX: returning "" as the value here is not ideal, but required to +- * prevent the combo box from jumping back to the previous value if the +- * user has selected Custom */ +- gconf_value_set_string (ret, ""); +- return ret; +- } +- else +- { +- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton)) && item->netscape_remote == TRUE) +- command = item->win_command; +- else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton)) && item->netscape_remote == TRUE) +- command = item->tab_command; +- else +- command = item->generic.command; +- +- gconf_value_set_string (ret, command); +- return ret; +- } +-} +- + static GConfValue* + combo_conv_to_widget (GConfPropertyEditor *peditor, const GConfValue *value) + { +@@ -632,7 +369,7 @@ + } + + static void +-fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) ++fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list, gboolean add_custom) + { + GList *entry; + GtkTreeModel *model; +@@ -644,8 +381,10 @@ + theme = gtk_icon_theme_get_default (); + } + +- gtk_combo_box_set_row_separator_func (combo_box, is_separator, +- GINT_TO_POINTER (g_list_length (app_list)), NULL); ++ if (add_custom) { ++ gtk_combo_box_set_row_separator_func (combo_box, is_separator, ++ GINT_TO_POINTER (g_list_length (app_list)), NULL); ++ } + + model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); + gtk_combo_box_set_model (combo_box, model); +@@ -683,13 +422,15 @@ + g_object_unref (pixbuf); + } + +- gtk_list_store_append (GTK_LIST_STORE (model), &iter); +- gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); +- gtk_list_store_append (GTK_LIST_STORE (model), &iter); +- gtk_list_store_set (GTK_LIST_STORE (model), &iter, +- PIXBUF_COL, NULL, +- TEXT_COL, _("Custom"), +- -1); ++ if (add_custom) { ++ gtk_list_store_append (GTK_LIST_STORE (model), &iter); ++ gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); ++ gtk_list_store_append (GTK_LIST_STORE (model), &iter); ++ gtk_list_store_set (GTK_LIST_STORE (model), &iter, ++ PIXBUF_COL, NULL, ++ TEXT_COL, _("Custom"), ++ -1); ++ } + } + + static GtkWidget* +@@ -732,17 +473,6 @@ + capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog"); + g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL); + +- capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry"); +- capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label"); +- capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton"); +- capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton"); +- capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton"); +- capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton"); +- +- capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry"); +- capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label"); +- capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton"); +- + capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry"); + capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label"); + capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry"); +@@ -770,12 +500,12 @@ + g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); + screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); + +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats); +- fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); ++ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers, FALSE); ++ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers, FALSE); ++ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals, TRUE); ++ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players, TRUE); ++ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats, TRUE); ++ fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats, TRUE); + + g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); + g_signal_connect (capplet->mail_combo_box, "changed", G_CALLBACK (mail_combo_changed_cb), capplet); +@@ -784,53 +514,8 @@ + g_signal_connect (capplet->visual_combo_box, "changed", G_CALLBACK (visual_combo_changed_cb), capplet); + g_signal_connect (capplet->mobility_combo_box, "changed", G_CALLBACK (mobility_combo_changed_cb), capplet); + +- +- g_signal_connect (capplet->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); +- g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); +- g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); +- + /* Setup GConfPropertyEditors */ + +- /* Web Browser */ +- gconf_peditor_new_combo_box (NULL, +- DEFAULT_APPS_KEY_HTTP_EXEC, +- capplet->web_combo_box, +- "conv-from-widget-cb", web_combo_conv_from_widget, +- "conv-to-widget-cb", web_combo_conv_to_widget, +- "data", capplet, +- NULL); +- +- obj = gconf_peditor_new_string (NULL, +- DEFAULT_APPS_KEY_HTTP_EXEC, +- capplet->web_browser_command_entry, +- NULL); +- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); +- +- obj = gconf_peditor_new_boolean (NULL, +- DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, +- capplet->web_browser_terminal_checkbutton, +- NULL); +- g_signal_connect (obj, "value-changed", G_CALLBACK (web_gconf_changed_cb), capplet); +- +- /* Mailer */ +- gconf_peditor_new_combo_box (NULL, +- DEFAULT_APPS_KEY_MAILER_EXEC, +- capplet->mail_combo_box, +- "conv-from-widget-cb", combo_conv_from_widget, +- "conv-to-widget-cb", combo_conv_to_widget, +- "data", capplet->mail_readers, +- NULL); +- +- gconf_peditor_new_string (NULL, +- DEFAULT_APPS_KEY_MAILER_EXEC, +- capplet->mail_reader_command_entry, +- NULL); +- +- gconf_peditor_new_boolean (NULL, +- DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, +- capplet->mail_reader_terminal_checkbutton, +- NULL); +- + /* Media player */ + gconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_MEDIA_EXEC, +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-capplet.h 2011-01-05 12:44:35.389640504 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-capplet.h 2011-01-05 16:04:48.714315795 -0500 +@@ -85,17 +85,6 @@ + GtkWidget *visual_combo_box; + GtkWidget *mobility_combo_box; + +- GtkWidget *web_browser_command_entry; +- GtkWidget *web_browser_command_label; +- GtkWidget *web_browser_terminal_checkbutton; +- GtkWidget *default_radiobutton; +- GtkWidget *new_win_radiobutton; +- GtkWidget *new_tab_radiobutton; +- +- GtkWidget *mail_reader_command_entry; +- GtkWidget *mail_reader_command_label; +- GtkWidget *mail_reader_terminal_checkbutton; +- + GtkWidget *terminal_command_entry; + GtkWidget *terminal_command_label; + GtkWidget *terminal_exec_flag_entry; +@@ -121,6 +110,8 @@ + GList *media_players; + GList *visual_ats; + GList *mobility_ats; ++ ++ guint theme_changed_id; + }; + + #endif +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.c 2011-01-05 12:44:35.329641056 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.c 2011-01-05 16:04:48.644316418 -0500 +@@ -21,12 +21,12 @@ + #include "gnome-da-capplet.h" + #include "gnome-da-item.h" + +-GnomeDAWebItem* +-gnome_da_web_item_new (void) ++GnomeDAURLItem* ++gnome_da_url_item_new (void) + { +- GnomeDAWebItem *item = NULL; ++ GnomeDAURLItem *item = NULL; + +- item = g_new0 (GnomeDAWebItem, 1); ++ item = g_new0 (GnomeDAURLItem, 1); + + return item; + } +@@ -72,7 +72,7 @@ + } + + void +-gnome_da_web_item_free (GnomeDAWebItem *item) ++gnome_da_url_item_free (GnomeDAURLItem *item) + { + g_return_if_fail (item != NULL); + +@@ -82,8 +82,7 @@ + g_free (item->generic.icon_name); + g_free (item->generic.icon_path); + +- g_free (item->tab_command); +- g_free (item->win_command); ++ g_object_unref (item->app_info); + + g_free (item); + } +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-item.h 2011-01-05 12:44:35.369640688 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-item.h 2011-01-05 16:04:48.684316062 -0500 +@@ -25,7 +25,7 @@ + + typedef struct _GnomeDAItem GnomeDAItem; + +-typedef struct _GnomeDAWebItem GnomeDAWebItem; ++typedef struct _GnomeDAURLItem GnomeDAURLItem; + typedef struct _GnomeDATermItem GnomeDATermItem; + typedef struct _GnomeDASimpleItem GnomeDASimpleItem; + typedef struct _GnomeDAVisualItem GnomeDAVisualItem; +@@ -39,17 +39,14 @@ + gchar *icon_path; + }; + +-struct _GnomeDAWebItem { ++struct _GnomeDASimpleItem { + GnomeDAItem generic; + gboolean run_in_terminal; +- gboolean netscape_remote; +- gchar *tab_command; +- gchar *win_command; + }; + +-struct _GnomeDASimpleItem { ++struct _GnomeDAURLItem { + GnomeDAItem generic; +- gboolean run_in_terminal; ++ GAppInfo *app_info; + }; + + struct _GnomeDATermItem { +@@ -67,13 +64,13 @@ + gboolean run_at_startup; + }; + +-GnomeDAWebItem* gnome_da_web_item_new (void); + GnomeDATermItem* gnome_da_term_item_new (void); ++GnomeDAURLItem* gnome_da_url_item_new (void); + GnomeDASimpleItem* gnome_da_simple_item_new (void); + GnomeDAVisualItem* gnome_da_visual_item_new (void); + GnomeDAMobilityItem* gnome_da_mobility_item_new (void); +-void gnome_da_web_item_free (GnomeDAWebItem *item); + void gnome_da_term_item_free (GnomeDATermItem *item); ++void gnome_da_url_item_free (GnomeDAURLItem *item); + void gnome_da_simple_item_free (GnomeDASimpleItem *item); + void gnome_da_visual_item_free (GnomeDAVisualItem *item); + void gnome_da_mobility_item_free (GnomeDAMobilityItem *item); +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-da-xml.c 2011-01-05 12:44:35.319641148 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-da-xml.c 2011-01-05 16:04:48.624316596 -0500 +@@ -47,7 +47,7 @@ + if (!xmlStrncmp (element->name, xml_val_name, len)) { + xmlChar *cont = xmlNodeGetContent (element); + +- if (!xmlStrcasecmp (cont, "true") || !xmlStrcasecmp (cont, "1")) ++ if (!xmlStrcasecmp (cont, (const xmlChar *) "true") || !xmlStrcasecmp (cont, (const xmlChar *) "1")) + ret_val = TRUE; + else + ret_val = FALSE; +@@ -91,7 +91,7 @@ + } + else { + for (i = 0; sys_langs[i] != NULL; i++) { +- if (!strcmp (sys_langs[i], node_lang)) { ++ if (!strcmp ((const char *) sys_langs[i], (const char *) node_lang)) { + ret_val = (gchar *) xmlNodeGetContent (element); + /* since sys_langs is sorted from most desirable to + * least desirable, exit at first match +@@ -109,7 +109,7 @@ + } + + static gboolean +-is_executable_valid (gchar *executable) ++is_executable_valid (const gchar *executable) + { + gchar *path; + +@@ -129,8 +129,6 @@ + xmlDoc *xml_doc; + xmlNode *root, *section, *element; + gchar *executable; +- GnomeDAWebItem *web_item; +- GnomeDASimpleItem *mail_item; + GnomeDASimpleItem *media_item; + GnomeDATermItem *term_item; + GnomeDAVisualItem *visual_item; +@@ -144,56 +142,9 @@ + root = xmlDocGetRootElement (xml_doc); + + for (section = root->children; section != NULL; section = section->next) { +- if (!xmlStrncmp (section->name, "web-browsers", 12)) { +- for (element = section->children; element != NULL; element = element->next) { +- if (!xmlStrncmp (element->name, "web-browser", 11)) { +- executable = gnome_da_xml_get_string (element, "executable"); +- if (is_executable_valid (executable)) { +- web_item = gnome_da_web_item_new (); +- +- web_item->generic.name = gnome_da_xml_get_string (element, "name"); +- web_item->generic.executable = executable; +- web_item->generic.command = gnome_da_xml_get_string (element, "command"); +- web_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); +- +- web_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); +- web_item->netscape_remote = gnome_da_xml_get_bool (element, "netscape-remote"); +- if (web_item->netscape_remote) { +- web_item->tab_command = gnome_da_xml_get_string (element, "tab-command"); +- web_item->win_command = gnome_da_xml_get_string (element, "win-command"); +- } +- +- capplet->web_browsers = g_list_append (capplet->web_browsers, web_item); +- } +- else +- g_free (executable); +- } +- } +- } +- else if (!xmlStrncmp (section->name, "mail-readers", 12)) { +- for (element = section->children; element != NULL; element = element->next) { +- if (!xmlStrncmp (element->name, "mail-reader", 11)) { +- executable = gnome_da_xml_get_string (element, "executable"); +- if (is_executable_valid (executable)) { +- mail_item = gnome_da_simple_item_new (); +- +- mail_item->generic.name = gnome_da_xml_get_string (element, "name"); +- mail_item->generic.executable = executable; +- mail_item->generic.command = gnome_da_xml_get_string (element, "command"); +- mail_item->generic.icon_name = gnome_da_xml_get_string (element, "icon-name"); +- +- mail_item->run_in_terminal = gnome_da_xml_get_bool (element, "run-in-terminal"); +- +- capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item); +- } +- else +- g_free (executable); +- } +- } +- } +- else if (!xmlStrncmp (section->name, "terminals", 9)) { +- for (element = section->children; element != NULL; element = element->next) { +- if (!xmlStrncmp (element->name, "terminal", 8)) { ++ if (!xmlStrncmp (section->name, (const xmlChar *) "terminals", 9)) { ++ for (element = section->children; element != NULL; element = element->next) { ++ if (!xmlStrncmp (element->name, (const xmlChar *) "terminal", 8)) { + executable = gnome_da_xml_get_string (element, "executable"); + if (is_executable_valid (executable)) { + term_item = gnome_da_term_item_new (); +@@ -209,12 +160,12 @@ + } + else + g_free (executable); +- } ++ } + } +- } +- else if (!xmlStrncmp (section->name, "media-players", 13)) { ++ } ++ else if (!xmlStrncmp (section->name, (const xmlChar *) "media-players", 13)) { + for (element = section->children; element != NULL; element = element->next) { +- if (!xmlStrncmp (element->name, "media-player", 12)) { ++ if (!xmlStrncmp (element->name, (const xmlChar *) "media-player", 12)) { + executable = gnome_da_xml_get_string (element, "executable"); + if (is_executable_valid (executable)) { + media_item = gnome_da_simple_item_new (); +@@ -232,10 +183,10 @@ + g_free (executable); + } + } +- } +- else if (!xmlStrncmp (section->name, "a11y-visual", 11)) { ++ } ++ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-visual", 11)) { + for (element = section->children; element != NULL; element = element->next) { +- if (!xmlStrncmp (element->name, "visual", 6)) { ++ if (!xmlStrncmp (element->name, (const xmlChar *) "visual", 6)) { + executable = gnome_da_xml_get_string (element,"executable"); + if (is_executable_valid (executable)) { + visual_item = gnome_da_visual_item_new (); +@@ -253,10 +204,10 @@ + g_free (executable); + } + } +- } +- else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) { ++ } ++ else if (!xmlStrncmp (section->name, (const xmlChar *) "a11y-mobility", 13)) { + for (element = section->children; element != NULL; element = element->next) { +- if (!xmlStrncmp (element->name, "mobility", 8)) { ++ if (!xmlStrncmp (element->name, (const xmlChar *) "mobility", 8)) { + executable = gnome_da_xml_get_string (element,"executable"); + if (is_executable_valid (executable)) { + mobility_item = gnome_da_mobility_item_new (); +@@ -274,17 +225,52 @@ + g_free (executable); + } + } +- } ++ } + } + + xmlFreeDoc (xml_doc); + } + ++static GList * ++load_url_handlers (GnomeDACapplet *capplet, const gchar *scheme) ++{ ++ GList *app_list, *l, *ret; ++ ++ app_list = g_app_info_get_all_for_type (scheme); ++ ret = NULL; ++ ++ for (l = app_list; l != NULL; l = l->next) { ++ const gchar *executable; ++ GAppInfo *app_info = l->data; ++ ++ executable = g_app_info_get_executable (app_info); ++ if (is_executable_valid (executable)) { ++ GnomeDAURLItem *url_item; ++ ++ url_item = gnome_da_url_item_new (); ++ url_item->generic.name = g_strdup (g_app_info_get_display_name (app_info)); ++ url_item->generic.executable = g_strdup (executable); ++ url_item->generic.command = g_strdup (g_app_info_get_commandline (app_info)); ++ url_item->generic.icon_name = g_strdup (g_app_info_get_name (app_info)); ++ /* Steal the reference */ ++ url_item->app_info = app_info; ++ ++ ret = g_list_prepend (ret, url_item); ++ } else { ++ g_object_unref (app_info); ++ } ++ } ++ g_list_free (app_list); ++ ++ return g_list_reverse (ret); ++} ++ + void + gnome_da_xml_load_list (GnomeDACapplet *capplet) + { + GDir *app_dir = g_dir_open (GNOMECC_APPS_DIR, 0, NULL); + ++ /* First load all applications from the XML files */ + if (app_dir != NULL) { + const gchar *extra_file; + gchar *filename; +@@ -299,13 +285,17 @@ + } + g_dir_close (app_dir); + } ++ ++ /* Now load URL handlers */ ++ capplet->web_browsers = load_url_handlers (capplet, "x-scheme-handler/http"); ++ capplet->mail_readers = load_url_handlers (capplet, "x-scheme-handler/mailto"); + } + + void + gnome_da_xml_free (GnomeDACapplet *capplet) + { +- g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_web_item_free, NULL); +- g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_simple_item_free, NULL); ++ g_list_foreach (capplet->web_browsers, (GFunc) gnome_da_url_item_free, NULL); ++ g_list_foreach (capplet->mail_readers, (GFunc) gnome_da_url_item_free, NULL); + g_list_foreach (capplet->terminals, (GFunc) gnome_da_term_item_free, NULL); + g_list_foreach (capplet->media_players, (GFunc) gnome_da_simple_item_free, NULL); + g_list_foreach (capplet->visual_ats, (GFunc) gnome_da_visual_item_free, NULL); +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications.xml.in 2011-01-05 12:44:35.439640047 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications.xml.in 2011-01-05 12:49:38.216961619 -0500 +@@ -4,210 +4,6 @@ + + + +- +- +- <_name>Opera +- opera +- opera %s +- opera +- false +- true +- opera -newpage %s +- opera -newwindow %s +- +- +- <_name>Epiphany Web Browser +- epiphany +- epiphany %s +- web-browser +- false +- true +- epiphany --new-tab %s +- epiphany --new-window %s +- +- +- <_name>Galeon +- galeon +- galeon %s +- galeon +- false +- true +- galeon -n %s +- galeon -w %s +- +- +- <_name>Encompass +- encompass +- encompass %s +- encompass +- false +- false +- +- +- <_name>Firebird +- mozilla-firebird +- mozilla-firebird %s +- +- false +- true +- mozilla-firebird -remote "openurl(%s,new-tab)" +- mozilla-firebird -remote "openurl(%s,new-window)" +- +- +- <_name>Firefox +- firefox +- firefox %s +- firefox +- false +- true +- firefox -new-tab "%s" +- firefox -new-window "%s" +- +- +- <_name>Iceweasel +- iceweasel +- iceweasel %s +- iceweasel +- false +- true +- iceweasel -new-tab "%s" +- iceweasel -new-window "%s" +- +- +- <_name>SeaMonkey +- seamonkey +- seamonkey %s +- seamonkey +- false +- true +- seamonkey -remote "openurl(%s,new-tab)" +- seamonkey -remote "openurl(%s,new-window)" +- +- +- <_name>Iceape +- iceape +- iceape %s +- iceape +- false +- true +- iceape -remote "openurl(%s,new-tab)" +- iceape -remote "openurl(%s,new-window)" +- +- +- <_name>Netscape Communicator +- netscape +- netscape %s +- netscape +- false +- true +- netscape -remote "openurl(%s,new-tab)" +- netscape -remote "openurl(%s,new-window)" +- +- +- <_name>Konqueror +- konqueror +- konqueror %s +- konqueror +- false +- false +- +- +- <_name>Midori +- midori +- midori %s +- midori +- false +- false +- +- +- +- +- +- <_name>Evolution Mail Reader +- evolution +- evolution %s +- evolution +- false +- +- +- <_name>Balsa +- balsa +- balsa -m %s +- gnome-balsa2 +- false +- +- +- <_name>KMail +- kmail +- kmail %s +- kmail +- false +- +- +- <_name>Icedove +- icedove +- icedove %s +- icedove +- false +- +- +- <_name>Thunderbird +- thunderbird +- thunderbird %s +- thunderbird +- false +- +- +- <_name>Mozilla Thunderbird +- mozilla-thunderbird +- mozilla-thunderbird %s +- thunderbird +- false +- +- +- <_name>SeaMonkey Mail +- seamonkey +- seamonkey -mail %s +- seamonkey +- false +- +- +- <_name>Iceape Mail +- iceape +- iceape -mail %s +- iceape +- false +- +- +- <_name>Mutt +- mutt +- mutt %s +- gnome-mime-application-x-executable +- true +- +- +- <_name>Claws Mail +- claws-mail +- claws-mail --compose %s +- claws-mail +- false +- +- +- <_name>Sylpheed-Claws +- sylpheed-claws +- sylpheed-claws --compose %s +- sylpheed +- false +- +- +- <_name>Sylpheed +- sylpheed +- sylpheed --compose %s +- sylpheed +- false +- +- +- + + + <_name>GNOME Terminal +Index: gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/default-applications/gnome-default-applications-properties.ui 2011-01-05 12:55:22.733917635 -0500 ++++ gnome-control-center-2.32.1/capplets/default-applications/gnome-default-applications-properties.ui 2011-01-05 12:55:26.903881280 -0500 +@@ -68,122 +68,7 @@ + + + +- +- True +- 4 +- 3 +- 12 +- 6 +- +- +- True +- True +- All %s occurrences will be replaced with actual link +- +- +- 1 +- 2 +- 3 +- 4 +- +- +- +- +- +- Run in t_erminal +- True +- False +- True +- False +- True +- True +- +- +- 2 +- 3 +- 3 +- 4 +- GTK_FILL +- +- +- +- +- +- Open link with web browser _default +- True +- False +- True +- False +- True +- True +- True +- +- +- 3 +- GTK_FILL +- +- +- +- +- +- Open link in new _tab +- True +- False +- True +- False +- True +- True +- web_browser_default_radiobutton +- +- +- 3 +- 2 +- 3 +- GTK_FILL +- +- +- +- +- +- Open link in new _window +- True +- False +- True +- False +- True +- True +- web_browser_default_radiobutton +- +- +- 3 +- 1 +- 2 +- GTK_FILL +- +- +- +- +- +- True +- False +- 0 +- C_ommand: +- True +- web_browser_command_entry +- +- +- 3 +- 4 +- GTK_FILL +- +- +- +- +- +- False +- False +- 1 +- ++ + + + +@@ -249,58 +134,7 @@ + + + +- +- True +- 3 +- 12 +- 6 +- +- +- True +- False +- 0 +- Co_mmand: +- True +- mail_reader_command_entry +- +- +- GTK_FILL +- +- +- +- +- +- True +- True +- All %s occurrences will be replaced with actual link +- +- +- 1 +- 2 +- +- +- +- +- +- Run in t_erminal +- True +- False +- True +- False +- True +- True +- +- +- 2 +- 3 +- GTK_FILL +- +- +- +- +- +- 1 +- ++ + + + --- gnome-control-center-2.32.1.orig/debian/patches/50_ubuntu_systemwide_prefs.patch +++ gnome-control-center-2.32.1/debian/patches/50_ubuntu_systemwide_prefs.patch @@ -0,0 +1,441 @@ +Description: Ubuntu specific preferences +Author: ? + +=== modified file 'capplets/network/gnome-network-preferences.c' +Index: gnome-control-center-2.31.90/capplets/network/gnome-network-properties.c +=================================================================== +--- gnome-control-center-2.31.90.orig/capplets/network/gnome-network-properties.c 2010-08-17 02:46:46.000000000 +1000 ++++ gnome-control-center-2.31.90/capplets/network/gnome-network-properties.c 2010-09-01 17:42:38.122617000 +1000 +@@ -28,6 +28,9 @@ + #include + #include + #include ++#include ++#include ++#include + + #include "capplet-util.h" + #include "gconf-property-editor.h" +@@ -191,6 +194,343 @@ + } + } + ++static gboolean ++dbus_set_proxy_helper(DBusGProxy *dbus_proxy, ++ const char *proxy_type, ++ const char *host, ++ int port) ++{ ++ GError *error = NULL; ++ gboolean dbus_ret, res; ++ gchar *proxy_str = NULL; ++ ++ fprintf(stderr, "set_proxy_helper: '%s' '%s'\n", proxy_type, host); ++ ++ /* FIXME: add proxy auth support when a "secure" store for the proxy ++ password is available */ ++ proxy_str = g_strdup_printf("%s://%s:%i/", proxy_type, host, port); ++ g_print("p: %s\n", proxy_str); ++ ++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "set_proxy", &error, ++ G_TYPE_STRING, proxy_type, ++ G_TYPE_STRING, proxy_str, ++ G_TYPE_INVALID, ++ G_TYPE_BOOLEAN, &res, ++ G_TYPE_INVALID); ++ ++ if(!dbus_ret) { ++ if (error->domain == DBUS_GERROR && ++ error->code == DBUS_GERROR_REMOTE_EXCEPTION) ++ g_printerr ("Caught remote method exception %s: %s", ++ dbus_g_error_get_name (error), ++ error->message); ++ else ++ g_printerr ("Error: %s\n", error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ g_print("set_proxy() returned: %i\n", res); ++ return TRUE; ++} ++ ++static gboolean ++dbus_reset_proxy_helper(DBusGProxy *dbus_proxy, const char *proxy_type) ++{ ++ GError *error = NULL; ++ gboolean dbus_ret, res; ++ ++ fprintf(stderr, "reseting proxy %s\n", proxy_type); ++ ++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "set_proxy", &error, ++ G_TYPE_STRING, proxy_type, ++ G_TYPE_STRING, "", ++ G_TYPE_INVALID, ++ G_TYPE_BOOLEAN, &res, ++ G_TYPE_INVALID); ++ fprintf(stderr, "reset_proxy() returned: %i\n", res); ++ ++ if(!dbus_ret) ++ { ++ if (error->domain == DBUS_GERROR && ++ error->code == DBUS_GERROR_REMOTE_EXCEPTION) ++ g_printerr ("Caught remote method exception %s: %s", ++ dbus_g_error_get_name (error), ++ error->message); ++ else ++ g_printerr ("Error: %s\n", error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ return TRUE; ++} ++ ++static gboolean ++dbus_set_to_system_gconf_helper(DBusGProxy *dbus_proxy) ++{ ++ GConfClient *client; ++ GError *error = NULL; ++ gboolean dbus_ret; ++ gchar* include[] = {"/system/proxy","/system/http_proxy", NULL}; ++ gchar* exclude[] = {NULL}; ++ ++ fprintf(stderr, "set_set_to_system_gconf_helper\n"); ++ ++ client = gconf_client_get_default (); ++ gconf_client_suggest_sync (client, &error); ++ dbus_ret = dbus_g_proxy_call (dbus_proxy, "SetSystem", &error, ++ G_TYPE_STRV, include, ++ G_TYPE_STRV, exclude, ++ G_TYPE_INVALID, ++ G_TYPE_INVALID); ++ ++ if(!dbus_ret) { ++ if (error->domain == DBUS_GERROR && ++ error->code == DBUS_GERROR_REMOTE_EXCEPTION) ++ g_printerr ("Caught remote method exception %s: %s", ++ dbus_g_error_get_name (error), ++ error->message); ++ else ++ g_printerr ("Error: %s\n", error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ return TRUE; ++} ++ ++static void ++cb_reset_system_default (GtkButton *button, gpointer data) ++{ ++ GConfClient *client; ++ GError *error; ++ gboolean res; ++ ++ client = gconf_client_get_default (); ++ res = gconf_client_recursive_unset (client, "/system/proxy", 0, &error); ++ if(!res) ++ g_printerr("recursive_unset: %s: %s", dbus_g_error_get_name(error), error->message); ++ res = gconf_client_recursive_unset (client, "/system/http_proxy", 0, &error); ++ if(!res) ++ g_printerr("recursive_unset: %s: %s", dbus_g_error_get_name(error), error->message); ++} ++ ++static void ++cb_make_system_default (GtkButton *button, gpointer data) ++{ ++ DBusGConnection *systembus; ++ GError *error = NULL; ++ DBusGProxy *dbus_proxy; ++ GConfClient *client; ++ gchar *http_proxy, *ftp_proxy, *https_proxy; ++ gint http_port, ftp_port, https_port; ++ gboolean use_proxy; ++ ++ g_print ("cb_make_system_default\n"); ++ ++ // do ride the dbus ++ systembus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); ++ dbus_proxy = dbus_g_proxy_new_for_name (systembus, ++ "com.ubuntu.SystemService", ++ "/", ++ "com.ubuntu.SystemService"); ++ if (dbus_proxy == NULL) { ++ g_printerr ("Failed to get proxy: %s\n", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ client = gconf_client_get_default (); ++ use_proxy = gconf_client_get_bool (client, USE_PROXY_KEY, NULL); ++ ++ if (use_proxy) { ++ // read the proxy settings ++ http_proxy = gconf_client_get_string (client, HTTP_PROXY_HOST_KEY, NULL); ++ http_port = gconf_client_get_int (client, HTTP_PROXY_PORT_KEY, NULL); ++ if(http_proxy == NULL || strlen(http_proxy) == 0) ++ dbus_reset_proxy_helper(dbus_proxy, "http"); ++ else ++ dbus_set_proxy_helper(dbus_proxy, "http", http_proxy, http_port); ++ ++ ftp_proxy = gconf_client_get_string (client, FTP_PROXY_HOST_KEY, NULL); ++ ftp_port = gconf_client_get_int (client, FTP_PROXY_PORT_KEY, NULL); ++ if(ftp_proxy == NULL || strlen(ftp_proxy) == 0) ++ dbus_reset_proxy_helper(dbus_proxy, "ftp"); ++ else ++ dbus_set_proxy_helper(dbus_proxy, "ftp", ftp_proxy, ftp_port); ++ ++ https_proxy = gconf_client_get_string (client, SECURE_PROXY_HOST_KEY, NULL); ++ https_port = gconf_client_get_int (client, SECURE_PROXY_PORT_KEY, NULL); ++ if(https_proxy == NULL || strlen(https_proxy) == 0) ++ dbus_reset_proxy_helper(dbus_proxy, "https"); ++ else ++ dbus_set_proxy_helper(dbus_proxy, "https", https_proxy, https_port); ++ g_object_unref(dbus_proxy); ++ } else { ++ // we don't use a proxy ++ dbus_reset_proxy_helper(dbus_proxy, "http"); ++ dbus_reset_proxy_helper(dbus_proxy, "ftp"); ++ dbus_reset_proxy_helper(dbus_proxy, "https"); ++ } ++ ++ ++ // set it to gconf as well ++ dbus_proxy = dbus_g_proxy_new_for_name (systembus, ++ "org.gnome.GConf.Defaults", ++ "/", ++ "org.gnome.GConf.Defaults"); ++ if (dbus_proxy == NULL) { ++ g_printerr ("Failed to get proxy: %s\n", ++ error->message); ++ g_error_free (error); ++ return; ++ } ++ dbus_set_to_system_gconf_helper(dbus_proxy); ++ ++ g_object_unref(dbus_proxy); ++} ++ ++static gboolean ++is_admin () ++{ ++ gid_t groups [1024]; ++ int i, ngroups; ++ struct group *admin; ++ ++ admin = getgrnam ("admin"); ++ if (admin == NULL) ++ return FALSE; ++ ++ ngroups = getgroups (1024, groups); ++ if (ngroups < 0) { ++ perror ("getgroups"); ++ return FALSE; ++ } ++ ++ for (i = 0; i < ngroups; ++i) { ++ if (groups[i] == admin->gr_gid) ++ return TRUE; ++ } ++ ++ return FALSE; ++ ++} ++ ++static gboolean ++check_user_system_diff () ++{ ++ DBusGConnection *systembus; ++ GError *error = NULL; ++ DBusGProxy *dbus_proxy; ++ GConfClient *client; ++ gchar *sys_http, *sys_ftp, *sys_https; ++ gboolean use_proxy; ++ gchar *proxy; ++ gint port; ++ gchar* s; ++ gboolean ret = FALSE; ++ ++ g_print ("check_do_system_wide\n"); ++ ++ // check the system wide values ++ systembus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error); ++ dbus_proxy = dbus_g_proxy_new_for_name (systembus, ++ "com.ubuntu.SystemService", ++ "/", ++ "com.ubuntu.SystemService"); ++ if (dbus_proxy == NULL) { ++ g_printerr ("Failed to get D-BUS proxy: %s\n", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ ++ if (!dbus_g_proxy_call (dbus_proxy, "get_proxy", &error, ++ G_TYPE_STRING, "http", ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &sys_http, ++ G_TYPE_INVALID)) { ++ g_printerr ("Failed to get http proxy: %s\n", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ g_print(" system wide HTTP: %s\n", sys_http); ++ if (!dbus_g_proxy_call (dbus_proxy, "get_proxy", &error, ++ G_TYPE_STRING, "https", ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &sys_https, ++ G_TYPE_INVALID)) { ++ g_printerr ("Failed to get https proxy: %s\n", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ g_print(" system wide HTTPS: %s\n", sys_https); ++ if (!dbus_g_proxy_call (dbus_proxy, "get_proxy", &error, ++ G_TYPE_STRING, "ftp", ++ G_TYPE_INVALID, ++ G_TYPE_STRING, &sys_ftp, ++ G_TYPE_INVALID)) { ++ g_printerr ("Failed to get ftp proxy: %s\n", ++ error->message); ++ g_error_free (error); ++ return FALSE; ++ } ++ g_print(" system wide FTP: %s\n", sys_ftp); ++ g_object_unref(dbus_proxy); ++ ++ ++ client = gconf_client_get_default (); ++ use_proxy = gconf_client_get_bool (client, USE_PROXY_KEY, NULL); ++ ++ /* compare with values from gconf for HTTP */ ++ proxy = gconf_client_get_string (client, HTTP_PROXY_HOST_KEY, NULL); ++ port = gconf_client_get_int (client, HTTP_PROXY_PORT_KEY, NULL); ++ if (use_proxy && g_strcmp0 (proxy, "")) { ++ s = g_strdup_printf ("http://%s:%i/", proxy, port); ++ g_print (" user HTTP: %s\n", s); ++ if (strcmp (s, sys_http)) ++ ret = TRUE; ++ g_free (s); ++ } else { ++ g_print (" no user HTTP\n"); ++ if (g_strcmp0 (sys_http, "")) ++ ret = TRUE; ++ } ++ ++ /* compare with values from gconf for HTTPS */ ++ proxy = gconf_client_get_string (client, FTP_PROXY_HOST_KEY, NULL); ++ port = gconf_client_get_int (client, FTP_PROXY_PORT_KEY, NULL); ++ if (use_proxy && g_strcmp0 (proxy, "")) { ++ s = g_strdup_printf ("ftp://%s:%i/", proxy, port); ++ g_print (" user FTP: %s\n", s); ++ if (strcmp (s, sys_ftp)) ++ ret = TRUE; ++ g_free (s); ++ } else { ++ g_print (" no user FTP\n"); ++ if (g_strcmp0 (sys_ftp, "")) ++ ret = TRUE; ++ } ++ ++ /* compare with values from gconf for HTTPS */ ++ proxy = gconf_client_get_string (client, SECURE_PROXY_HOST_KEY, NULL); ++ port = gconf_client_get_int (client, SECURE_PROXY_PORT_KEY, NULL); ++ if (use_proxy && g_strcmp0 (proxy, "")) { ++ s = g_strdup_printf ("https://%s:%i/", proxy, port); ++ g_print (" user HTTPS: %s\n", s); ++ if (strcmp (s, sys_https)) ++ ret = TRUE; ++ g_free (s); ++ } else { ++ g_print (" no user HTTPS\n"); ++ if (g_strcmp0 (sys_https, "")) ++ ret = TRUE; ++ } ++ ++ return ret; ++} ++ ++ + static void + cb_dialog_response (GtkDialog *dialog, gint response_id) + { +@@ -199,6 +539,22 @@ + "goscustdesk-50"); + else if (response_id == GTK_RESPONSE_CLOSE || response_id == GTK_RESPONSE_DELETE_EVENT) + { ++ if (is_admin () && check_user_system_diff ()) { ++ g_debug ("user and system proxy settings differ"); ++ gint res; ++ GtkDialog *msg = GTK_DIALOG (gtk_message_dialog_new (GTK_WINDOW (dialog), 0, ++ GTK_MESSAGE_QUESTION, GTK_BUTTONS_CLOSE, _( ++ "Do you want to apply these settings system-wide, " ++ "so that they are also used for package installation " ++ "and other system services?"))); ++ gtk_dialog_add_button (msg, ++ _("Apply System-Wide..."), GTK_RESPONSE_APPLY); ++ res = gtk_dialog_run (msg); ++ gtk_widget_destroy (GTK_WIDGET (msg)); ++ ++ if (res == GTK_RESPONSE_APPLY) ++ cb_make_system_default (NULL, NULL); ++ } + if (ignore_hosts) { + g_slist_foreach (ignore_hosts, (GFunc) g_free, NULL); + g_slist_free (ignore_hosts); +@@ -1348,6 +1704,12 @@ + "activate", G_CALLBACK (cb_add_url), builder); + g_signal_connect (gtk_builder_get_object (builder, "button_remove_url"), + "clicked", G_CALLBACK (cb_remove_url), builder); ++ ++ /* System-wide default */ ++ g_signal_connect(gtk_builder_get_object (builder, "button_make_system_default"), "clicked", ++ G_CALLBACK(cb_make_system_default), builder); ++ g_signal_connect(gtk_builder_get_object (builder, "button_reset_to_defaults"), "clicked", ++ G_CALLBACK(cb_reset_system_default), builder); + } + + int +Index: gnome-control-center-2.31.90/capplets/network/gnome-network-properties.ui +=================================================================== +--- gnome-control-center-2.31.90.orig/capplets/network/gnome-network-properties.ui 2010-08-17 02:46:46.000000000 +1000 ++++ gnome-control-center-2.31.90/capplets/network/gnome-network-properties.ui 2010-09-01 17:42:38.122617000 +1000 +@@ -513,6 +513,38 @@ + 1 + + ++ ++ ++ True ++ 6 ++ GTK_BUTTONBOX_START ++ ++ ++ True ++ True ++ True ++ Apply System-Wide... ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ True ++ Reset ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ + + + False --- gnome-control-center-2.32.1.orig/debian/patches/90_gnome-mouse-properties_small_screen.patch +++ gnome-control-center-2.32.1/debian/patches/90_gnome-mouse-properties_small_screen.patch @@ -0,0 +1,70 @@ +Description: Add scrollbar on small screens in mouse properties +Author: ? + +Index: gnome-control-center-2.29.4/capplets/mouse/gnome-mouse-properties.c +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/mouse/gnome-mouse-properties.c 2009-12-04 17:11:07.000000000 +0000 ++++ gnome-control-center-2.29.4/capplets/mouse/gnome-mouse-properties.c 2010-01-11 02:11:43.000000000 +0000 +@@ -525,6 +525,62 @@ + return NULL; + } + ++ if (gdk_screen_get_default () != NULL && gdk_screen_get_height (gdk_screen_get_default ()) <= 600) { ++ GtkWidget *scrolledWindow1024x600_1, *viewport_1; ++ GtkWidget *scrolledWindow1024x600_2, *viewport_2; ++ GtkWidget *dialogWindow = NULL; ++ GtkWidget *child, *mother, *childtablabel, *childmenulabel; ++ gchar* childlabeltext; ++ int pagenum; ++ ++ /* add scrolledbar to general_vbox */ ++ child = GTK_WIDGET (gtk_builder_get_object (dialog,"general_vbox")); ++ if (child != NULL) { ++ mother = gtk_widget_get_parent (child); ++ pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (mother), child); ++ childtablabel = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mother),child); ++ childmenulabel = gtk_notebook_get_menu_label (GTK_NOTEBOOK (mother), child); ++ childlabeltext = g_strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (child))); ++ scrolledWindow1024x600_1 = gtk_scrolled_window_new (NULL,NULL); ++ if (scrolledWindow1024x600_1 != NULL) { ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow1024x600_1), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ } ++ viewport_1 = gtk_viewport_new (NULL, NULL); ++ gtk_container_add (GTK_CONTAINER (scrolledWindow1024x600_1), GTK_WIDGET (viewport_1)); ++ gtk_widget_show (scrolledWindow1024x600_1); ++ gtk_widget_show (viewport_1); ++ gtk_widget_reparent (GTK_WIDGET (child), GTK_WIDGET (viewport_1)); ++ gtk_notebook_insert_page_menu (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_1), NULL, childmenulabel, pagenum); ++ gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_1), childlabeltext); ++ } ++ ++ /* add scrolledbar to accessibility_vbox */ ++ child = GTK_WIDGET (gtk_builder_get_object (dialog, "accessibility_vbox")); ++ if (child != NULL) { ++ mother = gtk_widget_get_parent (child); ++ pagenum = gtk_notebook_page_num (GTK_NOTEBOOK (mother), child); ++ childtablabel = gtk_notebook_get_tab_label (GTK_NOTEBOOK (mother), child); ++ childmenulabel = gtk_notebook_get_menu_label (GTK_NOTEBOOK (mother), child); ++ childlabeltext = g_strdup (gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (child))); ++ scrolledWindow1024x600_2 = gtk_scrolled_window_new (NULL,NULL); ++ if (scrolledWindow1024x600_2 != NULL) { ++ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledWindow1024x600_2), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); ++ } ++ viewport_2 = gtk_viewport_new (NULL,NULL); ++ gtk_container_add (GTK_CONTAINER (scrolledWindow1024x600_2), GTK_WIDGET (viewport_2)); ++ gtk_widget_show (scrolledWindow1024x600_2); ++ gtk_widget_show (viewport_2); ++ gtk_widget_reparent (GTK_WIDGET (child), GTK_WIDGET (viewport_2)); ++ gtk_notebook_insert_page_menu (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_2), NULL, childmenulabel, pagenum); ++ gtk_notebook_set_tab_label_text (GTK_NOTEBOOK (mother), GTK_WIDGET (scrolledWindow1024x600_2), childlabeltext); ++ } ++ ++ /* set default size of dialog smaller */ ++ dialogWindow = GTK_WIDGET (gtk_builder_get_object (dialog, "mouse_properties_dialog")); ++ if (dialogWindow != NULL) { ++ gtk_window_set_default_size (GTK_WINDOW (dialogWindow), -1, 448); ++ } ++ } + size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + gtk_size_group_add_widget (size_group, WID ("acceleration_label")); + gtk_size_group_add_widget (size_group, WID ("sensitivity_label")); --- gnome-control-center-2.32.1.orig/debian/patches/25_window_manager_settings.patch +++ gnome-control-center-2.32.1/debian/patches/25_window_manager_settings.patch @@ -0,0 +1,19 @@ +--- a/capplets/windows/Makefile.am ++++ b/capplets/windows/Makefile.am +@@ -20,7 +20,7 @@ + + INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) \ + -I$(top_srcdir)/libwindow-settings \ +- -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ ++ -DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/libgnome-window-settings1"\" \ + -DUIDIR=\""$(uidir)"\" \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DPIXMAPDIR=\""$(pixmapdir)"\" +--- a/libwindow-settings/Makefile.am ++++ b/libwindow-settings/Makefile.am +@@ -1,4 +1,4 @@ +-WM_MODULE_DIR=$(libdir)/window-manager-settings ++WM_MODULE_DIR=$(libdir)/libgnome-window-settings1 + + INCLUDES = \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ --- gnome-control-center-2.32.1.orig/debian/patches/52_button_layout_from_theme.patch +++ gnome-control-center-2.32.1/debian/patches/52_button_layout_from_theme.patch @@ -0,0 +1,358 @@ +Description: Enable themes to provide a prefered button layout option: + X-GNOME-Metatheme/ButtonLayout. + . + When selecting the theme, the ButtonLayout provided (if any) is applied, + otherwise, menu:maximize,minimize,close is choosed as a default. + We still provide a button for the user to revert the change if the user changed + the previous theme button layout. +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=614014 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/535322 +Author: Didier Roche + +Index: gnome-control-center-2.32.1/capplets/common/gnome-theme-info.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/common/gnome-theme-info.c 2011-01-23 17:05:46.992505001 +0300 ++++ gnome-control-center-2.32.1/capplets/common/gnome-theme-info.c 2011-01-27 21:42:50.466628001 +0300 +@@ -36,6 +36,9 @@ + #define MONOSPACE_FONT_KEY "X-GNOME-Metatheme/MonospaceFont" + #define BACKGROUND_IMAGE_KEY "X-GNOME-Metatheme/BackgroundImage" + #define HIDDEN_KEY "X-GNOME-Metatheme/Hidden" ++#define BUTTON_LAYOUT_KEY "X-GNOME-Metatheme/ButtonLayout" ++ ++#define DEFAULT_BUTTON_LAYOUT "menu:minimize,maximize,close" + + /* Terminology used in this lib: + * +@@ -383,6 +386,12 @@ + meta_theme_info->hidden = gnome_desktop_item_get_boolean (meta_theme_ditem, + HIDDEN_KEY); + ++ str = gnome_desktop_item_get_string (meta_theme_ditem, BUTTON_LAYOUT_KEY); ++ if (str == NULL) ++ str = DEFAULT_BUTTON_LAYOUT; ++ meta_theme_info->button_layout = g_strdup (str); ++ ++ + gnome_desktop_item_unref (meta_theme_ditem); + + return meta_theme_info; +@@ -1605,6 +1614,7 @@ + g_free (meta_theme_info->icon_theme_name); + g_free (meta_theme_info->metacity_theme_name); + g_free (meta_theme_info->notification_theme_name); ++ g_free (meta_theme_info->button_layout); + g_free (meta_theme_info); + } + +@@ -1727,6 +1737,9 @@ + cmp = safe_strcmp (a->monospace_font, b->monospace_font); + if (cmp != 0) return cmp; + ++ cmp = safe_strcmp (a->button_layout, b->button_layout); ++ if (cmp != 0) return cmp; ++ + return safe_strcmp (a->background_image, b->background_image); + } + +Index: gnome-control-center-2.32.1/capplets/common/gnome-theme-info.h +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/common/gnome-theme-info.h 2011-01-23 17:05:47.032505001 +0300 ++++ gnome-control-center-2.32.1/capplets/common/gnome-theme-info.h 2011-01-27 21:42:50.466628001 +0300 +@@ -115,6 +115,7 @@ + gchar *windowtitle_font; + gchar *monospace_font; + gchar *background_image; ++ gchar *button_layout; + }; + + enum { +Index: gnome-control-center-2.32.1/capplets/appearance/appearance-themes.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/appearance/appearance-themes.c 2011-01-23 17:05:46.882505001 +0300 ++++ gnome-control-center-2.32.1/capplets/appearance/appearance-themes.c 2011-01-27 21:43:40.096628002 +0300 +@@ -39,7 +39,8 @@ + RESPONSE_APPLY_BG, + RESPONSE_REVERT_FONT, + RESPONSE_APPLY_FONT, +- RESPONSE_INSTALL_ENGINE ++ RESPONSE_INSTALL_ENGINE, ++ RESPONSE_REVERT_BUTTON_LAYOUT, + }; + + enum +@@ -56,6 +57,8 @@ + + static void theme_message_area_update (AppearanceData *data); + ++GnomeThemeMetaInfo *previoustheme = NULL; ++ + static time_t + theme_get_mtime (const char *name) + { +@@ -257,6 +260,8 @@ + + theme->application_font = gconf_client_get_string (client, APPLICATION_FONT_KEY, NULL); + ++ theme->button_layout = gconf_client_get_string (client, BUTTON_LAYOUT_KEY, NULL); ++ + return theme; + } + +@@ -374,6 +379,7 @@ + g_free (custom->gtk_color_scheme); + g_free (custom->cursor_theme_name); + g_free (custom->application_font); ++ g_free (custom->button_layout); + custom->gtk_color_scheme = NULL; + custom->application_font = NULL; + +@@ -383,6 +389,7 @@ + custom->metacity_theme_name = g_strdup (info->metacity_theme_name); + custom->cursor_theme_name = g_strdup (info->cursor_theme_name); + custom->cursor_size = info->cursor_size; ++ custom->button_layout = g_strdup (info->button_layout); + + /* these can be NULL */ + if (info->gtk_color_scheme) +@@ -579,6 +586,16 @@ + } + theme_message_area_update (data); + break; ++ ++ case RESPONSE_REVERT_BUTTON_LAYOUT: ++ if (data->revert_button_layout != NULL) { ++ gconf_client_set_string (data->client, BUTTON_LAYOUT_KEY, ++ data->revert_button_layout, NULL); ++ g_free (data->revert_button_layout); ++ data->revert_button_layout = NULL; ++ } ++ break; ++ + } + } + +@@ -589,9 +606,11 @@ + gboolean show_apply_background = FALSE; + gboolean show_apply_font = FALSE; + gboolean show_revert_font = FALSE; ++ gboolean show_revert_button_layout = FALSE; + gboolean show_error; + const gchar *message; + gchar *font; ++ gchar *button_layout; + GError *error = NULL; + + theme = theme_get_selected (GTK_ICON_VIEW (appearance_capplet_get_widget (data, "theme_list")), data); +@@ -652,6 +671,11 @@ + show_revert_font = (data->revert_application_font != NULL || + data->revert_documents_font != NULL || data->revert_desktop_font != NULL || + data->revert_windowtitle_font != NULL || data->revert_monospace_font != NULL); ++ ++ button_layout = gconf_client_get_string (data->client, BUTTON_LAYOUT_KEY, NULL); ++ show_revert_button_layout = ++ (!button_layout || data->revert_button_layout != NULL); ++ g_free (button_layout); + } + + if (data->theme_message_area == NULL) { +@@ -659,7 +683,7 @@ + GtkWidget *parent; + GtkWidget *content; + +- if (!show_apply_background && !show_revert_font && !show_apply_font && !show_error) ++ if (!show_apply_background && !show_revert_font && !show_apply_font && !show_error && !show_revert_button_layout) + return; + + data->theme_message_area = gtk_info_bar_new (); +@@ -684,6 +708,10 @@ + GTK_INFO_BAR (data->theme_message_area), + _("Install"), + RESPONSE_INSTALL_ENGINE); ++ data->revert_button_layout_button = gtk_info_bar_add_button ( ++ GTK_INFO_BAR (data->theme_message_area), ++ _("Revert Button Layout"), ++ RESPONSE_REVERT_BUTTON_LAYOUT); + + data->theme_message_label = gtk_label_new (NULL); + gtk_widget_show (data->theme_message_label); +@@ -708,20 +736,30 @@ + + if (show_error) + message = error->message; ++ else if (show_apply_background && show_apply_font && show_revert_font && show_revert_button_layout) ++ message = _("The current theme suggests a background, a font and a button layout. Also, the last applied font and button layout suggestion can be reverted."); + else if (show_apply_background && show_apply_font && show_revert_font) + message = _("The current theme suggests a background and a font. Also, the last applied font suggestion can be reverted."); ++ else if (show_apply_background && show_apply_font && show_revert_button_layout) ++ message = _("The current theme suggests a background, a font and a button layout. Also, the last applied button layout suggestion can be reverted."); ++ else if (show_apply_background && show_revert_font && show_revert_button_layout) ++ message = _("The current theme suggests a background and a button layout. Also, the last applied font and button layout suggestion can be reverted."); + else if (show_apply_background && show_revert_font) + message = _("The current theme suggests a background. Also, the last applied font suggestion can be reverted."); + else if (show_apply_background && show_apply_font) + message = _("The current theme suggests a background and a font."); + else if (show_apply_font && show_revert_font) + message = _("The current theme suggests a font. Also, the last applied font suggestion can be reverted."); ++ else if (show_apply_font && show_revert_button_layout) ++ message = _("The current theme suggests a font and a button layout. Also, the last applied button_layout suggestion can be reverted."); + else if (show_apply_background) + message = _("The current theme suggests a background."); + else if (show_revert_font) + message = _("The last applied font suggestion can be reverted."); + else if (show_apply_font) + message = _("The current theme suggests a font."); ++ else if (show_revert_button_layout) ++ message = _("The current theme suggests a button layout. Also, the last button layout suggestion can be reverted."); + else + message = NULL; + +@@ -740,6 +778,11 @@ + else + gtk_widget_hide (data->revert_font_button); + ++ if (show_revert_button_layout) ++ gtk_widget_show (data->revert_button_layout_button); ++ else ++ gtk_widget_hide (data->revert_button_layout_button); ++ + if (show_error + && g_error_matches (error, GNOME_THEME_ERROR, GNOME_THEME_ERROR_GTK_ENGINE_NOT_AVAILABLE) + && packagekit_available ()) +@@ -747,7 +790,7 @@ + else + gtk_widget_hide (data->install_button); + +- if (show_error || show_apply_background || show_apply_font || show_revert_font) { ++ if (show_error || show_apply_background || show_apply_font || show_revert_font || show_revert_button_layout) { + gtk_widget_show (data->theme_message_area); + gtk_widget_queue_draw (data->theme_message_area); + +@@ -767,6 +810,29 @@ + } + + static void ++update_button_layout (GnomeThemeMetaInfo *theme, AppearanceData *data) ++{ ++ gchar *tmpbutton_layout = NULL; ++ ++ if (theme->button_layout) { ++ tmpbutton_layout = gconf_client_get_string (data->client, BUTTON_LAYOUT_KEY, NULL); ++ if (tmpbutton_layout != NULL) { ++ g_free (data->revert_button_layout); ++ data->revert_button_layout = NULL; ++ if (strcmp (theme->button_layout, tmpbutton_layout) == 0) ++ g_free (tmpbutton_layout); ++ else { ++ if (previoustheme && previoustheme->button_layout && (strcmp (previoustheme->button_layout, tmpbutton_layout) != 0)) ++ data->revert_button_layout = tmpbutton_layout; ++ } ++ } ++ if (previoustheme) ++ gconf_client_set_string (data->client, BUTTON_LAYOUT_KEY, ++ theme->button_layout, NULL); ++ } ++} ++ ++static void + theme_selection_changed_cb (GtkWidget *icon_view, AppearanceData *data) + { + GList *selection; +@@ -794,6 +860,8 @@ + if (theme) { + gnome_meta_theme_set (theme); + theme_message_area_update (data); ++ update_button_layout (theme, data); ++ previoustheme = theme; + } + + g_free (name); +@@ -998,7 +1066,7 @@ + } + + static void +-background_or_font_changed (GConfEngine *conf, ++background_button_or_font_changed (GConfEngine *conf, + guint cnxn_id, + GConfEntry *entry, + AppearanceData *data) +@@ -1027,6 +1095,7 @@ + data->revert_documents_font = NULL; + data->revert_desktop_font = NULL; + data->revert_windowtitle_font = NULL; ++ data->revert_button_layout = NULL; + data->revert_monospace_font = NULL; + data->theme_save_dialog = NULL; + data->theme_message_area = NULL; +@@ -1147,12 +1216,13 @@ + #ifdef HAVE_XCURSOR + gconf_client_notify_add (data->client, CURSOR_SIZE_KEY, (GConfClientNotifyFunc) theme_gconf_changed, data, NULL, NULL); + #endif +- gconf_client_notify_add (data->client, BACKGROUND_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); +- gconf_client_notify_add (data->client, APPLICATION_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); +- gconf_client_notify_add (data->client, DOCUMENTS_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); +- gconf_client_notify_add (data->client, DESKTOP_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); +- gconf_client_notify_add (data->client, WINDOWTITLE_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); +- gconf_client_notify_add (data->client, MONOSPACE_FONT_KEY, (GConfClientNotifyFunc) background_or_font_changed, data, NULL, NULL); ++ gconf_client_notify_add (data->client, BACKGROUND_KEY, (GConfClientNotifyFunc) background_button_or_font_changed, data, NULL, NULL); ++ gconf_client_notify_add (data->client, APPLICATION_FONT_KEY, (GConfClientNotifyFunc) background_button_or_font_changed, data, NULL, NULL); ++ gconf_client_notify_add (data->client, DOCUMENTS_FONT_KEY, (GConfClientNotifyFunc) background_button_or_font_changed, data, NULL, NULL); ++ gconf_client_notify_add (data->client, DESKTOP_FONT_KEY, (GConfClientNotifyFunc) background_button_or_font_changed, data, NULL, NULL); ++ gconf_client_notify_add (data->client, WINDOWTITLE_FONT_KEY, (GConfClientNotifyFunc) background_button_or_font_changed, data, NULL, NULL); ++ gconf_client_notify_add (data->client, MONOSPACE_FONT_KEY, (GConfClientNotifyFunc) background_button_or_font_changed, data, NULL, NULL); ++ gconf_client_notify_add (data->client, BUTTON_LAYOUT_KEY, (GConfClientNotifyFunc) background_button_or_font_changed, data, NULL, NULL); + + settings = gtk_settings_get_default (); + g_signal_connect (settings, "notify::gtk-color-scheme", (GCallback) theme_setting_changed_cb, data); +@@ -1187,4 +1257,5 @@ + g_free (data->revert_desktop_font); + g_free (data->revert_windowtitle_font); + g_free (data->revert_monospace_font); ++ g_free (data->revert_button_layout); + } +Index: gnome-control-center-2.32.1/capplets/appearance/appearance.h +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/appearance/appearance.h 2011-01-23 17:05:46.912505001 +0300 ++++ gnome-control-center-2.32.1/capplets/appearance/appearance.h 2011-01-27 21:42:50.486628001 +0300 +@@ -73,11 +73,13 @@ + GtkWidget *install_button; + GtkWidget *theme_info_icon; + GtkWidget *theme_error_icon; ++ GtkWidget *revert_button_layout_button; + gchar *revert_application_font; + gchar *revert_documents_font; + gchar *revert_desktop_font; + gchar *revert_windowtitle_font; + gchar *revert_monospace_font; ++ gchar *revert_button_layout; + + /* style */ + GdkPixbuf *gtk_theme_icon; +Index: gnome-control-center-2.32.1/capplets/appearance/theme-util.h +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/appearance/theme-util.h 2011-01-23 17:05:46.972505001 +0300 ++++ gnome-control-center-2.32.1/capplets/appearance/theme-util.h 2011-01-27 21:42:50.496628001 +0300 +@@ -30,6 +30,7 @@ + #define DESKTOP_FONT_KEY "/apps/nautilus/preferences/desktop_font" + #define WINDOWTITLE_FONT_KEY "/apps/metacity/general/titlebar_font" + #define MONOSPACE_FONT_KEY "/desktop/gnome/interface/monospace_font_name" ++#define BUTTON_LAYOUT_KEY "/apps/metacity/general/button_layout" + + #ifdef HAVE_XCURSOR + # define CURSOR_THEME_KEY "/desktop/gnome/peripherals/mouse/cursor_theme" +Index: gnome-control-center-2.32.1/capplets/appearance/theme-save.c +=================================================================== +--- gnome-control-center-2.32.1.orig/capplets/appearance/theme-save.c 2011-01-27 21:43:27.506628001 +0300 ++++ gnome-control-center-2.32.1/capplets/appearance/theme-save.c 2011-01-27 21:43:40.096628002 +0300 +@@ -257,6 +257,12 @@ + g_object_unref (client); + } + ++ if (theme_info->button_layout) { ++ str = g_strdup_printf ("ButtonLayout=%s\n", theme_info->button_layout); ++ g_output_stream_write (output, str, strlen (str), NULL, NULL); ++ g_free( str ); ++ } ++ + g_file_move (tmp_file, target_file, G_FILE_COPY_OVERWRITE, NULL, NULL, NULL, NULL); + g_output_stream_close (output, NULL, NULL); + --- gnome-control-center-2.32.1.orig/debian/patches/80_aspect_in_dropdown.patch +++ gnome-control-center-2.32.1/debian/patches/80_aspect_in_dropdown.patch @@ -0,0 +1,52 @@ +Description: Add aspect ratio estimates to resolution drop-down menu +Bug: http://bugzilla.gnome.org/show_bug.cgi?id=549642 + +Index: gnome-control-center-2.31.90/capplets/display/xrandr-capplet.c +=================================================================== +--- gnome-control-center-2.31.90.orig/capplets/display/xrandr-capplet.c 2010-09-01 17:42:46.512617000 +1000 ++++ gnome-control-center-2.31.90/capplets/display/xrandr-capplet.c 2010-09-01 17:42:59.972617001 +1000 +@@ -636,7 +636,43 @@ + static char * + make_resolution_string (int width, int height) + { +- return g_strdup_printf (_("%d x %d"), width, height); ++ int ratio; ++ const char *aspect = NULL; ++ ++ if (width && height) { ++ if (width > height) ratio = width * 10 / height; ++ else ratio = height * 10 / width; ++ ++ switch (ratio) { ++ case 13: ++ aspect = "4:3"; ++ break; ++ case 16: ++ aspect = "16:10"; ++ break; ++ case 17: ++ aspect = "16:9"; ++ break; ++ case 12: ++ aspect = "5:4"; ++ break; ++ // This catches 1.5625 as well (1600x1024) when maybe it shouldn't. ++ case 15: ++ aspect = "3:2"; ++ break; ++ case 18: ++ aspect = "9:5"; ++ break; ++ case 10: ++ aspect = "1:1"; ++ break; ++ } ++ } ++ ++ if (aspect) ++ return g_strdup_printf (_("%d x %d (%s)"), width, height, aspect); ++ else ++ return g_strdup_printf (_("%d x %d"), width, height); + } + + static void --- gnome-control-center-2.32.1.orig/debian/patches/01_remove_debian_default_applications.patch +++ gnome-control-center-2.32.1/debian/patches/01_remove_debian_default_applications.patch @@ -0,0 +1,35 @@ +Description: Remove the Debian entries from the default applications +Author: ? + +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.22.1/capplets/default-applications/gnome-default-applications.xml.in gnome-control-center-2.22.1.new/capplets/default-applications/gnome-default-applications.xml.in +--- gnome-control-center-2.22.1/capplets/default-applications/gnome-default-applications.xml.in 2008-04-11 16:44:46.000000000 +0100 ++++ gnome-control-center-2.22.1.new/capplets/default-applications/gnome-default-applications.xml.in 2008-04-14 15:57:42.000000000 +0100 +@@ -16,14 +16,6 @@ + opera -newwindow %s + + +- <_name>Debian Sensible Browser +- sensible-browser +- sensible-browser %s +- +- false +- false +- +- + <_name>Epiphany Web Browser + epiphany + epiphany %s +@@ -245,13 +237,6 @@ + + + +- <_name>Debian Terminal Emulator +- x-terminal-emulator +- x-terminal-emulator +- gnome-mime-application-x-executable +- -e +- +- + <_name>GNOME Terminal + gnome-terminal + gnome-terminal --- gnome-control-center-2.32.1.orig/debian/patches/53_ubuntu_show_shell.patch +++ gnome-control-center-2.32.1/debian/patches/53_ubuntu_show_shell.patch @@ -0,0 +1,13 @@ +Description: Show gnomecc.desktop, so that we can find it in Unity. For classic GNOME we will disable it in /etc/xdg/menus/settings.menu instead. +Author: Martin Pitt +Bug-Ubuntu: https://launchpad.net/bugs/727823 + +Index: gnome-control-center-2.32.1/shell/gnomecc.desktop.in.in +=================================================================== +--- gnome-control-center-2.32.1.orig/shell/gnomecc.desktop.in.in 2011-03-07 15:33:18.807496658 +0100 ++++ gnome-control-center-2.32.1/shell/gnomecc.desktop.in.in 2011-03-07 15:33:21.687496659 +0100 +@@ -12,4 +12,3 @@ + X-GNOME-Bugzilla-Product=gnome-control-center + X-GNOME-Bugzilla-Component=shell + X-GNOME-Bugzilla-Version=@VERSION@ +-NoDisplay=true --- gnome-control-center-2.32.1.orig/debian/patches/97_subpixel_hinting_defaults.patch +++ gnome-control-center-2.32.1/debian/patches/97_subpixel_hinting_defaults.patch @@ -0,0 +1,16 @@ +Description: Change the default hinting level for subpixel rendering from "Full" to "Slight" +Author: ? + +Index: gnome-control-center-2.31.90/capplets/appearance/appearance-font.c +=================================================================== +--- gnome-control-center-2.31.90.orig/capplets/appearance/appearance-font.c 2010-08-17 02:46:46.000000000 +1000 ++++ gnome-control-center-2.31.90/capplets/appearance/appearance-font.c 2010-09-01 17:43:05.662617001 +1000 +@@ -963,7 +963,7 @@ + ANTIALIAS_GRAYSCALE, HINT_FULL); + setup_font_pair (appearance_capplet_get_widget (data, "subpixel_radio"), + appearance_capplet_get_widget (data, "subpixel_sample"), +- ANTIALIAS_RGBA, HINT_FULL); ++ ANTIALIAS_RGBA, HINT_SLIGHT); + + font_render_load (data->client); + --- gnome-control-center-2.32.1.orig/debian/patches/96_hide_accessible_login.patch +++ gnome-control-center-2.32.1/debian/patches/96_hide_accessible_login.patch @@ -0,0 +1,49 @@ +Description: Remove the "Accessible Login" button from gnome-at-properties. All this does is launch gdmsetup, and the new version of this tool doesn't support changing accessibility settings. +Author: ? + +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.91/capplets/accessibility/at-properties/at-enable-dialog.ui gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/at-enable-dialog.ui +--- gnome-control-center-2.27.91/capplets/accessibility/at-properties/at-enable-dialog.ui 2009-08-31 20:09:39.668853804 +0100 ++++ gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/at-enable-dialog.ui 2009-08-31 20:20:52.737855918 +0100 +@@ -229,7 +229,7 @@ + + + Accessible Lo_gin +- True ++ False + True + False + login_button_img +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.91/capplets/accessibility/at-properties/main.c gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/main.c +--- gnome-control-center-2.27.91/capplets/accessibility/at-properties/main.c 2009-08-31 20:09:39.672857767 +0100 ++++ gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/main.c 2009-08-31 20:23:25.356855134 +0100 +@@ -47,7 +47,7 @@ + "at_applications_image"); + gtk_image_set_from_file (GTK_IMAGE (object), + PIXMAPDIR "/at-support.png"); +- ++#if 0 + prog = g_find_program_in_path ("gdmsetup"); + if (prog == NULL) { + object = gtk_builder_get_object (builder, +@@ -56,6 +56,7 @@ + } + + g_free (prog); ++#endif + } else { + g_warning ("Could not load UI: %s", error->message); + g_error_free (error); +@@ -309,11 +310,11 @@ + object = gtk_builder_get_object (builder, "mouse_button"); + g_signal_connect (object, "clicked", + G_CALLBACK (cb_mouse_preferences), NULL); +- ++#if 0 + object = gtk_builder_get_object (builder, "login_button"); + g_signal_connect (object, "clicked", + G_CALLBACK (cb_login_preferences), NULL); +- ++#endif + widget = GTK_WIDGET (gtk_builder_get_object (builder, + "at_properties_dialog")); + capplet_set_icon (widget, "preferences-desktop-accessibility"); --- gnome-control-center-2.32.1.orig/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch +++ gnome-control-center-2.32.1/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch @@ -0,0 +1,119 @@ +Descrption: No gksu/disable-grab option per gui in gnome-at-properties +Author: ? + +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.91/capplets/accessibility/at-properties/at-enable-dialog.ui gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/at-enable-dialog.ui +--- gnome-control-center-2.27.91/capplets/accessibility/at-properties/at-enable-dialog.ui 2009-08-31 02:16:12.377854799 +0100 ++++ gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/at-enable-dialog.ui 2009-08-31 02:16:15.337854165 +0100 +@@ -98,6 +98,28 @@ + 1 + + ++ ++ ++ True ++ True ++ _Password dialogs as normal windows ++ True ++ True ++ ++ ++ ++ ++ ++ Changes to enable assistive technologies will not take effect until your next log in. ++ ++ ++ ++ ++ False ++ False ++ 2 ++ ++ + + + 1 +diff -Nur -x '*.orig' -x '*~' gnome-control-center-2.27.91/capplets/accessibility/at-properties/main.c gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/main.c +--- gnome-control-center-2.27.91/capplets/accessibility/at-properties/main.c 2009-08-31 02:16:12.373856697 +0100 ++++ gnome-control-center-2.27.91.new/capplets/accessibility/at-properties/main.c 2009-08-31 02:16:15.337854165 +0100 +@@ -21,6 +21,8 @@ + + #define ACCESSIBILITY_KEY "/desktop/gnome/interface/accessibility" + #define ACCESSIBILITY_KEY_DIR "/desktop/gnome/interface" ++#define GKSU_NO_GRAB_KEY "/apps/gksu/disable-grab" ++#define GKSU_NO_GRAB_KEY_DIR "/apps/gksu" + + static gboolean initial_state; + +@@ -211,6 +213,42 @@ + } + + static void ++at_gksudo_update (GConfClient *client, ++ GtkBuilder *builder) ++{ ++ gboolean is_enabled = gconf_client_get_bool (client, GKSU_NO_GRAB_KEY, NULL); ++ GObject *button = gtk_builder_get_object (builder, "at_gksudo_toggle"); ++ ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), ++ is_enabled); ++} ++ ++ ++static void ++at_gksudo_changed (GConfClient *client, ++ guint cnxn_id, ++ GConfEntry *entry, ++ gpointer user_data) ++{ ++ at_gksudo_update (client, user_data); ++} ++ ++ ++static void ++at_gksudo_toggled (GtkToggleButton *toggle_button, ++ GtkBuilder *builder) ++{ ++ GConfClient *client = gconf_client_get_default (); ++ gboolean is_enabled = gtk_toggle_button_get_active (toggle_button); ++ ++ gconf_client_set_bool (client, GKSU_NO_GRAB_KEY, ++ is_enabled, ++ NULL); ++ g_object_unref (client); ++} ++ ++ ++static void + setup_dialog (GtkBuilder *builder) + { + GConfClient *client; +@@ -219,7 +257,27 @@ + GObject *peditor; + + client = gconf_client_get_default (); +- ++ ++ //Password grab toggle ++ gconf_client_add_dir (client, GKSU_NO_GRAB_KEY_DIR, ++ GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); ++ ++ object = gtk_builder_get_object (builder, "at_gksudo_toggle"); ++ ++ g_signal_connect (object, "toggled", ++ G_CALLBACK (at_gksudo_toggled), ++ builder); ++ ++ peditor = gconf_peditor_new_boolean (NULL, GKSU_NO_GRAB_KEY, ++ GTK_WIDGET (object), ++ NULL); ++ ++ at_gksudo_update (client, builder); ++ ++ gconf_client_notify_add (client, GKSU_NO_GRAB_KEY_DIR, ++ at_gksudo_changed, ++ builder, NULL, NULL); ++ + gconf_client_add_dir (client, ACCESSIBILITY_KEY_DIR, + GCONF_CLIENT_PRELOAD_ONELEVEL, NULL); +