--- gnome-control-center-2.29.91.orig/debian/libgnome-window-settings1.install +++ gnome-control-center-2.29.91/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.29.91.orig/debian/copyright +++ gnome-control-center-2.29.91/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.29.91.orig/debian/watch +++ gnome-control-center-2.29.91/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.29.91.orig/debian/gnome-keyboard-properties.1 +++ gnome-control-center-2.29.91/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.29.91.orig/debian/libgnome-window-settings-dev.install +++ gnome-control-center-2.29.91/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.29.91.orig/debian/gnome-control-center.sgml +++ gnome-control-center-2.29.91/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.29.91.orig/debian/gnome-control-center.manpages +++ gnome-control-center-2.29.91/debian/gnome-control-center.manpages @@ -0,0 +1 @@ +debian/gnome-keyboard-properties.1 --- gnome-control-center-2.29.91.orig/debian/control +++ gnome-control-center-2.29.91/debian/control @@ -0,0 +1,125 @@ +# 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 +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu +Build-Depends: cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.10), + quilt, + dpkg-dev (>= 1.13.19), + debhelper (>= 5.0.0), + docbook-to-man, + autotools-dev, + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.37.1), + libxt-dev, + libx11-dev, + libxss-dev, + libxxf86misc-dev, + libcanberra-gtk-dev, + libgtk2.0-dev (>= 2.15.0), + librsvg2-dev, + libpango1.0-dev (>= 1.17), + 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), + libgstreamer-plugins-base0.10-dev, + libxft-dev (>= 2.1.2), + libxcursor-dev, + libxi-dev (>= 2:1.2), + libgnomekbd-dev (>= 2.27.4), + libxklavier-dev (>= 4.0), + libebook1.2-dev (>= 1.7.90), + libunique-dev, + libappindicator-dev, + desktop-file-utils, + shared-mime-info, + scrollkeeper + +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.26), + 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, + screen-resolution-extra, + 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.29.91.orig/debian/visual-effects_custom.svg +++ gnome-control-center-2.29.91/debian/visual-effects_custom.svg @@ -0,0 +1,767 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + Visual Effects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- gnome-control-center-2.29.91.orig/debian/visual-effects_none.svg +++ gnome-control-center-2.29.91/debian/visual-effects_none.svg @@ -0,0 +1,522 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + Visual Effects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- gnome-control-center-2.29.91.orig/debian/rules +++ gnome-control-center-2.29.91/debian/rules @@ -0,0 +1,37 @@ +#!/usr/bin/make -f + +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/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 + +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.29.91.orig/debian/gnome-control-center-dev.install +++ gnome-control-center-2.29.91/debian/gnome-control-center-dev.install @@ -0,0 +1 @@ +debian/tmp/usr/share/pkgconfig --- gnome-control-center-2.29.91.orig/debian/gnome-control-center.postinst +++ gnome-control-center-2.29.91/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.29.91.orig/debian/gnome-control-center.install +++ gnome-control-center-2.29.91/debian/gnome-control-center.install @@ -0,0 +1,2 @@ +debian/control-center2.xpm usr/share/pixmaps +debian/tmp/usr/bin --- gnome-control-center-2.29.91.orig/debian/visual-effects_normal.svg +++ gnome-control-center-2.29.91/debian/visual-effects_normal.svg @@ -0,0 +1,364 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + Visual Effects + + + + + + + + + + + + + + + + + + + + + + + + --- gnome-control-center-2.29.91.orig/debian/changelog +++ gnome-control-center-2.29.91/debian/changelog @@ -0,0 +1,2191 @@ +gnome-control-center (1:2.29.91-0ubuntu3) lucid; urgency=low + + * debian/patches/03_use_libunique.patch: + - change by Mikkel Kamstrup Erlandsen to let the about-me capplet display + the running instance when launched twice (lp: #531974) + * debian/patches/99_autoreconf.patch: + - refreshed for the previous change + + -- Sebastien Bacher Fri, 05 Mar 2010 16:22:06 +0100 + +gnome-control-center (1:2.29.91-0ubuntu2) lucid; urgency=low + + * debian/patches/98_about-me-wid-fix.patch: + - Widget contents are mapped to EContact fields using widget ID's + defined in the GtkBuilder UI file. However, the name returned + by gtk_widget_get_name is no longer the same as the ID in the latest + Gtk version, so don't depend on the name for mapping the widgets + to the correct EContact fields (LP: #525520). + + -- Chris Coulson Tue, 02 Mar 2010 01:57:53 +0000 + +gnome-control-center (1:2.29.91-0ubuntu1) lucid; urgency=low + + * New upstream version + - Appearance: + + Add 'span' as a style for backgrounds + - Display Properties: + + Now fits in 640x480 and has a better layout overall + + Just use "monitors" for wording, not a mixture of "monitor", + "display", "screen" + + Make the mouse cursor indicate when you can drag a monitor + * debian/control: + - Bump libgnome-desktop-dev build-dep to 2.29.4 + - Drop libxrandr-dev and libxrender-dev build-deps + * Refreshed patches: + - 109_screen_resolution_extra.patch + - 111_screen_resolution_vendor_fallback.patch + - 99_autoreconf.patch + * Dropped 92_display_properties_fit_small_screen.patch: this is not + required with the new capplet layout + * debian/patches/95_desktop-effects-integration.patch: + - Don't crash when there is no supported WM available (LP: #516189) + + -- Chris Coulson Mon, 01 Mar 2010 08:29:48 +0000 + +gnome-control-center (1:2.29.90-0ubuntu3) lucid; urgency=low + + * debian/control.in: + - build-depends on libappindicator-dev + + -- Sebastien Bacher Thu, 11 Feb 2010 23:46:12 +0100 + +gnome-control-center (1:2.29.90-0ubuntu2) lucid; urgency=low + + * debian/patches/02_use_application_indicator.patch: + - use the lucid application indicator, thanks Travis B. Hartwell + (lp: #497857) + * debian/patches/99_autoreconf.patch: + - refreshed for the previous change to build + + -- Sebastien Bacher Thu, 11 Feb 2010 15:10:32 +0100 + +gnome-control-center (1:2.29.90-0ubuntu1) lucid; urgency=low + + * New upstream version + - About-me: + + Fix hangs when 'passwd' outputs unexpected answers (lp: #338976) + + Fix list of passwd error strings (lp: #498875) + + Fix fingerprint name on 2nd page + - At-properties: + + Add AutostartCondition to gnome-at-session.desktop + - Mouse: + + Fix mnemonics conflicts on touchpad tab + * Dropped patches merged upstream: + - 02_gnome-at-session_autostart-condition.patch + * Refreshed patches: + - 99_autoreconf.patch + - 99_ltmain_as-needed.patch + * Disable 98_password_dialog_launcher.patch - this isn't currently used + by users-admin + * Drop 17_default_applications_firefox_3-5.patch - no need to rename the + icon now with the unversioned Firefox package + + -- Chris Coulson Wed, 10 Feb 2010 01:22:18 +0000 + +gnome-control-center (1:2.29.6-0ubuntu3) lucid; urgency=low + + * debian/patches/95_desktop-effects-integration.patch: + - cleaned some warnings and errors in the code and fix build + * debian/patches/109_screen_resolution_extra.patch, + debian/patches/110_screen_resolution_package.patch: + - cleaned some warnings + + -- Sebastien Bacher Tue, 02 Feb 2010 15:09:00 -0800 + +gnome-control-center (1:2.29.6-0ubuntu2) lucid; urgency=low + + * debian/patches/95_desktop-effects-integration.patch: + don't enable switching wm if you run mutter + + -- Didier Roche Mon, 01 Feb 2010 16:56:56 -0800 + +gnome-control-center (1:2.29.6-0ubuntu1) lucid; urgency=low + + * New upstream version: + - Don't leak file descriptors when checking for colour schemes + - Disable tapping only for touchpads without a left mouse button + - use GtkInfoBar rather than a copy of GeditMessageArea + - Some typo fixes in strings + - Translation updates. + * 99_autoreconf.patch: Refresh. + * Add 02_gnome-at-session_autostart-condition.patch: The gnome-at-session + autostart desktop file launches a shell script, which in turn calls + gconftool-2, just to find out that it's disabled, and exit. This + wastes unnecessary cycles on starting the desktop. Add an + AutostartCondition to the .desktop file which only runs when a11y is + enabled. (submitted to GNOME #608138) + + -- Martin Pitt Tue, 26 Jan 2010 12:08:15 +0100 + +gnome-control-center (1:2.29.4-0ubuntu2) lucid; urgency=low + + * debian/patches/95_desktop-effects-integration.patch: + - spelling error fix in the appearance string (lp: #508652) + + -- Sebastien Bacher Tue, 19 Jan 2010 15:47:08 +0100 + +gnome-control-center (1:2.29.4-0ubuntu1) lucid; urgency=low + + * New upstream version + * General: + - Drop obsolete check for HAL (#595832) (Jens Granseuer) + - Use external libslab when available (Vincent Untz) + - Add gthread-2.0 to common modules for linking (#600589) (Jens + Granseuer) + - Enable silent build rules (Thomas Wood) + * Common: + - Fix all the keybindings showing up when using compiz (#600021) + (Bastien Nocera) + - Fix leak (Jens Granseuer) + - Fix warning (Jens Granseuer) + * About-me: + - Fix crash when closing the window using the window button (#592348, + LP: #414538) (Jens Granseuer) + - Add missing PNG files (Bastien Nocera) + * Appearance: + - Remove interface tab (#592756) (William Jon McCann) + - Add OnlyShowIn=GNOME to the .desktop file (#594709) (Thomas Wood) + - Update the background style option labels (#411048, LP: #416605) + (Thomas Wood) + - Fix tooltip in the background chooser (#596369) (Matthias Clasen) + - Add support for per-monitor backgrounds (#147808, LP: #153793) + (William Jon McCann) + * Default applications: + - Update the exec arg when changing terminal (#597185) (Vincent Untz) + - Be sure to add the gconf directories for monitoring (#597186) + (Thomas Wood) + - Return an empty string for the custom web item (Thomas Wood) + * Display: + - Don't assert when the current output doesn't have a resolution set yet + (#593866) (Federico Mena Quintero) + - Automatically turn on outputs which support Mirror Screens (#590823) + (Federico Mena Quintero) + - Sensitize 'Mirror Screens' depending on whether mirror mode is actually + supported (Federico Mena Quintero) + - Desensitize the on/off radio buttons if we are in Mirror Screens mode + (Federico Mena Quintero) + - Show 'Mirror Screens' in the monitor label, not a random monitor's name + (Federico Mena Quintero) + * Font Viewer: + - Use pango_language_get_sample_string for sample text (#595107) (Jens + Granseuer) + - Expand the Copyright display to get rid of unnecessary scrollbar (Jens + Granseuer) + - Don't use URI notation when installing fonts (#603732) (Jens Granseuer) + * Keybindings: + - Fix broken logic in keybinding tree model (Robert Ancell) + - Fix zombie bindings appearing after deleting custom shortcuts (#596351) + (Jens Granseuer) + - Show shortcuts for the active window manager (#600531, LP: #500672) + (Wang Xin) + - Remove sleep key entry (#170175) (Bastien Nocera) + * Keyboard: + - Major UI reorganization (Sergey V. Udaltsov) + - Fix mnemonic conflict in mousekeys tab (#586433) (Jens Granseuer) + * Mouse: + - Disable two-finger scrolling/tapping based on touchpad capabilities. + (Peter Hutterer) + * Network: + - Keep proxies in sync when "use same proxy" is selected (#589952, + LP: #226748) (Cyril Roelandt) + * Typing break: + - Increase delay for activating the postpone button to 5s (#597086) + (Tim Waugh) + - Reset timer after suspend (#430797) (Jens Granseuer) + * Windows: + - Don't allow Ctrl+Click as window movement modifier (#409405) (Jens + Granseuer) + * debian/control: + - Bump libgnome-desktop-dev build dep to 2.27.91 + * Dropped patches merged upstream: + - 01_fix_libslab_build + - 52_fix_missing_keybindings + - 81_upstream_change_fix_xrand_capplet_crash + - 82_upstream_change_fix_aboutme_crash + * Refreshed patches: + - 109_screen_resolution_extra + - 110_screen_resolution_package + - 111_screen_resolution_vendor_fallback + - 50_ubuntu_systemwide_prefs + - 51_ubuntu_system_keyboard + - 80_aspect_in_dropdown + - 90_gnome-mouse-properties_small_screen + - 91_gnome-about-me_small_screen + - 92_display_properties_fit_small_screen + - 95_desktop-effects-integration + - 98_password_dialog_launcher + + -- Chris Coulson Mon, 11 Jan 2010 00:01:08 +0000 + +gnome-control-center (1:2.28.1-1ubuntu1) lucid; urgency=low + + * Merge with Debian unstable, remaining changes: + * debian/control.in: + - Rename package from control-center to gnome-control-center + - Don't Build-Depends on libslab-dev, type-handling + - Build-depends on librsvg2-dev, libpango1.0-dev, + libgstreamer-plugins-base0.10-dev + - gnome-control-center depends on ubuntu-system-service, gconf2-common + - gnome-control-center recommends mousetweaks, iso-codes + - gnome-control-center recommends screen-resolution-extra for + 109_screen_resolution_extra.patch + - Tighten the deps between capplets-data and gnome-control-center as + otherwise Glade / code mismatches can cause breakage: g-c-c depends on + capplets-data >= source:Version, not just gnome:Version; capplets-data + breaks g-c-c Thu, 10 Dec 2009 11:14:11 +1100 + +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.29.91.orig/debian/control-center2.xpm +++ gnome-control-center-2.29.91/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.29.91.orig/debian/visual-effects_extra.svg +++ gnome-control-center-2.29.91/debian/visual-effects_extra.svg @@ -0,0 +1,1137 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + Lapo Calamandrei + + + + Visual Effects + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- gnome-control-center-2.29.91.orig/debian/capplets-data.install +++ gnome-control-center-2.29.91/debian/capplets-data.install @@ -0,0 +1,8 @@ +debian/tmp/etc/gconf +debian/tmp/etc/xdg/autostart +debian/tmp/etc/xdg/menus +debian/tmp/usr/share +debian/visual-effects_custom.svg /usr/share/gnome-control-center/pixmaps +debian/visual-effects_extra.svg /usr/share/gnome-control-center/pixmaps +debian/visual-effects_none.svg /usr/share/gnome-control-center/pixmaps +debian/visual-effects_normal.svg /usr/share/gnome-control-center/pixmaps --- gnome-control-center-2.29.91.orig/debian/control.in +++ gnome-control-center-2.29.91/debian/control.in @@ -0,0 +1,120 @@ +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 +Vcs-Bzr: http://code.launchpad.net/~ubuntu-desktop/gnome-control-center/ubuntu +Build-Depends: cdbs (>= 0.4.41), + gnome-pkg-tools (>= 0.10), + quilt, + dpkg-dev (>= 1.13.19), + debhelper (>= 5.0.0), + docbook-to-man, + autotools-dev, + gnome-doc-utils (>= 0.3.2), + intltool (>= 0.37.1), + libxt-dev, + libx11-dev, + libxss-dev, + libxxf86misc-dev, + libcanberra-gtk-dev, + libgtk2.0-dev (>= 2.15.0), + librsvg2-dev, + libpango1.0-dev (>= 1.17), + 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), + libgstreamer-plugins-base0.10-dev, + libxft-dev (>= 2.1.2), + libxcursor-dev, + libxi-dev (>= 2:1.2), + libgnomekbd-dev (>= 2.27.4), + libxklavier-dev (>= 4.0), + libebook1.2-dev (>= 1.7.90), + libunique-dev, + libappindicator-dev, + desktop-file-utils, + shared-mime-info, + scrollkeeper + +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.26), + 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, + screen-resolution-extra, + 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.29.91.orig/debian/compat +++ gnome-control-center-2.29.91/debian/compat @@ -0,0 +1 @@ +5 --- gnome-control-center-2.29.91.orig/debian/gnome-control-center.menu +++ gnome-control-center-2.29.91/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.29.91.orig/debian/patches/91_gnome-about-me_small_screen.patch +++ gnome-control-center-2.29.91/debian/patches/91_gnome-about-me_small_screen.patch @@ -0,0 +1,86 @@ +Index: gnome-control-center-2.29.4/capplets/about-me/gnome-about-me.c +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/about-me/gnome-about-me.c 2009-12-04 17:11:07.000000000 +0000 ++++ gnome-control-center-2.29.4/capplets/about-me/gnome-about-me.c 2010-01-11 02:12:03.000000000 +0000 +@@ -859,6 +859,81 @@ + return -1; + } + ++ 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.29.91.orig/debian/patches/80_aspect_in_dropdown.patch +++ gnome-control-center-2.29.91/debian/patches/80_aspect_in_dropdown.patch @@ -0,0 +1,52 @@ +# Description: add aspect ratio estimates to resolution drop-down menu +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=549642 +# +Index: gnome-control-center-2.29.4/capplets/display/xrandr-capplet.c +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/display/xrandr-capplet.c 2010-01-11 02:11:17.000000000 +0000 ++++ gnome-control-center-2.29.4/capplets/display/xrandr-capplet.c 2010-01-11 02:11:21.000000000 +0000 +@@ -631,7 +631,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.29.91.orig/debian/patches/96_hide_accessible_login.patch +++ gnome-control-center-2.29.91/debian/patches/96_hide_accessible_login.patch @@ -0,0 +1,46 @@ +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.29.91.orig/debian/patches/25_window_manager_settings.patch +++ gnome-control-center-2.29.91/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.29.91.orig/debian/patches/90_gnome-mouse-properties_small_screen.patch +++ gnome-control-center-2.29.91/debian/patches/90_gnome-mouse-properties_small_screen.patch @@ -0,0 +1,67 @@ +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.29.91.orig/debian/patches/109_screen_resolution_extra.patch +++ gnome-control-center-2.29.91/debian/patches/109_screen_resolution_extra.patch @@ -0,0 +1,298 @@ +Index: gnome-control-center-2.29.91/capplets/display/xrandr-capplet.c +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/display/xrandr-capplet.c 2010-02-18 19:07:46.000000000 +0000 ++++ gnome-control-center-2.29.91/capplets/display/xrandr-capplet.c 2010-03-01 08:38:29.712886181 +0000 +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include "screen-package.h" + + typedef struct App App; + typedef struct GrabInfo GrabInfo; +@@ -106,6 +107,64 @@ + gtk_widget_destroy (dialog); + } + ++static void ++show_error_dialog (gchar *info) ++{ ++ if (!info) ++ return; ++ ++ GtkWidget *dialog = gtk_message_dialog_new ( ++ NULL, ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_OK, "%s", info); ++ ++ gtk_window_set_title (GTK_WINDOW (dialog), ""); ++ ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++} ++ ++static void ++show_info_dialog (gchar *info) ++{ ++ if (!info) ++ return; ++ ++ GtkWidget *dialog = gtk_message_dialog_new ( ++ NULL, ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_INFO, ++ GTK_BUTTONS_OK, "%s", info); ++ ++ gtk_window_set_title (GTK_WINDOW (dialog), ""); ++ ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++} ++ ++static gint ++show_question_dialog (gchar *question) ++{ ++ if (!question) ++ return -1; ++ ++ GtkWidget *dialog = gtk_message_dialog_new ( ++ NULL, ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_YES_NO, "%s", question); ++ ++ gtk_window_set_title (GTK_WINDOW (dialog), ""); ++ ++ gint response = gtk_dialog_run (GTK_DIALOG (dialog)); ++ ++ gtk_widget_destroy (dialog); ++ ++ return response; ++} ++ ++ + static gboolean + do_free (gpointer data) + { +@@ -1858,39 +1917,14 @@ + } + } + +-static void +-compute_virtual_size_for_configuration (GnomeRRConfig *config, int *ret_width, int *ret_height) +-{ +- int i; +- int width, height; +- +- width = height = 0; +- +- for (i = 0; config->outputs[i] != NULL; i++) +- { +- GnomeOutputInfo *output; +- +- output = config->outputs[i]; +- +- if (output->on) +- { +- width = MAX (width, output->x + output->width); +- height = MAX (height, output->y + output->height); +- } +- } +- +- *ret_width = width; +- *ret_height = height; +-} +- +-static void ++static gboolean + check_required_virtual_size (App *app) + { + int req_width, req_height; + int min_width, max_width; + int min_height, max_height; + +- compute_virtual_size_for_configuration (app->current_configuration, &req_width, &req_height); ++ ubuntu_compute_virtual_size_for_configuration (app->current_configuration, &req_width, &req_height); + + gnome_rr_screen_get_ranges (app->screen, &min_width, &max_width, &min_height, &max_height); + +@@ -1905,11 +1939,116 @@ + if (!(min_width <= req_width && req_width <= max_width + && min_height <= req_height && req_height <= max_height)) + { +- /* FIXME: present a useful dialog, maybe even before the user tries to Apply */ + #if 0 + g_debug ("Your X server needs a larger Virtual size!"); + #endif ++ ++ /* Save the desired settings here since, if the ++ * framebuffer is not enough, the settings won't be ++ * saved to monitor.xml ++ */ ++ GError *err = NULL; ++ gnome_rr_config_sanitize (app->current_configuration); ++ ++ /* try to save the desired settings even though the ++ * current framebuffer size is not enough ++ */ ++ ubuntu_gnome_rr_config_save_desired (app->current_configuration, &err); ++ ++ /* If the Python program is available, we try to ++ * set the virtual resolution, otherwise we simply ++ * show a dialog and inform the user to do it ++ * manually ++ */ ++ char *filename = "/usr/share/screen-resolution-extra/policyui.py"; ++ gchar *error = _("Your settings cannot be applied because the virtual resolution is not big enough to contain your screens"); ++ ++ if ((g_file_test(filename, G_FILE_TEST_EXISTS))) ++ { ++ /* Send req_width and req_height to the Python program ++ * and it should set the virtual resolution. ++ * The Python program will have a normal exit status ++ * in the following cases: ++ * 1. If the virtual resolution is already set and ++ * its size is >= the required size ++ * 2. If the virtual resolution can be set without ++ * problems ++ * the Python program will exit with an error status if: ++ * 1. for several reasons the virtual resolution can't ++ * be set (e.g. PolicyKit can't get the authorisation ++ * or if there's a bug) ++ */ ++ gboolean rc; ++ int status; ++ gchar *command = g_strconcat ("python ", filename, NULL); ++ ++ gchar *ostr = g_strdup_printf (" %dx%d", req_width, req_height); ++ gchar *buf = g_strconcat (command, ostr, NULL); ++ g_free(command); ++ g_free(ostr); ++ command = buf; ++ ++ ++ rc = (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0); ++ g_free (command); ++ ++ /* rc is FALSE if the virtual resolution can't be set ++ */ ++ if (! rc) ++ { ++ /* inform the user with an error dialog */ ++ show_error_dialog (error); ++ /* g_free(error); */ ++ } ++ else ++ { ++ /* Operation Complete. ++ * Inform the user with a dialog ++ */ ++ gchar *info = _("Please log out and log back in again"); ++ show_info_dialog(info); ++ } ++ } ++ else ++ { ++ /* ask the user to install screen-resolution-extra */ ++ gchar *question = g_strdup_printf (_("The installation of an additional component (%s) is required in order to apply your settings. Would you like to install it now?"), "screen-resolution-extra"); /* screen-resolution-extra mustn't be translated */ ++ gint reply = show_question_dialog (question); ++ g_free(question); ++ ++ if (reply != -8) ++ { ++ /* inform the user with an error dialog */ ++ show_error_dialog (error); ++ } ++ else ++ { ++ gchar **packages; ++ gboolean installed; ++ gint i = 0; ++ ++ packages = g_new0 (gchar*, 3); ++ ++ packages[i++] = g_strdup ("screen-resolution-extra"); ++ ++ installed = ubuntu_packages_install (GTK_WINDOW (app->dialog), packages); ++ g_strfreev (packages); ++ ++ if (installed) ++ { ++ /* screen-resolution-extra was installed. ++ * Call this function again so as to use screen-resolution-extra. ++ */ ++ gboolean result = check_required_virtual_size (app); ++ return result; ++ } ++ ++ } ++ } ++ return FALSE; + } ++ else ++ return TRUE; + } + + static void +@@ -2035,33 +2174,38 @@ + + gnome_rr_config_sanitize (app->current_configuration); + +- check_required_virtual_size (app); ++ /* Don't try to apply the settings unless the framebuffer ++ * is enough. The user will be notified in ++ * check_required_virtual_size() ++ */ ++ if (app->current_configuration->clone || check_required_virtual_size (app)) ++ { ++ foo_scroll_area_invalidate (FOO_SCROLL_AREA (app->area)); + +- foo_scroll_area_invalidate (FOO_SCROLL_AREA (app->area)); ++ ensure_current_configuration_is_saved (); ++ ++ if (!gnome_rr_config_save (app->current_configuration, &error)) ++ { ++ error_message (app, _("Could not save the monitor configuration"), error->message); ++ g_error_free (error); ++ return; ++ } + +- ensure_current_configuration_is_saved (); ++ g_assert (app->connection == NULL); ++ g_assert (app->proxy == NULL); ++ g_assert (app->proxy_call == NULL); ++ ++ app->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); ++ if (app->connection == NULL) { ++ error_message (app, _("Could not get session bus while applying display configuration"), error->message); ++ g_error_free (error); ++ return; ++ } + +- if (!gnome_rr_config_save (app->current_configuration, &error)) +- { +- error_message (app, _("Could not save the monitor configuration"), error->message); +- g_error_free (error); +- return; +- } ++ gtk_widget_set_sensitive (app->dialog, FALSE); + +- g_assert (app->connection == NULL); +- g_assert (app->proxy == NULL); +- g_assert (app->proxy_call == NULL); +- +- app->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error); +- if (app->connection == NULL) { +- error_message (app, _("Could not get session bus while applying display configuration"), error->message); +- g_error_free (error); +- return; ++ begin_version2_apply_configuration (app, gtk_widget_get_window (app->dialog), app->apply_button_clicked_timestamp); + } +- +- gtk_widget_set_sensitive (app->dialog, FALSE); +- +- begin_version2_apply_configuration (app, gtk_widget_get_window (app->dialog), app->apply_button_clicked_timestamp); + } + + #if 0 --- gnome-control-center-2.29.91.orig/debian/patches/16_preferred_applications_list_cleanup.patch +++ gnome-control-center-2.29.91/debian/patches/16_preferred_applications_list_cleanup.patch @@ -0,0 +1,47 @@ +# Description: don't list mozilla commands which are compatibility symlinks +# Ubuntu: http://bugs.launchpad.net/bugs/55963 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=499327 +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.29.91.orig/debian/patches/01_remove_debian_default_applications.patch +++ gnome-control-center-2.29.91/debian/patches/01_remove_debian_default_applications.patch @@ -0,0 +1,35 @@ +# Description: remove the Debian entries from the default applications. +# UbuntuSpecific: these are for Debian, this patch removes them. +# +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.29.91.orig/debian/patches/99_autoreconf.patch +++ gnome-control-center-2.29.91/debian/patches/99_autoreconf.patch @@ -0,0 +1,4517 @@ +Index: gnome-control-center-2.29.91/aclocal.m4 +=================================================================== +--- gnome-control-center-2.29.91.orig/aclocal.m4 2010-02-24 15:07:16.000000000 +0100 ++++ gnome-control-center-2.29.91/aclocal.m4 2010-03-05 16:13:19.000000000 +0100 +@@ -19,1054 +19,676 @@ + If you have problems, you may need to regenerate the build system entirely. + To do so, use the procedure documented by the package, typically `autoreconf'.])]) + +-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl AM_GCONF_SOURCE_2 ++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas ++dnl (i.e. pass to gconftool-2 ++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where ++dnl you should install foo.schemas files ++dnl + +-# AM_AUTOMAKE_VERSION(VERSION) +-# ---------------------------- +-# Automake X.Y traces this macro to ensure aclocal.m4 has been +-# generated from the m4 files accompanying Automake X.Y. +-# (This private macro should not be called outside this file.) +-AC_DEFUN([AM_AUTOMAKE_VERSION], +-[am__api_version='1.11' +-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +-dnl require some minimum version. Point them to the right macro. +-m4_if([$1], [1.11.1], [], +- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +-]) ++AC_DEFUN([AM_GCONF_SOURCE_2], ++[ ++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then ++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` ++ else ++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE ++ fi + +-# _AM_AUTOCONF_VERSION(VERSION) +-# ----------------------------- +-# aclocal traces this macro to find the Autoconf version. +-# This is a private macro too. Using m4_define simplifies +-# the logic in aclocal, which can simply ignore this definition. +-m4_define([_AM_AUTOCONF_VERSION], []) ++ AC_ARG_WITH([gconf-source], ++ AC_HELP_STRING([--with-gconf-source=sourceaddress], ++ [Config database for installing schema files.]), ++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) + +-# AM_SET_CURRENT_AUTOMAKE_VERSION +-# ------------------------------- +-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +-[AM_AUTOMAKE_VERSION([1.11.1])dnl +-m4_ifndef([AC_AUTOCONF_VERSION], +- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) ++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) ++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) + +-# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then ++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' ++ fi + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ AC_ARG_WITH([gconf-schema-file-dir], ++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir], ++ [Directory for installing schema files.]), ++ [GCONF_SCHEMA_FILE_DIR="$withval"],) + +-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +-# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++ AC_SUBST(GCONF_SCHEMA_FILE_DIR) ++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++ ++ AC_ARG_ENABLE(schemas-install, ++ AC_HELP_STRING([--disable-schemas-install], ++ [Disable the schemas installation]), ++ [case ${enableval} in ++ yes|no) ;; ++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; ++ esac]) ++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ++]) ++ ++# Copyright (C) 1995-2002 Free Software Foundation, Inc. ++# Copyright (C) 2001-2003,2004 Red Hat, Inc. + # +-# Of course, Automake must honor this variable whenever it calls a +-# tool from the auxiliary directory. The problem is that $srcdir (and +-# therefore $ac_aux_dir as well) can be either absolute or relative, +-# depending on how configure is run. This is pretty annoying, since +-# it makes $ac_aux_dir quite unusable in subdirectories: in the top +-# source directory, any form will work fine, but in subdirectories a +-# relative path needs to be adjusted first. ++# This file is free software, distributed under the terms of the GNU ++# General Public License. As a special exception to the GNU General ++# Public License, this file may be distributed as part of a program ++# that contains a configuration script generated by Autoconf, under ++# the same distribution terms as the rest of that program. + # +-# $ac_aux_dir/missing +-# fails when called from a subdirectory if $ac_aux_dir is relative +-# $top_srcdir/$ac_aux_dir/missing +-# fails if $ac_aux_dir is absolute, +-# fails when called from a subdirectory in a VPATH build with +-# a relative $ac_aux_dir ++# This file can be copied and used freely without restrictions. It can ++# be used in projects which are not available under the GNU Public License ++# but which still want to provide support for the GNU gettext functionality. + # +-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +-# are both prefixed by $srcdir. In an in-source build this is usually +-# harmless because $srcdir is `.', but things will broke when you +-# start a VPATH build or use an absolute $srcdir. ++# Macro to add for using GNU gettext. ++# Ulrich Drepper , 1995, 1996 + # +-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +-# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +-# and then we would define $MISSING as +-# MISSING="\${SHELL} $am_aux_dir/missing" +-# This will work as long as MISSING is not called from configure, because +-# unfortunately $(top_srcdir) has no meaning in configure. +-# However there are other variables, like CC, which are often used in +-# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# Modified to never use included libintl. ++# Owen Taylor , 12/15/1998 + # +-# Another solution, used here, is to always expand $ac_aux_dir to an +-# absolute PATH. The drawback is that using absolute paths prevent a +-# configured tree to be moved without reconfiguration. +- +-AC_DEFUN([AM_AUX_DIR_EXPAND], +-[dnl Rely on autoconf to set up CDPATH properly. +-AC_PREREQ([2.50])dnl +-# expand $ac_aux_dir to an absolute path +-am_aux_dir=`cd $ac_aux_dir && pwd` +-]) +- +-# AM_CONDITIONAL -*- Autoconf -*- +- +-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +-# Free Software Foundation, Inc. ++# Major rework to remove unused code ++# Owen Taylor , 12/11/2002 + # +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# Added better handling of ALL_LINGUAS from GNU gettext version ++# written by Bruno Haible, Owen Taylor 5/30/3002 ++# ++# Modified to require ngettext ++# Matthias Clasen 08/06/2004 ++# ++# We need this here as well, since someone might use autoconf-2.5x ++# to configure GLib then an older version to configure a package ++# using AM_GLIB_GNU_GETTEXT ++AC_PREREQ(2.53) + +-# serial 9 ++dnl ++dnl We go to great lengths to make sure that aclocal won't ++dnl try to pull in the installed version of these macros ++dnl when running aclocal in the glib directory. ++dnl ++m4_copy([AC_DEFUN],[glib_DEFUN]) ++m4_copy([AC_REQUIRE],[glib_REQUIRE]) ++dnl ++dnl At the end, if we're not within glib, we'll define the public ++dnl definitions in terms of our private definitions. ++dnl + +-# AM_CONDITIONAL(NAME, SHELL-CONDITION) +-# ------------------------------------- +-# Define a conditional. +-AC_DEFUN([AM_CONDITIONAL], +-[AC_PREREQ(2.52)dnl +- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], +- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +-AC_SUBST([$1_TRUE])dnl +-AC_SUBST([$1_FALSE])dnl +-_AM_SUBST_NOTMAKE([$1_TRUE])dnl +-_AM_SUBST_NOTMAKE([$1_FALSE])dnl +-m4_define([_AM_COND_VALUE_$1], [$2])dnl +-if $2; then +- $1_TRUE= +- $1_FALSE='#' ++# GLIB_LC_MESSAGES ++#-------------------- ++glib_DEFUN([GLIB_LC_MESSAGES], ++ [AC_CHECK_HEADERS([locale.h]) ++ if test $ac_cv_header_locale_h = yes; then ++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, ++ [AC_TRY_LINK([#include ], [return LC_MESSAGES], ++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) ++ if test $am_cv_val_LC_MESSAGES = yes; then ++ AC_DEFINE(HAVE_LC_MESSAGES, 1, ++ [Define if your file defines LC_MESSAGES.]) ++ fi ++ fi]) ++ ++# GLIB_PATH_PROG_WITH_TEST ++#---------------------------- ++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, ++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) ++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], ++[# Extract the first word of "$2", so it can be a program name with args. ++set dummy $2; ac_word=[$]2 ++AC_MSG_CHECKING([for $ac_word]) ++AC_CACHE_VAL(ac_cv_path_$1, ++[case "[$]$1" in ++ /*) ++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path. ++ ;; ++ *) ++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ for ac_dir in ifelse([$5], , $PATH, [$5]); do ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$ac_word; then ++ if [$3]; then ++ ac_cv_path_$1="$ac_dir/$ac_word" ++ break ++ fi ++ fi ++ done ++ IFS="$ac_save_ifs" ++dnl If no 4th arg is given, leave the cache variable unset, ++dnl so AC_PATH_PROGS will keep looking. ++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ++])dnl ++ ;; ++esac])dnl ++$1="$ac_cv_path_$1" ++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then ++ AC_MSG_RESULT([$]$1) + else +- $1_TRUE='#' +- $1_FALSE= ++ AC_MSG_RESULT(no) + fi +-AC_CONFIG_COMMANDS_PRE( +-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then +- AC_MSG_ERROR([[conditional "$1" was never defined. +-Usually this means the macro was only invoked conditionally.]]) +-fi])]) +- +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 10 ++AC_SUBST($1)dnl ++]) + +-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +-# written in clear, in which case automake, when reading aclocal.m4, +-# will think it sees a *use*, and therefore will trigger all it's +-# C support machinery. Also note that it means that autoscan, seeing +-# CC etc. in the Makefile, will ask for an AC_PROG_CC use... ++# GLIB_WITH_NLS ++#----------------- ++glib_DEFUN([GLIB_WITH_NLS], ++ dnl NLS is obligatory ++ [USE_NLS=yes ++ AC_SUBST(USE_NLS) + ++ gt_cv_have_gettext=no + +-# _AM_DEPENDENCIES(NAME) +-# ---------------------- +-# See how the compiler implements dependency checking. +-# NAME is "CC", "CXX", "GCJ", or "OBJC". +-# We try a few techniques and use that to set a single cache variable. +-# +-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +-# dependency, and given that the user is not expected to run this macro, +-# just rely on AC_PROG_CC. +-AC_DEFUN([_AM_DEPENDENCIES], +-[AC_REQUIRE([AM_SET_DEPDIR])dnl +-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +-AC_REQUIRE([AM_MAKE_INCLUDE])dnl +-AC_REQUIRE([AM_DEP_TRACK])dnl +- +-ifelse([$1], CC, [depcc="$CC" am_compiler_list=], +- [$1], CXX, [depcc="$CXX" am_compiler_list=], +- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], +- [$1], UPC, [depcc="$UPC" am_compiler_list=], +- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], +- [depcc="$$1" am_compiler_list=]) +- +-AC_CACHE_CHECK([dependency style of $depcc], +- [am_cv_$1_dependencies_compiler_type], +-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then +- # We make a subdir and do the tests there. Otherwise we can end up +- # making bogus files that we don't know about and never remove. For +- # instance it was reported that on HP-UX the gcc test will end up +- # making a dummy file named `D' -- because `-MD' means `put the output +- # in D'. +- mkdir conftest.dir +- # Copy depcomp to subdir because otherwise we won't find it if we're +- # using a relative directory. +- cp "$am_depcomp" conftest.dir +- cd conftest.dir +- # We will build objects and dependencies in a subdirectory because +- # it helps to detect inapplicable dependency modes. For instance +- # both Tru64's cc and ICC support -MD to output dependencies as a +- # side effect of compilation, but ICC will put the dependencies in +- # the current directory while Tru64 will put them in the object +- # directory. +- mkdir sub +- +- am_cv_$1_dependencies_compiler_type=none +- if test "$am_compiler_list" = ""; then +- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` +- fi +- am__universal=false +- m4_case([$1], [CC], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac], +- [CXX], +- [case " $depcc " in #( +- *\ -arch\ *\ -arch\ *) am__universal=true ;; +- esac]) ++ CATOBJEXT=NONE ++ XGETTEXT=: ++ INTLLIBS= + +- for depmode in $am_compiler_list; do +- # Setup a source with many dependencies, because some compilers +- # like to wrap large dependency lists on column 80 (with \), and +- # we should not choose a depcomp mode which is confused by this. +- # +- # We need to recreate these files for each test, as the compiler may +- # overwrite some of them when testing with obscure command lines. +- # This happens at least with the AIX C compiler. +- : > sub/conftest.c +- for i in 1 2 3 4 5 6; do +- echo '#include "conftst'$i'.h"' >> sub/conftest.c +- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. +- touch sub/conftst$i.h +- done +- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf ++ AC_CHECK_HEADER(libintl.h, ++ [gt_cv_func_dgettext_libintl="no" ++ libintl_extra_libs="" + +- # We check with `-c' and `-o' for the sake of the "dashmstdout" +- # mode. It turns out that the SunPro C++ compiler does not properly +- # handle `-M -o', and we need to detect this. Also, some Intel +- # versions had trouble with output in subdirs +- am__obj=sub/conftest.${OBJEXT-o} +- am__minus_obj="-o $am__obj" +- case $depmode in +- gcc) +- # This depmode causes a compiler race in universal mode. +- test "$am__universal" = false || continue +- ;; +- nosideeffect) +- # after this tag, mechanisms are not by side-effect, so they'll +- # only be used when explicitly requested +- if test "x$enable_dependency_tracking" = xyes; then +- continue +- else +- break ++ # ++ # First check in libc ++ # ++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !ngettext ("","", 1)], ++ gt_cv_func_ngettext_libc=yes, ++ gt_cv_func_ngettext_libc=no) ++ ]) ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, ++ [AC_TRY_LINK([ ++#include ++], ++ [return !dgettext ("","")], ++ gt_cv_func_dgettext_libc=yes, ++ gt_cv_func_dgettext_libc=no) ++ ]) + fi +- ;; +- msvisualcpp | msvcmsys) +- # This compiler won't grok `-c -o', but also, the minuso test has +- # not run yet. These depmodes are late enough in the game, and +- # so weak that their functioning should not be impacted. +- am__obj=conftest.${OBJEXT-o} +- am__minus_obj= +- ;; +- none) break ;; +- esac +- if depmode=$depmode \ +- source=sub/conftest.c object=$am__obj \ +- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ +- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ +- >/dev/null 2>conftest.err && +- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && +- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && +- grep $am__obj sub/conftest.Po > /dev/null 2>&1 && +- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then +- # icc doesn't choke on unknown options, it will just issue warnings +- # or remarks (even with -Werror). So we grep stderr for any message +- # that says an option was ignored or not supported. +- # When given -MP, icc 7.0 and 7.1 complain thusly: +- # icc: Command line warning: ignoring option '-M'; no argument required +- # The diagnosis changed in icc 8.0: +- # icc: Command line remark: option '-MP' not supported +- if (grep 'ignoring option' conftest.err || +- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else +- am_cv_$1_dependencies_compiler_type=$depmode +- break ++ ++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then ++ AC_CHECK_FUNCS(bind_textdomain_codeset) + fi +- fi +- done +- +- cd .. +- rm -rf conftest.dir +-else +- am_cv_$1_dependencies_compiler_type=none +-fi +-]) +-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +-AM_CONDITIONAL([am__fastdep$1], [ +- test "x$enable_dependency_tracking" != xno \ +- && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +-]) +- +- +-# AM_SET_DEPDIR +-# ------------- +-# Choose a directory name for dependency files. +-# This macro is AC_REQUIREd in _AM_DEPENDENCIES +-AC_DEFUN([AM_SET_DEPDIR], +-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +-]) +- + +-# AM_DEP_TRACK +-# ------------ +-AC_DEFUN([AM_DEP_TRACK], +-[AC_ARG_ENABLE(dependency-tracking, +-[ --disable-dependency-tracking speeds up one-time build +- --enable-dependency-tracking do not reject slow dependency extractors]) +-if test "x$enable_dependency_tracking" != xno; then +- am_depcomp="$ac_aux_dir/depcomp" +- AMDEPBACKSLASH='\' +-fi +-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +-AC_SUBST([AMDEPBACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +-]) ++ # ++ # If we don't have everything we want, check in libintl ++ # ++ if test "$gt_cv_func_dgettext_libc" != "yes" \ ++ || test "$gt_cv_func_ngettext_libc" != "yes" \ ++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then ++ ++ AC_CHECK_LIB(intl, bindtextdomain, ++ [AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dgettext, ++ gt_cv_func_dgettext_libintl=yes)])]) + +-# Generate code to set up dependency tracking. -*- Autoconf -*- ++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then ++ AC_MSG_CHECKING([if -liconv is needed to use gettext]) ++ AC_MSG_RESULT([]) ++ AC_CHECK_LIB(intl, ngettext, ++ [AC_CHECK_LIB(intl, dcgettext, ++ [gt_cv_func_dgettext_libintl=yes ++ libintl_extra_libs=-liconv], ++ :,-liconv)], ++ :,-liconv) ++ fi + +-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ # ++ # If we found libintl, then check in it for bind_textdomain_codeset(); ++ # we'll prefer libc if neither have bind_textdomain_codeset(), ++ # and both have dgettext and ngettext ++ # ++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS -lintl $libintl_extra_libs" ++ unset ac_cv_func_bind_textdomain_codeset ++ AC_CHECK_FUNCS(bind_textdomain_codeset) ++ LIBS="$glib_save_LIBS" + +-#serial 5 ++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then ++ gt_cv_func_dgettext_libc=no ++ else ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ && test "$gt_cv_func_ngettext_libc" = "yes"; then ++ gt_cv_func_dgettext_libintl=no ++ fi ++ fi ++ fi ++ fi + +-# _AM_OUTPUT_DEPENDENCY_COMMANDS +-# ------------------------------ +-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +-[{ +- # Autoconf 2.62 quotes --file arguments for eval, but not when files +- # are listed without --file. Let's play safe and only enable the eval +- # if we detect the quoting. +- case $CONFIG_FILES in +- *\'*) eval set x "$CONFIG_FILES" ;; +- *) set x $CONFIG_FILES ;; +- esac +- shift +- for mf +- do +- # Strip MF so we end up with the name of the file. +- mf=`echo "$mf" | sed -e 's/:.*$//'` +- # Check whether this is an Automake generated Makefile or not. +- # We used to match only the files named `Makefile.in', but +- # some people rename them; so instead we look at the file content. +- # Grep'ing the first line is not enough: some people post-process +- # each Makefile.in and add a new line on top of each file to say so. +- # Grep'ing the whole file is not good either: AIX grep has a line +- # limit of 2048, but all sed's we know have understand at least 4000. +- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then +- dirpart=`AS_DIRNAME("$mf")` +- else +- continue +- fi +- # Extract the definition of DEPDIR, am__include, and am__quote +- # from the Makefile without running `make'. +- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` +- test -z "$DEPDIR" && continue +- am__include=`sed -n 's/^am__include = //p' < "$mf"` +- test -z "am__include" && continue +- am__quote=`sed -n 's/^am__quote = //p' < "$mf"` +- # When using ansi2knr, U may be empty or an underscore; expand it +- U=`sed -n 's/^U = //p' < "$mf"` +- # Find all dependency output files, they are included files with +- # $(DEPDIR) in their names. We invoke sed twice because it is the +- # simplest approach to changing $(DEPDIR) to its actual value in the +- # expansion. +- for file in `sed -n " +- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ +- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do +- # Make sure the directory exists. +- test -f "$dirpart/$file" && continue +- fdir=`AS_DIRNAME(["$file"])` +- AS_MKDIR_P([$dirpart/$fdir]) +- # echo "creating $dirpart/$file" +- echo '# dummy' > "$dirpart/$file" +- done +- done +-} +-])# _AM_OUTPUT_DEPENDENCY_COMMANDS +- +- +-# AM_OUTPUT_DEPENDENCY_COMMANDS +-# ----------------------------- +-# This macro should only be invoked once -- use via AC_REQUIRE. +-# +-# This code is only required when automatic dependency tracking +-# is enabled. FIXME. This creates each `.P' file that we will +-# need in order to bootstrap the dependency handling code. +-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +-[AC_CONFIG_COMMANDS([depfiles], +- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], +- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +-]) +- +-# Do all the work for Automake. -*- Autoconf -*- +- +-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 16 +- +-# This macro actually does too much. Some checks are only needed if +-# your package does certain things. But this isn't really a big deal. +- +-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +-# AM_INIT_AUTOMAKE([OPTIONS]) +-# ----------------------------------------------- +-# The call with PACKAGE and VERSION arguments is the old style +-# call (pre autoconf-2.50), which is being phased out. PACKAGE +-# and VERSION should now be passed to AC_INIT and removed from +-# the call to AM_INIT_AUTOMAKE. +-# We support both call styles for the transition. After +-# the next Automake release, Autoconf can make the AC_INIT +-# arguments mandatory, and then we can depend on a new Autoconf +-# release and drop the old call support. +-AC_DEFUN([AM_INIT_AUTOMAKE], +-[AC_PREREQ([2.62])dnl +-dnl Autoconf wants to disallow AM_ names. We explicitly allow +-dnl the ones we care about. +-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +-AC_REQUIRE([AC_PROG_INSTALL])dnl +-if test "`cd $srcdir && pwd`" != "`pwd`"; then +- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output +- # is not polluted with repeated "-I." +- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl +- # test to see if srcdir already configured +- if test -f $srcdir/config.status; then +- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) +- fi +-fi +- +-# test whether we have cygpath +-if test -z "$CYGPATH_W"; then +- if (cygpath --version) >/dev/null 2>/dev/null; then +- CYGPATH_W='cygpath -w' +- else +- CYGPATH_W=echo +- fi +-fi +-AC_SUBST([CYGPATH_W]) +- +-# Define the identity of the package. +-dnl Distinguish between old-style and new-style calls. +-m4_ifval([$2], +-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +- AC_SUBST([PACKAGE], [$1])dnl +- AC_SUBST([VERSION], [$2])], +-[_AM_SET_OPTIONS([$1])dnl +-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl +- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl +- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl +- +-_AM_IF_OPTION([no-define],, +-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +- +-# Some tools Automake needs. +-AC_REQUIRE([AM_SANITY_CHECK])dnl +-AC_REQUIRE([AC_ARG_PROGRAM])dnl +-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +-AM_MISSING_PROG(AUTOCONF, autoconf) +-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +-AM_MISSING_PROG(AUTOHEADER, autoheader) +-AM_MISSING_PROG(MAKEINFO, makeinfo) +-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +-AC_REQUIRE([AM_PROG_MKDIR_P])dnl +-# We need awk for the "check" target. The system "awk" is bad on +-# some platforms. +-AC_REQUIRE([AC_PROG_AWK])dnl +-AC_REQUIRE([AC_PROG_MAKE_SET])dnl +-AC_REQUIRE([AM_SET_LEADING_DOT])dnl +-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], +- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], +- [_AM_PROG_TAR([v7])])]) +-_AM_IF_OPTION([no-dependencies],, +-[AC_PROVIDE_IFELSE([AC_PROG_CC], +- [_AM_DEPENDENCIES(CC)], +- [define([AC_PROG_CC], +- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_CXX], +- [_AM_DEPENDENCIES(CXX)], +- [define([AC_PROG_CXX], +- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +-AC_PROVIDE_IFELSE([AC_PROG_OBJC], +- [_AM_DEPENDENCIES(OBJC)], +- [define([AC_PROG_OBJC], +- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +-]) +-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +-AC_CONFIG_COMMANDS_PRE(dnl +-[m4_provide_if([_AM_COMPILER_EXEEXT], +- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl +-]) +- +-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +-dnl mangled by Autoconf and run in a shell conditional statement. +-m4_define([_AC_COMPILER_EXEEXT], +-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) +- +- +-# When config.status generates a header, we must update the stamp-h file. +-# This file resides in the same directory as the config header +-# that is generated. The stamp files are numbered to have different names. +- +-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +-# loop where config.status creates the headers, so we can generate +-# our stamp files there. +-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +-[# Compute $1's index in $config_headers. +-_am_arg=$1 +-_am_stamp_count=1 +-for _am_header in $config_headers :; do +- case $_am_header in +- $_am_arg | $_am_arg:* ) +- break ;; +- * ) +- _am_stamp_count=`expr $_am_stamp_count + 1` ;; +- esac +-done +-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) +- +-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# AM_PROG_INSTALL_SH +-# ------------------ +-# Define $install_sh. +-AC_DEFUN([AM_PROG_INSTALL_SH], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-if test x"${install_sh}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; +- *) +- install_sh="\${SHELL} $am_aux_dir/install-sh" +- esac +-fi +-AC_SUBST(install_sh)]) +- +-# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 2 +- +-# Check whether the underlying file-system supports filenames +-# with a leading dot. For instance MS-DOS doesn't. +-AC_DEFUN([AM_SET_LEADING_DOT], +-[rm -rf .tst 2>/dev/null +-mkdir .tst 2>/dev/null +-if test -d .tst; then +- am__leading_dot=. +-else +- am__leading_dot=_ +-fi +-rmdir .tst 2>/dev/null +-AC_SUBST([am__leading_dot])]) +- +-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +-# From Jim Meyering +- +-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 5 +- +-# AM_MAINTAINER_MODE([DEFAULT-MODE]) +-# ---------------------------------- +-# Control maintainer-specific portions of Makefiles. +-# Default is to disable them, unless `enable' is passed literally. +-# For symmetry, `disable' may be passed as well. Anyway, the user +-# can override the default with the --enable/--disable switch. +-AC_DEFUN([AM_MAINTAINER_MODE], +-[m4_case(m4_default([$1], [disable]), +- [enable], [m4_define([am_maintainer_other], [disable])], +- [disable], [m4_define([am_maintainer_other], [enable])], +- [m4_define([am_maintainer_other], [enable]) +- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) +- dnl maintainer-mode's default is 'disable' unless 'enable' is passed +- AC_ARG_ENABLE([maintainer-mode], +-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful +- (and sometimes confusing) to the casual installer], +- [USE_MAINTAINER_MODE=$enableval], +- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) +- AC_MSG_RESULT([$USE_MAINTAINER_MODE]) +- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +- MAINT=$MAINTAINER_MODE_TRUE +- AC_SUBST([MAINT])dnl +-] +-) +- +-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) +- +-# Check to see how 'make' treats includes. -*- Autoconf -*- +- +-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 4 +- +-# AM_MAKE_INCLUDE() +-# ----------------- +-# Check to see how make treats includes. +-AC_DEFUN([AM_MAKE_INCLUDE], +-[am_make=${MAKE-make} +-cat > confinc << 'END' +-am__doit: +- @echo this is the am__doit target +-.PHONY: am__doit +-END +-# If we don't find an include directive, just comment out the code. +-AC_MSG_CHECKING([for style of include used by $am_make]) +-am__include="#" +-am__quote= +-_am_result=none +-# First try GNU make style include. +-echo "include confinc" > confmf +-# Ignore all kinds of additional output from `make'. +-case `$am_make -s -f confmf 2> /dev/null` in #( +-*the\ am__doit\ target*) +- am__include=include +- am__quote= +- _am_result=GNU +- ;; +-esac +-# Now try BSD make style include. +-if test "$am__include" = "#"; then +- echo '.include "confinc"' > confmf +- case `$am_make -s -f confmf 2> /dev/null` in #( +- *the\ am__doit\ target*) +- am__include=.include +- am__quote="\"" +- _am_result=BSD +- ;; +- esac +-fi +-AC_SUBST([am__include]) +-AC_SUBST([am__quote]) +-AC_MSG_RESULT([$_am_result]) +-rm -f confinc confmf +-]) +- +-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 6 +- +-# AM_PROG_CC_C_O +-# -------------- +-# Like AC_PROG_CC_C_O, but changed for automake. +-AC_DEFUN([AM_PROG_CC_C_O], +-[AC_REQUIRE([AC_PROG_CC_C_O])dnl +-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([compile])dnl +-# FIXME: we rely on the cache variable name because +-# there is no other way. +-set dummy $CC +-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` +-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o +-if test "$am_t" != yes; then +- # Losing compiler, so override with the script. +- # FIXME: It is wrong to rewrite CC. +- # But if we don't then we get into trouble of one sort or another. +- # A longer-term fix would be to have automake use am__CC in this case, +- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" +- CC="$am_aux_dir/compile $CC" +-fi +-dnl Make sure AC_PROG_CC is never called again, or it will override our +-dnl setting of CC. +-m4_define([AC_PROG_CC], +- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) +-]) +- +-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- +- +-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. +- +-# serial 6 +- +-# AM_MISSING_PROG(NAME, PROGRAM) +-# ------------------------------ +-AC_DEFUN([AM_MISSING_PROG], +-[AC_REQUIRE([AM_MISSING_HAS_RUN]) +-$1=${$1-"${am_missing_run}$2"} +-AC_SUBST($1)]) +- +- +-# AM_MISSING_HAS_RUN +-# ------------------ +-# Define MISSING if not defined so far and test if it supports --run. +-# If it does, set am_missing_run to use it, otherwise, to nothing. +-AC_DEFUN([AM_MISSING_HAS_RUN], +-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +-AC_REQUIRE_AUX_FILE([missing])dnl +-if test x"${MISSING+set}" != xset; then +- case $am_aux_dir in +- *\ * | *\ *) +- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; +- *) +- MISSING="\${SHELL} $am_aux_dir/missing" ;; +- esac +-fi +-# Use eval to expand $SHELL +-if eval "$MISSING --run true"; then +- am_missing_run="$MISSING --run " +-else +- am_missing_run= +- AC_MSG_WARN([`missing' script is too old or missing]) +-fi +-]) +- +-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ if test "$gt_cv_func_dgettext_libc" = "yes" \ ++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ gt_cv_have_gettext=yes ++ fi ++ ++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then ++ INTLLIBS="-lintl $libintl_extra_libs" ++ fi ++ ++ if test "$gt_cv_have_gettext" = "yes"; then ++ AC_DEFINE(HAVE_GETTEXT,1, ++ [Define if the GNU gettext() function is already present or preinstalled.]) ++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl ++ if test "$MSGFMT" != "no"; then ++ glib_save_LIBS="$LIBS" ++ LIBS="$LIBS $INTLLIBS" ++ AC_CHECK_FUNCS(dcgettext) ++ MSGFMT_OPTS= ++ AC_MSG_CHECKING([if msgfmt accepts -c]) ++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ ++msgid "" ++msgstr "" ++"Content-Type: text/plain; charset=UTF-8\n" ++"Project-Id-Version: test 1.0\n" ++"PO-Revision-Date: 2007-02-15 12:01+0100\n" ++"Last-Translator: test \n" ++"Language-Team: C \n" ++"MIME-Version: 1.0\n" ++"Content-Transfer-Encoding: 8bit\n" ++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) ++ AC_SUBST(MSGFMT_OPTS) ++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, ++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) ++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr], ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share and ++ dnl and CATOBJEXT=.gmo in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [CATOBJEXT=.gmo ++ DATADIRNAME=share], ++ [CATOBJEXT=.mo ++ DATADIRNAME=lib]) ++ ;; ++ *) ++ CATOBJEXT=.mo ++ DATADIRNAME=lib ++ ;; ++ esac]) ++ LIBS="$glib_save_LIBS" ++ INSTOBJEXT=.mo ++ else ++ gt_cv_have_gettext=no ++ fi ++ fi ++ ]) + +-# AM_PROG_MKDIR_P +-# --------------- +-# Check for `mkdir -p'. +-AC_DEFUN([AM_PROG_MKDIR_P], +-[AC_PREREQ([2.60])dnl +-AC_REQUIRE([AC_PROG_MKDIR_P])dnl +-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +-dnl while keeping a definition of mkdir_p for backward compatibility. +-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +-dnl Makefile.ins that do not define MKDIR_P, so we do our own +-dnl adjustment using top_builddir (which is defined more often than +-dnl MKDIR_P). +-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +-case $mkdir_p in +- [[\\/$]]* | ?:[[\\/]]*) ;; +- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +-esac +-]) ++ if test "$gt_cv_have_gettext" = "yes" ; then ++ AC_DEFINE(ENABLE_NLS, 1, ++ [always defined to indicate that i18n is enabled]) ++ fi + +-# Helper functions for option handling. -*- Autoconf -*- ++ dnl Test whether we really found GNU xgettext. ++ if test "$XGETTEXT" != ":"; then ++ dnl If it is not GNU xgettext we define it as : so that the ++ dnl Makefiles still can work. ++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then ++ : ; ++ else ++ AC_MSG_RESULT( ++ [found xgettext program is not GNU xgettext; ignore it]) ++ XGETTEXT=":" ++ fi ++ fi + +-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ # We need to process the po/ directory. ++ POSUB=po + +-# serial 4 ++ AC_OUTPUT_COMMANDS( ++ [case "$CONFIG_FILES" in *po/Makefile.in*) ++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile ++ esac]) + +-# _AM_MANGLE_OPTION(NAME) +-# ----------------------- +-AC_DEFUN([_AM_MANGLE_OPTION], +-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) ++ dnl These rules are solely for the distribution goal. While doing this ++ dnl we only have to keep exactly one list of the available catalogs ++ dnl in configure.in. ++ for lang in $ALL_LINGUAS; do ++ GMOFILES="$GMOFILES $lang.gmo" ++ POFILES="$POFILES $lang.po" ++ done + +-# _AM_SET_OPTION(NAME) +-# ------------------------------ +-# Set option NAME. Presently that only means defining a flag for this option. +-AC_DEFUN([_AM_SET_OPTION], +-[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) ++ dnl Make all variables we use known to autoconf. ++ AC_SUBST(CATALOGS) ++ AC_SUBST(CATOBJEXT) ++ AC_SUBST(DATADIRNAME) ++ AC_SUBST(GMOFILES) ++ AC_SUBST(INSTOBJEXT) ++ AC_SUBST(INTLLIBS) ++ AC_SUBST(PO_IN_DATADIR_TRUE) ++ AC_SUBST(PO_IN_DATADIR_FALSE) ++ AC_SUBST(POFILES) ++ AC_SUBST(POSUB) ++ ]) + +-# _AM_SET_OPTIONS(OPTIONS) +-# ---------------------------------- +-# OPTIONS is a space-separated list of Automake options. +-AC_DEFUN([_AM_SET_OPTIONS], +-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) ++# AM_GLIB_GNU_GETTEXT ++# ------------------- ++# Do checks necessary for use of gettext. If a suitable implementation ++# of gettext is found in either in libintl or in the C library, ++# it will set INTLLIBS to the libraries needed for use of gettext ++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable ++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() ++# on various variables needed by the Makefile.in.in installed by ++# glib-gettextize. ++dnl ++glib_DEFUN([GLIB_GNU_GETTEXT], ++ [AC_REQUIRE([AC_PROG_CC])dnl ++ AC_REQUIRE([AC_HEADER_STDC])dnl ++ ++ GLIB_LC_MESSAGES ++ GLIB_WITH_NLS + +-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +-# ------------------------------------------- +-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +-AC_DEFUN([_AM_IF_OPTION], +-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) ++ if test "$gt_cv_have_gettext" = "yes"; then ++ if test "x$ALL_LINGUAS" = "x"; then ++ LINGUAS= ++ else ++ AC_MSG_CHECKING(for catalogs to be installed) ++ NEW_LINGUAS= ++ for presentlang in $ALL_LINGUAS; do ++ useit=no ++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then ++ desiredlanguages="$LINGUAS" ++ else ++ desiredlanguages="$ALL_LINGUAS" ++ fi ++ for desiredlang in $desiredlanguages; do ++ # Use the presentlang catalog if desiredlang is ++ # a. equal to presentlang, or ++ # b. a variant of presentlang (because in this case, ++ # presentlang can be used as a fallback for messages ++ # which are not translated in the desiredlang catalog). ++ case "$desiredlang" in ++ "$presentlang"*) useit=yes;; ++ esac ++ done ++ if test $useit = yes; then ++ NEW_LINGUAS="$NEW_LINGUAS $presentlang" ++ fi ++ done ++ LINGUAS=$NEW_LINGUAS ++ AC_MSG_RESULT($LINGUAS) ++ fi + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ dnl Construct list of names of catalog files to be constructed. ++ if test -n "$LINGUAS"; then ++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done ++ fi ++ fi + +-# AM_RUN_LOG(COMMAND) +-# ------------------- +-# Run COMMAND, save the exit status in ac_status, and log it. +-# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +-AC_DEFUN([AM_RUN_LOG], +-[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD +- ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD +- (exit $ac_status); }]) ++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly ++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir). ++ dnl Try to locate is. ++ MKINSTALLDIRS= ++ if test -n "$ac_aux_dir"; then ++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" ++ fi ++ if test -z "$MKINSTALLDIRS"; then ++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" ++ fi ++ AC_SUBST(MKINSTALLDIRS) + +-# Check to make sure that the build environment is sane. -*- Autoconf -*- ++ dnl Generate list of files to be processed by xgettext which will ++ dnl be included in po/Makefile. ++ test -d po || mkdir po ++ if test "x$srcdir" != "x."; then ++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then ++ posrcprefix="$srcdir/" ++ else ++ posrcprefix="../$srcdir/" ++ fi ++ else ++ posrcprefix="../" ++ fi ++ rm -f po/POTFILES ++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ ++ < $srcdir/po/POTFILES.in > po/POTFILES ++ ]) + +-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +-# Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) ++# ------------------------------- ++# Define VARIABLE to the location where catalog files will ++# be installed by po/Makefile. ++glib_DEFUN([GLIB_DEFINE_LOCALEDIR], ++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl ++glib_save_prefix="$prefix" ++glib_save_exec_prefix="$exec_prefix" ++glib_save_datarootdir="$datarootdir" ++test "x$prefix" = xNONE && prefix=$ac_default_prefix ++test "x$exec_prefix" = xNONE && exec_prefix=$prefix ++datarootdir=`eval echo "${datarootdir}"` ++if test "x$CATOBJEXT" = "x.mo" ; then ++ localedir=`eval echo "${libdir}/locale"` ++else ++ localedir=`eval echo "${datadir}/locale"` ++fi ++prefix="$glib_save_prefix" ++exec_prefix="$glib_save_exec_prefix" ++datarootdir="$glib_save_datarootdir" ++AC_DEFINE_UNQUOTED($1, "$localedir", ++ [Define the location where the catalogs will be installed]) ++]) + +-# serial 5 ++dnl ++dnl Now the definitions that aclocal will find ++dnl ++ifdef(glib_configure_in,[],[ ++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) ++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ++])dnl + +-# AM_SANITY_CHECK +-# --------------- +-AC_DEFUN([AM_SANITY_CHECK], +-[AC_MSG_CHECKING([whether build environment is sane]) +-# Just in case +-sleep 1 +-echo timestamp > conftest.file +-# Reject unsafe characters in $srcdir or the absolute working directory +-# name. Accept space and tab only in the latter. +-am_lf=' +-' +-case `pwd` in +- *[[\\\"\#\$\&\'\`$am_lf]]*) +- AC_MSG_ERROR([unsafe absolute working directory name]);; +-esac +-case $srcdir in +- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) +- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +-esac ++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) ++# ++# Create a temporary file with TEST-FILE as its contents and pass the ++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with ++# 0 and perform ACTION-IF-FAIL for any other exit status. ++AC_DEFUN([GLIB_RUN_PROG], ++[cat >conftest.foo <<_ACEOF ++$2 ++_ACEOF ++if AC_RUN_LOG([$1 conftest.foo]); then ++ m4_ifval([$3], [$3], [:]) ++m4_ifvaln([$4], [else $4])dnl ++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD ++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD ++fi]) + +-# Do `set' in a subshell so we don't clobber the current shell's +-# arguments. Must try -L first in case configure is actually a +-# symlink; some systems play weird games with the mod time of symlinks +-# (eg FreeBSD returns the mod time of the symlink's containing +-# directory). +-if ( +- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` +- if test "$[*]" = "X"; then +- # -L didn't work. +- set X `ls -t "$srcdir/configure" conftest.file` +- fi +- rm -f conftest.file +- if test "$[*]" != "X $srcdir/configure conftest.file" \ +- && test "$[*]" != "X conftest.file $srcdir/configure"; then + +- # If neither matched, then we have a broken ls. This can happen +- # if, for instance, CONFIG_SHELL is bash and it inherits a +- # broken ls alias from the environment. This has actually +- # happened. Such a system could not be considered "sane". +- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +-alias in your environment]) +- fi ++# gnome-common.m4 ++# + +- test "$[2]" = conftest.file +- ) +-then +- # Ok. +- : +-else +- AC_MSG_ERROR([newly created file is older than distributed files! +-Check your system clock]) +-fi +-AC_MSG_RESULT(yes)]) ++dnl GNOME_COMMON_INIT + +-# Copyright (C) 2009 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_DEFUN([GNOME_COMMON_INIT], ++[ ++ dnl this macro should come after AC_CONFIG_MACRO_DIR ++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) + +-# serial 1 ++ dnl ensure that when the Automake generated makefile calls aclocal, ++ dnl it honours the $ACLOCAL_FLAGS environment variable ++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" ++ if test -n "$ac_macro_dir"; then ++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" ++ fi + +-# AM_SILENT_RULES([DEFAULT]) +-# -------------------------- +-# Enable less verbose build rules; with the default set to DEFAULT +-# (`yes' being less verbose, `no' or empty being verbose). +-AC_DEFUN([AM_SILENT_RULES], +-[AC_ARG_ENABLE([silent-rules], +-[ --enable-silent-rules less verbose build output (undo: `make V=1') +- --disable-silent-rules verbose build output (undo: `make V=0')]) +-case $enable_silent_rules in +-yes) AM_DEFAULT_VERBOSITY=0;; +-no) AM_DEFAULT_VERBOSITY=1;; +-*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +-esac +-AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +-AM_BACKSLASH='\' +-AC_SUBST([AM_BACKSLASH])dnl +-_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++ AC_SUBST([ACLOCAL_AMFLAGS]) + ]) + +-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++AC_DEFUN([GNOME_DEBUG_CHECK], ++[ ++ AC_ARG_ENABLE([debug], ++ AC_HELP_STRING([--enable-debug], ++ [turn on debugging]),, ++ [enable_debug=no]) + +-# AM_PROG_INSTALL_STRIP +-# --------------------- +-# One issue with vendor `install' (even GNU) is that you can't +-# specify the program used to strip binaries. This is especially +-# annoying in cross-compiling environments, where the build's strip +-# is unlikely to handle the host's binaries. +-# Fortunately install-sh will honor a STRIPPROG variable, so we +-# always use install-sh in `make install-strip', and initialize +-# STRIPPROG with the value of the STRIP variable (set by the user). +-AC_DEFUN([AM_PROG_INSTALL_STRIP], +-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +-# Installed binaries are usually stripped using `strip' when the user +-# run `make install-strip'. However `strip' might not be the right +-# tool to use in cross-compilation environments, therefore Automake +-# will honor the `STRIP' environment variable to overrule this program. +-dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +-if test "$cross_compiling" != no; then +- AC_CHECK_TOOL([STRIP], [strip], :) +-fi +-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +-AC_SUBST([INSTALL_STRIP_PROGRAM])]) ++ if test x$enable_debug = xyes ; then ++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1, ++ [Enable additional debugging at the expense of performance and size]) ++ fi ++]) + +-# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++dnl GNOME_MAINTAINER_MODE_DEFINES () ++dnl define DISABLE_DEPRECATED ++dnl ++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], ++[ ++ AC_REQUIRE([AM_MAINTAINER_MODE]) + +-# serial 2 ++ DISABLE_DEPRECATED="" ++ if test $USE_MAINTAINER_MODE = yes; then ++ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" ++ for DOMAIN in $DOMAINS; do ++ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" ++ done ++ fi + +-# _AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +-# This macro is traced by Automake. +-AC_DEFUN([_AM_SUBST_NOTMAKE]) ++ AC_SUBST(DISABLE_DEPRECATED) ++]) + +-# AM_SUBST_NOTMAKE(VARIABLE) +-# --------------------------- +-# Public sister of _AM_SUBST_NOTMAKE. +-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) ++dnl GNOME_COMPILE_WARNINGS ++dnl Turn on many useful compiler warnings ++dnl For now, only works on GCC ++AC_DEFUN([GNOME_COMPILE_WARNINGS],[ ++ dnl ****************************** ++ dnl More compiler warnings ++ dnl ****************************** + +-# Check how to create a tarball. -*- Autoconf -*- ++ AC_ARG_ENABLE(compile-warnings, ++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], ++ [Turn on compiler warnings]),, ++ [enable_compile_warnings="m4_default([$1],[yes])"]) + +-# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +-# +-# This file is free software; the Free Software Foundation +-# gives unlimited permission to copy and/or distribute it, +-# with or without modifications, as long as this notice is preserved. ++ warnCFLAGS= ++ if test "x$GCC" != xyes; then ++ enable_compile_warnings=no ++ fi + +-# serial 2 ++ warning_flags= ++ realsave_CFLAGS="$CFLAGS" + +-# _AM_PROG_TAR(FORMAT) +-# -------------------- +-# Check how to create a tarball in format FORMAT. +-# FORMAT should be one of `v7', `ustar', or `pax'. +-# +-# Substitute a variable $(am__tar) that is a command +-# writing to stdout a FORMAT-tarball containing the directory +-# $tardir. +-# tardir=directory && $(am__tar) > result.tar +-# +-# Substitute a variable $(am__untar) that extract such +-# a tarball read from stdin. +-# $(am__untar) < result.tar +-AC_DEFUN([_AM_PROG_TAR], +-[# Always define AMTAR for backward compatibility. +-AM_MISSING_PROG([AMTAR], [tar]) +-m4_if([$1], [v7], +- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], +- [m4_case([$1], [ustar],, [pax],, +- [m4_fatal([Unknown tar format])]) +-AC_MSG_CHECKING([how to create a $1 tar archive]) +-# Loop over all known methods to create a tar archive until one works. +-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +-_am_tools=${am_cv_prog_tar_$1-$_am_tools} +-# Do not fold the above two line into one, because Tru64 sh and +-# Solaris sh will not grok spaces in the rhs of `-'. +-for _am_tool in $_am_tools +-do +- case $_am_tool in +- gnutar) +- for _am_tar in tar gnutar gtar; +- do +- AM_RUN_LOG([$_am_tar --version]) && break +- done +- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' +- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' +- am__untar="$_am_tar -xf -" +- ;; +- plaintar) +- # Must skip GNU tar: if it does not support --format= it doesn't create +- # ustar tarball either. +- (tar --version) >/dev/null 2>&1 && continue +- am__tar='tar chf - "$$tardir"' +- am__tar_='tar chf - "$tardir"' +- am__untar='tar xf -' +- ;; +- pax) +- am__tar='pax -L -x $1 -w "$$tardir"' +- am__tar_='pax -L -x $1 -w "$tardir"' +- am__untar='pax -r' +- ;; +- cpio) +- am__tar='find "$$tardir" -print | cpio -o -H $1 -L' +- am__tar_='find "$tardir" -print | cpio -o -H $1 -L' +- am__untar='cpio -i -H $1 -d' +- ;; +- none) +- am__tar=false +- am__tar_=false +- am__untar=false +- ;; +- esac ++ case "$enable_compile_warnings" in ++ no) ++ warning_flags= ++ ;; ++ minimum) ++ warning_flags="-Wall" ++ ;; ++ yes) ++ warning_flags="-Wall -Wmissing-prototypes" ++ ;; ++ maximum|error) ++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" ++ CFLAGS="$warning_flags $CFLAGS" ++ for option in -Wno-sign-compare; do ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $option" ++ AC_MSG_CHECKING([whether gcc understands $option]) ++ AC_TRY_COMPILE([], [], ++ has_option=yes, ++ has_option=no,) ++ CFLAGS="$SAVE_CFLAGS" ++ AC_MSG_RESULT($has_option) ++ if test $has_option = yes; then ++ warning_flags="$warning_flags $option" ++ fi ++ unset has_option ++ unset SAVE_CFLAGS ++ done ++ unset option ++ if test "$enable_compile_warnings" = "error" ; then ++ warning_flags="$warning_flags -Werror" ++ fi ++ ;; ++ *) ++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) ++ ;; ++ esac ++ CFLAGS="$realsave_CFLAGS" ++ AC_MSG_CHECKING(what warning flags to pass to the C compiler) ++ AC_MSG_RESULT($warning_flags) + +- # If the value was cached, stop now. We just wanted to have am__tar +- # and am__untar set. +- test -n "${am_cv_prog_tar_$1}" && break ++ AC_ARG_ENABLE(iso-c, ++ AC_HELP_STRING([--enable-iso-c], ++ [Try to warn if code is not ISO C ]),, ++ [enable_iso_c=no]) + +- # tar/untar a dummy directory, and stop if the command works +- rm -rf conftest.dir +- mkdir conftest.dir +- echo GrepMe > conftest.dir/file +- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) +- rm -rf conftest.dir +- if test -s conftest.tar; then +- AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) ++ complCFLAGS= ++ if test "x$enable_iso_c" != "xno"; then ++ if test "x$GCC" = "xyes"; then ++ case " $CFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -ansi" ;; ++ esac ++ case " $CFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCFLAGS="$complCFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCFLAGS) ++ ++ WARN_CFLAGS="$warning_flags $complCFLAGS" ++ AC_SUBST(WARN_CFLAGS) ++]) ++ ++dnl For C++, do basically the same thing. ++ ++AC_DEFUN([GNOME_CXX_WARNINGS],[ ++ AC_ARG_ENABLE(cxx-warnings, ++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] ++ [Turn on compiler warnings.]),, ++ [enable_cxx_warnings="m4_default([$1],[minimum])"]) ++ ++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) ++ warnCXXFLAGS= ++ if test "x$GXX" != xyes; then ++ enable_cxx_warnings=no + fi +-done +-rm -rf conftest.dir ++ if test "x$enable_cxx_warnings" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-Wall[\ \ ]*) ;; ++ *) warnCXXFLAGS="-Wall -Wno-unused" ;; ++ esac + +-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +-AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +-AC_SUBST([am__tar]) +-AC_SUBST([am__untar]) +-]) # _AM_PROG_TAR ++ ## -W is not all that useful. And it cannot be controlled ++ ## with individual -Wno-xxx flags, unlike -Wall ++ if test "x$enable_cxx_warnings" = "xyes"; then ++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" ++ fi ++ fi ++ fi ++ AC_MSG_RESULT($warnCXXFLAGS) ++ ++ AC_ARG_ENABLE(iso-cxx, ++ AC_HELP_STRING([--enable-iso-cxx], ++ [Try to warn if code is not ISO C++ ]),, ++ [enable_iso_cxx=no]) ++ ++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) ++ complCXXFLAGS= ++ if test "x$enable_iso_cxx" != "xno"; then ++ if test "x$GXX" = "xyes"; then ++ case " $CXXFLAGS " in ++ *[\ \ ]-ansi[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; ++ esac ++ ++ case " $CXXFLAGS " in ++ *[\ \ ]-pedantic[\ \ ]*) ;; ++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; ++ esac ++ fi ++ fi ++ AC_MSG_RESULT($complCXXFLAGS) ++ ++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" ++ AC_SUBST(WARN_CXXFLAGS) ++]) + + # nls.m4 serial 3 (gettext-0.15) + dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +@@ -1193,741 +815,1119 @@ + ])# _PKG_SHORT_ERRORS_SUPPORTED + + +-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +-# [ACTION-IF-NOT-FOUND]) +-# +-# +-# Note that if there is a possibility the first call to +-# PKG_CHECK_MODULES might not happen, you should be sure to include an +-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], ++# [ACTION-IF-NOT-FOUND]) ++# ++# ++# Note that if there is a possibility the first call to ++# PKG_CHECK_MODULES might not happen, you should be sure to include an ++# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac ++# ++# ++# -------------------------------------------------------------- ++AC_DEFUN([PKG_CHECK_MODULES], ++[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl ++AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl ++AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++ ++pkg_failed=no ++AC_MSG_CHECKING([for $1]) ++ ++_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) ++_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++ ++m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS ++and $1[]_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details.]) ++ ++if test $pkg_failed = yes; then ++ _PKG_SHORT_ERRORS_SUPPORTED ++ if test $_pkg_short_errors_supported = yes; then ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` ++ else ++ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++ ++ ifelse([$4], , [AC_MSG_ERROR(dnl ++[Package requirements ($2) were not met: ++ ++$$1_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++_PKG_TEXT ++])], ++ [AC_MSG_RESULT([no]) ++ $4]) ++elif test $pkg_failed = untried; then ++ ifelse([$4], , [AC_MSG_FAILURE(dnl ++[The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++_PKG_TEXT ++ ++To get pkg-config, see .])], ++ [$4]) ++else ++ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS ++ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS ++ AC_MSG_RESULT([yes]) ++ ifelse([$3], , :, [$3]) ++fi[]dnl ++])# PKG_CHECK_MODULES ++ ++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# AM_AUTOMAKE_VERSION(VERSION) ++# ---------------------------- ++# Automake X.Y traces this macro to ensure aclocal.m4 has been ++# generated from the m4 files accompanying Automake X.Y. ++# (This private macro should not be called outside this file.) ++AC_DEFUN([AM_AUTOMAKE_VERSION], ++[am__api_version='1.11' ++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to ++dnl require some minimum version. Point them to the right macro. ++m4_if([$1], [1.11.1], [], ++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ++]) ++ ++# _AM_AUTOCONF_VERSION(VERSION) ++# ----------------------------- ++# aclocal traces this macro to find the Autoconf version. ++# This is a private macro too. Using m4_define simplifies ++# the logic in aclocal, which can simply ignore this definition. ++m4_define([_AM_AUTOCONF_VERSION], []) ++ ++# AM_SET_CURRENT_AUTOMAKE_VERSION ++# ------------------------------- ++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. ++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. ++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], ++[AM_AUTOMAKE_VERSION([1.11.1])dnl ++m4_ifndef([AC_AUTOCONF_VERSION], ++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl ++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) ++ ++# AM_AUX_DIR_EXPAND -*- Autoconf -*- ++ ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets ++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to ++# `$srcdir', `$srcdir/..', or `$srcdir/../..'. ++# ++# Of course, Automake must honor this variable whenever it calls a ++# tool from the auxiliary directory. The problem is that $srcdir (and ++# therefore $ac_aux_dir as well) can be either absolute or relative, ++# depending on how configure is run. This is pretty annoying, since ++# it makes $ac_aux_dir quite unusable in subdirectories: in the top ++# source directory, any form will work fine, but in subdirectories a ++# relative path needs to be adjusted first. ++# ++# $ac_aux_dir/missing ++# fails when called from a subdirectory if $ac_aux_dir is relative ++# $top_srcdir/$ac_aux_dir/missing ++# fails if $ac_aux_dir is absolute, ++# fails when called from a subdirectory in a VPATH build with ++# a relative $ac_aux_dir ++# ++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir ++# are both prefixed by $srcdir. In an in-source build this is usually ++# harmless because $srcdir is `.', but things will broke when you ++# start a VPATH build or use an absolute $srcdir. ++# ++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, ++# iff we strip the leading $srcdir from $ac_aux_dir. That would be: ++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` ++# and then we would define $MISSING as ++# MISSING="\${SHELL} $am_aux_dir/missing" ++# This will work as long as MISSING is not called from configure, because ++# unfortunately $(top_srcdir) has no meaning in configure. ++# However there are other variables, like CC, which are often used in ++# configure, and could therefore not use this "fixed" $ac_aux_dir. ++# ++# Another solution, used here, is to always expand $ac_aux_dir to an ++# absolute PATH. The drawback is that using absolute paths prevent a ++# configured tree to be moved without reconfiguration. ++ ++AC_DEFUN([AM_AUX_DIR_EXPAND], ++[dnl Rely on autoconf to set up CDPATH properly. ++AC_PREREQ([2.50])dnl ++# expand $ac_aux_dir to an absolute path ++am_aux_dir=`cd $ac_aux_dir && pwd` ++]) ++ ++# AM_CONDITIONAL -*- Autoconf -*- ++ ++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 ++# Free Software Foundation, Inc. + # ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 9 ++ ++# AM_CONDITIONAL(NAME, SHELL-CONDITION) ++# ------------------------------------- ++# Define a conditional. ++AC_DEFUN([AM_CONDITIONAL], ++[AC_PREREQ(2.52)dnl ++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], ++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl ++AC_SUBST([$1_TRUE])dnl ++AC_SUBST([$1_FALSE])dnl ++_AM_SUBST_NOTMAKE([$1_TRUE])dnl ++_AM_SUBST_NOTMAKE([$1_FALSE])dnl ++m4_define([_AM_COND_VALUE_$1], [$2])dnl ++if $2; then ++ $1_TRUE= ++ $1_FALSE='#' ++else ++ $1_TRUE='#' ++ $1_FALSE= ++fi ++AC_CONFIG_COMMANDS_PRE( ++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then ++ AC_MSG_ERROR([[conditional "$1" was never defined. ++Usually this means the macro was only invoked conditionally.]]) ++fi])]) ++ ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 ++# Free Software Foundation, Inc. + # +-# -------------------------------------------------------------- +-AC_DEFUN([PKG_CHECK_MODULES], +-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-pkg_failed=no +-AC_MSG_CHECKING([for $1]) ++# serial 10 + +-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +-_PKG_CONFIG([$1][_LIBS], [libs], [$2]) ++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be ++# written in clear, in which case automake, when reading aclocal.m4, ++# will think it sees a *use*, and therefore will trigger all it's ++# C support machinery. Also note that it means that autoscan, seeing ++# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + +-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +-and $1[]_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details.]) + +-if test $pkg_failed = yes; then +- _PKG_SHORT_ERRORS_SUPPORTED +- if test $_pkg_short_errors_supported = yes; then +- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` +- else +- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD ++# _AM_DEPENDENCIES(NAME) ++# ---------------------- ++# See how the compiler implements dependency checking. ++# NAME is "CC", "CXX", "GCJ", or "OBJC". ++# We try a few techniques and use that to set a single cache variable. ++# ++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was ++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular ++# dependency, and given that the user is not expected to run this macro, ++# just rely on AC_PROG_CC. ++AC_DEFUN([_AM_DEPENDENCIES], ++[AC_REQUIRE([AM_SET_DEPDIR])dnl ++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl ++AC_REQUIRE([AM_MAKE_INCLUDE])dnl ++AC_REQUIRE([AM_DEP_TRACK])dnl + +- ifelse([$4], , [AC_MSG_ERROR(dnl +-[Package requirements ($2) were not met: ++ifelse([$1], CC, [depcc="$CC" am_compiler_list=], ++ [$1], CXX, [depcc="$CXX" am_compiler_list=], ++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], ++ [$1], UPC, [depcc="$UPC" am_compiler_list=], ++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], ++ [depcc="$$1" am_compiler_list=]) + +-$$1_PKG_ERRORS ++AC_CACHE_CHECK([dependency style of $depcc], ++ [am_cv_$1_dependencies_compiler_type], ++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then ++ # We make a subdir and do the tests there. Otherwise we can end up ++ # making bogus files that we don't know about and never remove. For ++ # instance it was reported that on HP-UX the gcc test will end up ++ # making a dummy file named `D' -- because `-MD' means `put the output ++ # in D'. ++ mkdir conftest.dir ++ # Copy depcomp to subdir because otherwise we won't find it if we're ++ # using a relative directory. ++ cp "$am_depcomp" conftest.dir ++ cd conftest.dir ++ # We will build objects and dependencies in a subdirectory because ++ # it helps to detect inapplicable dependency modes. For instance ++ # both Tru64's cc and ICC support -MD to output dependencies as a ++ # side effect of compilation, but ICC will put the dependencies in ++ # the current directory while Tru64 will put them in the object ++ # directory. ++ mkdir sub + +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. ++ am_cv_$1_dependencies_compiler_type=none ++ if test "$am_compiler_list" = ""; then ++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` ++ fi ++ am__universal=false ++ m4_case([$1], [CC], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac], ++ [CXX], ++ [case " $depcc " in #( ++ *\ -arch\ *\ -arch\ *) am__universal=true ;; ++ esac]) + +-_PKG_TEXT +-])], +- [AC_MSG_RESULT([no]) +- $4]) +-elif test $pkg_failed = untried; then +- ifelse([$4], , [AC_MSG_FAILURE(dnl +-[The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. ++ for depmode in $am_compiler_list; do ++ # Setup a source with many dependencies, because some compilers ++ # like to wrap large dependency lists on column 80 (with \), and ++ # we should not choose a depcomp mode which is confused by this. ++ # ++ # We need to recreate these files for each test, as the compiler may ++ # overwrite some of them when testing with obscure command lines. ++ # This happens at least with the AIX C compiler. ++ : > sub/conftest.c ++ for i in 1 2 3 4 5 6; do ++ echo '#include "conftst'$i'.h"' >> sub/conftest.c ++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with ++ # Solaris 8's {/usr,}/bin/sh. ++ touch sub/conftst$i.h ++ done ++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + +-_PKG_TEXT ++ # We check with `-c' and `-o' for the sake of the "dashmstdout" ++ # mode. It turns out that the SunPro C++ compiler does not properly ++ # handle `-M -o', and we need to detect this. Also, some Intel ++ # versions had trouble with output in subdirs ++ am__obj=sub/conftest.${OBJEXT-o} ++ am__minus_obj="-o $am__obj" ++ case $depmode in ++ gcc) ++ # This depmode causes a compiler race in universal mode. ++ test "$am__universal" = false || continue ++ ;; ++ nosideeffect) ++ # after this tag, mechanisms are not by side-effect, so they'll ++ # only be used when explicitly requested ++ if test "x$enable_dependency_tracking" = xyes; then ++ continue ++ else ++ break ++ fi ++ ;; ++ msvisualcpp | msvcmsys) ++ # This compiler won't grok `-c -o', but also, the minuso test has ++ # not run yet. These depmodes are late enough in the game, and ++ # so weak that their functioning should not be impacted. ++ am__obj=conftest.${OBJEXT-o} ++ am__minus_obj= ++ ;; ++ none) break ;; ++ esac ++ if depmode=$depmode \ ++ source=sub/conftest.c object=$am__obj \ ++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ ++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ ++ >/dev/null 2>conftest.err && ++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && ++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && ++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then ++ # icc doesn't choke on unknown options, it will just issue warnings ++ # or remarks (even with -Werror). So we grep stderr for any message ++ # that says an option was ignored or not supported. ++ # When given -MP, icc 7.0 and 7.1 complain thusly: ++ # icc: Command line warning: ignoring option '-M'; no argument required ++ # The diagnosis changed in icc 8.0: ++ # icc: Command line remark: option '-MP' not supported ++ if (grep 'ignoring option' conftest.err || ++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else ++ am_cv_$1_dependencies_compiler_type=$depmode ++ break ++ fi ++ fi ++ done + +-To get pkg-config, see .])], +- [$4]) ++ cd .. ++ rm -rf conftest.dir + else +- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS +- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS +- AC_MSG_RESULT([yes]) +- ifelse([$3], , :, [$3]) +-fi[]dnl +-])# PKG_CHECK_MODULES ++ am_cv_$1_dependencies_compiler_type=none ++fi ++]) ++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ++AM_CONDITIONAL([am__fastdep$1], [ ++ test "x$enable_dependency_tracking" != xno \ ++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) ++]) + +-dnl AM_GCONF_SOURCE_2 +-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +-dnl (i.e. pass to gconftool-2 +-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +-dnl you should install foo.schemas files +-dnl + +-AC_DEFUN([AM_GCONF_SOURCE_2], +-[ +- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then +- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` +- else +- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE +- fi ++# AM_SET_DEPDIR ++# ------------- ++# Choose a directory name for dependency files. ++# This macro is AC_REQUIREd in _AM_DEPENDENCIES ++AC_DEFUN([AM_SET_DEPDIR], ++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl ++]) + +- AC_ARG_WITH([gconf-source], +- AC_HELP_STRING([--with-gconf-source=sourceaddress], +- [Config database for installing schema files.]), +- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) + +- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) +- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) ++# AM_DEP_TRACK ++# ------------ ++AC_DEFUN([AM_DEP_TRACK], ++[AC_ARG_ENABLE(dependency-tracking, ++[ --disable-dependency-tracking speeds up one-time build ++ --enable-dependency-tracking do not reject slow dependency extractors]) ++if test "x$enable_dependency_tracking" != xno; then ++ am_depcomp="$ac_aux_dir/depcomp" ++ AMDEPBACKSLASH='\' ++fi ++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) ++AC_SUBST([AMDEPBACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl ++]) + +- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then +- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' +- fi ++# Generate code to set up dependency tracking. -*- Autoconf -*- + +- AC_ARG_WITH([gconf-schema-file-dir], +- AC_HELP_STRING([--with-gconf-schema-file-dir=dir], +- [Directory for installing schema files.]), +- [GCONF_SCHEMA_FILE_DIR="$withval"],) ++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_SUBST(GCONF_SCHEMA_FILE_DIR) +- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) ++#serial 5 + +- AC_ARG_ENABLE(schemas-install, +- AC_HELP_STRING([--disable-schemas-install], +- [Disable the schemas installation]), +- [case ${enableval} in +- yes|no) ;; +- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; +- esac]) +- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +-]) ++# _AM_OUTPUT_DEPENDENCY_COMMANDS ++# ------------------------------ ++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], ++[{ ++ # Autoconf 2.62 quotes --file arguments for eval, but not when files ++ # are listed without --file. Let's play safe and only enable the eval ++ # if we detect the quoting. ++ case $CONFIG_FILES in ++ *\'*) eval set x "$CONFIG_FILES" ;; ++ *) set x $CONFIG_FILES ;; ++ esac ++ shift ++ for mf ++ do ++ # Strip MF so we end up with the name of the file. ++ mf=`echo "$mf" | sed -e 's/:.*$//'` ++ # Check whether this is an Automake generated Makefile or not. ++ # We used to match only the files named `Makefile.in', but ++ # some people rename them; so instead we look at the file content. ++ # Grep'ing the first line is not enough: some people post-process ++ # each Makefile.in and add a new line on top of each file to say so. ++ # Grep'ing the whole file is not good either: AIX grep has a line ++ # limit of 2048, but all sed's we know have understand at least 4000. ++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then ++ dirpart=`AS_DIRNAME("$mf")` ++ else ++ continue ++ fi ++ # Extract the definition of DEPDIR, am__include, and am__quote ++ # from the Makefile without running `make'. ++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` ++ test -z "$DEPDIR" && continue ++ am__include=`sed -n 's/^am__include = //p' < "$mf"` ++ test -z "am__include" && continue ++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"` ++ # When using ansi2knr, U may be empty or an underscore; expand it ++ U=`sed -n 's/^U = //p' < "$mf"` ++ # Find all dependency output files, they are included files with ++ # $(DEPDIR) in their names. We invoke sed twice because it is the ++ # simplest approach to changing $(DEPDIR) to its actual value in the ++ # expansion. ++ for file in `sed -n " ++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ ++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do ++ # Make sure the directory exists. ++ test -f "$dirpart/$file" && continue ++ fdir=`AS_DIRNAME(["$file"])` ++ AS_MKDIR_P([$dirpart/$fdir]) ++ # echo "creating $dirpart/$file" ++ echo '# dummy' > "$dirpart/$file" ++ done ++ done ++} ++])# _AM_OUTPUT_DEPENDENCY_COMMANDS + +-# Copyright (C) 1995-2002 Free Software Foundation, Inc. +-# Copyright (C) 2001-2003,2004 Red Hat, Inc. +-# +-# This file is free software, distributed under the terms of the GNU +-# General Public License. As a special exception to the GNU General +-# Public License, this file may be distributed as part of a program +-# that contains a configuration script generated by Autoconf, under +-# the same distribution terms as the rest of that program. +-# +-# This file can be copied and used freely without restrictions. It can +-# be used in projects which are not available under the GNU Public License +-# but which still want to provide support for the GNU gettext functionality. +-# +-# Macro to add for using GNU gettext. +-# Ulrich Drepper , 1995, 1996 +-# +-# Modified to never use included libintl. +-# Owen Taylor , 12/15/1998 +-# +-# Major rework to remove unused code +-# Owen Taylor , 12/11/2002 +-# +-# Added better handling of ALL_LINGUAS from GNU gettext version +-# written by Bruno Haible, Owen Taylor 5/30/3002 ++ ++# AM_OUTPUT_DEPENDENCY_COMMANDS ++# ----------------------------- ++# This macro should only be invoked once -- use via AC_REQUIRE. + # +-# Modified to require ngettext +-# Matthias Clasen 08/06/2004 ++# This code is only required when automatic dependency tracking ++# is enabled. FIXME. This creates each `.P' file that we will ++# need in order to bootstrap the dependency handling code. ++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], ++[AC_CONFIG_COMMANDS([depfiles], ++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], ++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ++]) ++ ++# Do all the work for Automake. -*- Autoconf -*- ++ ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, ++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. + # +-# We need this here as well, since someone might use autoconf-2.5x +-# to configure GLib then an older version to configure a package +-# using AM_GLIB_GNU_GETTEXT +-AC_PREREQ(2.53) ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl +-dnl We go to great lengths to make sure that aclocal won't +-dnl try to pull in the installed version of these macros +-dnl when running aclocal in the glib directory. +-dnl +-m4_copy([AC_DEFUN],[glib_DEFUN]) +-m4_copy([AC_REQUIRE],[glib_REQUIRE]) +-dnl +-dnl At the end, if we're not within glib, we'll define the public +-dnl definitions in terms of our private definitions. +-dnl ++# serial 16 + +-# GLIB_LC_MESSAGES +-#-------------------- +-glib_DEFUN([GLIB_LC_MESSAGES], +- [AC_CHECK_HEADERS([locale.h]) +- if test $ac_cv_header_locale_h = yes; then +- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, +- [AC_TRY_LINK([#include ], [return LC_MESSAGES], +- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) +- if test $am_cv_val_LC_MESSAGES = yes; then +- AC_DEFINE(HAVE_LC_MESSAGES, 1, +- [Define if your file defines LC_MESSAGES.]) +- fi +- fi]) ++# This macro actually does too much. Some checks are only needed if ++# your package does certain things. But this isn't really a big deal. + +-# GLIB_PATH_PROG_WITH_TEST +-#---------------------------- +-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +-[# Extract the first word of "$2", so it can be a program name with args. +-set dummy $2; ac_word=[$]2 +-AC_MSG_CHECKING([for $ac_word]) +-AC_CACHE_VAL(ac_cv_path_$1, +-[case "[$]$1" in +- /*) +- ac_cv_path_$1="[$]$1" # Let the user override the test with a path. +- ;; +- *) +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" +- for ac_dir in ifelse([$5], , $PATH, [$5]); do +- test -z "$ac_dir" && ac_dir=. +- if test -f $ac_dir/$ac_word; then +- if [$3]; then +- ac_cv_path_$1="$ac_dir/$ac_word" +- break +- fi +- fi +- done +- IFS="$ac_save_ifs" +-dnl If no 4th arg is given, leave the cache variable unset, +-dnl so AC_PATH_PROGS will keep looking. +-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +-])dnl +- ;; +-esac])dnl +-$1="$ac_cv_path_$1" +-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then +- AC_MSG_RESULT([$]$1) +-else +- AC_MSG_RESULT(no) ++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) ++# AM_INIT_AUTOMAKE([OPTIONS]) ++# ----------------------------------------------- ++# The call with PACKAGE and VERSION arguments is the old style ++# call (pre autoconf-2.50), which is being phased out. PACKAGE ++# and VERSION should now be passed to AC_INIT and removed from ++# the call to AM_INIT_AUTOMAKE. ++# We support both call styles for the transition. After ++# the next Automake release, Autoconf can make the AC_INIT ++# arguments mandatory, and then we can depend on a new Autoconf ++# release and drop the old call support. ++AC_DEFUN([AM_INIT_AUTOMAKE], ++[AC_PREREQ([2.62])dnl ++dnl Autoconf wants to disallow AM_ names. We explicitly allow ++dnl the ones we care about. ++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl ++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl ++AC_REQUIRE([AC_PROG_INSTALL])dnl ++if test "`cd $srcdir && pwd`" != "`pwd`"; then ++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output ++ # is not polluted with repeated "-I." ++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl ++ # test to see if srcdir already configured ++ if test -f $srcdir/config.status; then ++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) ++ fi + fi +-AC_SUBST($1)dnl +-]) + +-# GLIB_WITH_NLS +-#----------------- +-glib_DEFUN([GLIB_WITH_NLS], +- dnl NLS is obligatory +- [USE_NLS=yes +- AC_SUBST(USE_NLS) ++# test whether we have cygpath ++if test -z "$CYGPATH_W"; then ++ if (cygpath --version) >/dev/null 2>/dev/null; then ++ CYGPATH_W='cygpath -w' ++ else ++ CYGPATH_W=echo ++ fi ++fi ++AC_SUBST([CYGPATH_W]) ++ ++# Define the identity of the package. ++dnl Distinguish between old-style and new-style calls. ++m4_ifval([$2], ++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl ++ AC_SUBST([PACKAGE], [$1])dnl ++ AC_SUBST([VERSION], [$2])], ++[_AM_SET_OPTIONS([$1])dnl ++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. ++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, ++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl ++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl ++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl ++ ++_AM_IF_OPTION([no-define],, ++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) ++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +- gt_cv_have_gettext=no ++# Some tools Automake needs. ++AC_REQUIRE([AM_SANITY_CHECK])dnl ++AC_REQUIRE([AC_ARG_PROGRAM])dnl ++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) ++AM_MISSING_PROG(AUTOCONF, autoconf) ++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) ++AM_MISSING_PROG(AUTOHEADER, autoheader) ++AM_MISSING_PROG(MAKEINFO, makeinfo) ++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl ++AC_REQUIRE([AM_PROG_MKDIR_P])dnl ++# We need awk for the "check" target. The system "awk" is bad on ++# some platforms. ++AC_REQUIRE([AC_PROG_AWK])dnl ++AC_REQUIRE([AC_PROG_MAKE_SET])dnl ++AC_REQUIRE([AM_SET_LEADING_DOT])dnl ++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], ++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], ++ [_AM_PROG_TAR([v7])])]) ++_AM_IF_OPTION([no-dependencies],, ++[AC_PROVIDE_IFELSE([AC_PROG_CC], ++ [_AM_DEPENDENCIES(CC)], ++ [define([AC_PROG_CC], ++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [_AM_DEPENDENCIES(CXX)], ++ [define([AC_PROG_CXX], ++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl ++AC_PROVIDE_IFELSE([AC_PROG_OBJC], ++ [_AM_DEPENDENCIES(OBJC)], ++ [define([AC_PROG_OBJC], ++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ++]) ++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl ++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the ++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro ++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. ++AC_CONFIG_COMMANDS_PRE(dnl ++[m4_provide_if([_AM_COMPILER_EXEEXT], ++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ++]) + +- CATOBJEXT=NONE +- XGETTEXT=: +- INTLLIBS= ++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not ++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further ++dnl mangled by Autoconf and run in a shell conditional statement. ++m4_define([_AC_COMPILER_EXEEXT], ++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +- AC_CHECK_HEADER(libintl.h, +- [gt_cv_func_dgettext_libintl="no" +- libintl_extra_libs="" + +- # +- # First check in libc +- # +- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !ngettext ("","", 1)], +- gt_cv_func_ngettext_libc=yes, +- gt_cv_func_ngettext_libc=no) +- ]) +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, +- [AC_TRY_LINK([ +-#include +-], +- [return !dgettext ("","")], +- gt_cv_func_dgettext_libc=yes, +- gt_cv_func_dgettext_libc=no) +- ]) +- fi +- +- if test "$gt_cv_func_ngettext_libc" = "yes" ; then +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- fi ++# When config.status generates a header, we must update the stamp-h file. ++# This file resides in the same directory as the config header ++# that is generated. The stamp files are numbered to have different names. + +- # +- # If we don't have everything we want, check in libintl +- # +- if test "$gt_cv_func_dgettext_libc" != "yes" \ +- || test "$gt_cv_func_ngettext_libc" != "yes" \ +- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then +- +- AC_CHECK_LIB(intl, bindtextdomain, +- [AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dgettext, +- gt_cv_func_dgettext_libintl=yes)])]) ++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the ++# loop where config.status creates the headers, so we can generate ++# our stamp files there. ++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], ++[# Compute $1's index in $config_headers. ++_am_arg=$1 ++_am_stamp_count=1 ++for _am_header in $config_headers :; do ++ case $_am_header in ++ $_am_arg | $_am_arg:* ) ++ break ;; ++ * ) ++ _am_stamp_count=`expr $_am_stamp_count + 1` ;; ++ esac ++done ++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then +- AC_MSG_CHECKING([if -liconv is needed to use gettext]) +- AC_MSG_RESULT([]) +- AC_CHECK_LIB(intl, ngettext, +- [AC_CHECK_LIB(intl, dcgettext, +- [gt_cv_func_dgettext_libintl=yes +- libintl_extra_libs=-liconv], +- :,-liconv)], +- :,-liconv) +- fi ++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- # +- # If we found libintl, then check in it for bind_textdomain_codeset(); +- # we'll prefer libc if neither have bind_textdomain_codeset(), +- # and both have dgettext and ngettext +- # +- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS -lintl $libintl_extra_libs" +- unset ac_cv_func_bind_textdomain_codeset +- AC_CHECK_FUNCS(bind_textdomain_codeset) +- LIBS="$glib_save_LIBS" ++# AM_PROG_INSTALL_SH ++# ------------------ ++# Define $install_sh. ++AC_DEFUN([AM_PROG_INSTALL_SH], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++if test x"${install_sh}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; ++ *) ++ install_sh="\${SHELL} $am_aux_dir/install-sh" ++ esac ++fi ++AC_SUBST(install_sh)]) + +- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then +- gt_cv_func_dgettext_libc=no +- else +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- && test "$gt_cv_func_ngettext_libc" = "yes"; then +- gt_cv_func_dgettext_libintl=no +- fi +- fi +- fi +- fi ++# Copyright (C) 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- if test "$gt_cv_func_dgettext_libc" = "yes" \ +- || test "$gt_cv_func_dgettext_libintl" = "yes"; then +- gt_cv_have_gettext=yes +- fi +- +- if test "$gt_cv_func_dgettext_libintl" = "yes"; then +- INTLLIBS="-lintl $libintl_extra_libs" +- fi +- +- if test "$gt_cv_have_gettext" = "yes"; then +- AC_DEFINE(HAVE_GETTEXT,1, +- [Define if the GNU gettext() function is already present or preinstalled.]) +- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl +- if test "$MSGFMT" != "no"; then +- glib_save_LIBS="$LIBS" +- LIBS="$LIBS $INTLLIBS" +- AC_CHECK_FUNCS(dcgettext) +- MSGFMT_OPTS= +- AC_MSG_CHECKING([if msgfmt accepts -c]) +- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ +-msgid "" +-msgstr "" +-"Content-Type: text/plain; charset=UTF-8\n" +-"Project-Id-Version: test 1.0\n" +-"PO-Revision-Date: 2007-02-15 12:01+0100\n" +-"Last-Translator: test \n" +-"Language-Team: C \n" +-"MIME-Version: 1.0\n" +-"Content-Transfer-Encoding: 8bit\n" +-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) +- AC_SUBST(MSGFMT_OPTS) +- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; +- return _nl_msg_cat_cntr], +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [case $host in +- *-*-solaris*) +- dnl On Solaris, if bind_textdomain_codeset is in libc, +- dnl GNU format message catalog is always supported, +- dnl since both are added to the libc all together. +- dnl Hence, we'd like to go with DATADIRNAME=share and +- dnl and CATOBJEXT=.gmo in this case. +- AC_CHECK_FUNC(bind_textdomain_codeset, +- [CATOBJEXT=.gmo +- DATADIRNAME=share], +- [CATOBJEXT=.mo +- DATADIRNAME=lib]) +- ;; +- *) +- CATOBJEXT=.mo +- DATADIRNAME=lib +- ;; +- esac]) +- LIBS="$glib_save_LIBS" +- INSTOBJEXT=.mo +- else +- gt_cv_have_gettext=no +- fi +- fi +- ]) ++# serial 2 ++ ++# Check whether the underlying file-system supports filenames ++# with a leading dot. For instance MS-DOS doesn't. ++AC_DEFUN([AM_SET_LEADING_DOT], ++[rm -rf .tst 2>/dev/null ++mkdir .tst 2>/dev/null ++if test -d .tst; then ++ am__leading_dot=. ++else ++ am__leading_dot=_ ++fi ++rmdir .tst 2>/dev/null ++AC_SUBST([am__leading_dot])]) + +- if test "$gt_cv_have_gettext" = "yes" ; then +- AC_DEFINE(ENABLE_NLS, 1, +- [always defined to indicate that i18n is enabled]) +- fi ++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- ++# From Jim Meyering + +- dnl Test whether we really found GNU xgettext. +- if test "$XGETTEXT" != ":"; then +- dnl If it is not GNU xgettext we define it as : so that the +- dnl Makefiles still can work. +- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then +- : ; +- else +- AC_MSG_RESULT( +- [found xgettext program is not GNU xgettext; ignore it]) +- XGETTEXT=":" +- fi +- fi ++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- # We need to process the po/ directory. +- POSUB=po ++# serial 5 + +- AC_OUTPUT_COMMANDS( +- [case "$CONFIG_FILES" in *po/Makefile.in*) +- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile +- esac]) ++# AM_MAINTAINER_MODE([DEFAULT-MODE]) ++# ---------------------------------- ++# Control maintainer-specific portions of Makefiles. ++# Default is to disable them, unless `enable' is passed literally. ++# For symmetry, `disable' may be passed as well. Anyway, the user ++# can override the default with the --enable/--disable switch. ++AC_DEFUN([AM_MAINTAINER_MODE], ++[m4_case(m4_default([$1], [disable]), ++ [enable], [m4_define([am_maintainer_other], [disable])], ++ [disable], [m4_define([am_maintainer_other], [enable])], ++ [m4_define([am_maintainer_other], [enable]) ++ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) ++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) ++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed ++ AC_ARG_ENABLE([maintainer-mode], ++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful ++ (and sometimes confusing) to the casual installer], ++ [USE_MAINTAINER_MODE=$enableval], ++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) ++ AC_MSG_RESULT([$USE_MAINTAINER_MODE]) ++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) ++ MAINT=$MAINTAINER_MODE_TRUE ++ AC_SUBST([MAINT])dnl ++] ++) + +- dnl These rules are solely for the distribution goal. While doing this +- dnl we only have to keep exactly one list of the available catalogs +- dnl in configure.in. +- for lang in $ALL_LINGUAS; do +- GMOFILES="$GMOFILES $lang.gmo" +- POFILES="$POFILES $lang.po" +- done ++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) + +- dnl Make all variables we use known to autoconf. +- AC_SUBST(CATALOGS) +- AC_SUBST(CATOBJEXT) +- AC_SUBST(DATADIRNAME) +- AC_SUBST(GMOFILES) +- AC_SUBST(INSTOBJEXT) +- AC_SUBST(INTLLIBS) +- AC_SUBST(PO_IN_DATADIR_TRUE) +- AC_SUBST(PO_IN_DATADIR_FALSE) +- AC_SUBST(POFILES) +- AC_SUBST(POSUB) +- ]) ++# Check to see how 'make' treats includes. -*- Autoconf -*- + +-# AM_GLIB_GNU_GETTEXT +-# ------------------- +-# Do checks necessary for use of gettext. If a suitable implementation +-# of gettext is found in either in libintl or in the C library, +-# it will set INTLLIBS to the libraries needed for use of gettext +-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +-# on various variables needed by the Makefile.in.in installed by +-# glib-gettextize. +-dnl +-glib_DEFUN([GLIB_GNU_GETTEXT], +- [AC_REQUIRE([AC_PROG_CC])dnl +- AC_REQUIRE([AC_HEADER_STDC])dnl +- +- GLIB_LC_MESSAGES +- GLIB_WITH_NLS ++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- if test "$gt_cv_have_gettext" = "yes"; then +- if test "x$ALL_LINGUAS" = "x"; then +- LINGUAS= +- else +- AC_MSG_CHECKING(for catalogs to be installed) +- NEW_LINGUAS= +- for presentlang in $ALL_LINGUAS; do +- useit=no +- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then +- desiredlanguages="$LINGUAS" +- else +- desiredlanguages="$ALL_LINGUAS" +- fi +- for desiredlang in $desiredlanguages; do +- # Use the presentlang catalog if desiredlang is +- # a. equal to presentlang, or +- # b. a variant of presentlang (because in this case, +- # presentlang can be used as a fallback for messages +- # which are not translated in the desiredlang catalog). +- case "$desiredlang" in +- "$presentlang"*) useit=yes;; +- esac +- done +- if test $useit = yes; then +- NEW_LINGUAS="$NEW_LINGUAS $presentlang" +- fi +- done +- LINGUAS=$NEW_LINGUAS +- AC_MSG_RESULT($LINGUAS) +- fi ++# serial 4 + +- dnl Construct list of names of catalog files to be constructed. +- if test -n "$LINGUAS"; then +- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +- fi +- fi ++# AM_MAKE_INCLUDE() ++# ----------------- ++# Check to see how make treats includes. ++AC_DEFUN([AM_MAKE_INCLUDE], ++[am_make=${MAKE-make} ++cat > confinc << 'END' ++am__doit: ++ @echo this is the am__doit target ++.PHONY: am__doit ++END ++# If we don't find an include directive, just comment out the code. ++AC_MSG_CHECKING([for style of include used by $am_make]) ++am__include="#" ++am__quote= ++_am_result=none ++# First try GNU make style include. ++echo "include confinc" > confmf ++# Ignore all kinds of additional output from `make'. ++case `$am_make -s -f confmf 2> /dev/null` in #( ++*the\ am__doit\ target*) ++ am__include=include ++ am__quote= ++ _am_result=GNU ++ ;; ++esac ++# Now try BSD make style include. ++if test "$am__include" = "#"; then ++ echo '.include "confinc"' > confmf ++ case `$am_make -s -f confmf 2> /dev/null` in #( ++ *the\ am__doit\ target*) ++ am__include=.include ++ am__quote="\"" ++ _am_result=BSD ++ ;; ++ esac ++fi ++AC_SUBST([am__include]) ++AC_SUBST([am__quote]) ++AC_MSG_RESULT([$_am_result]) ++rm -f confinc confmf ++]) + +- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly +- dnl find the mkinstalldirs script in another subdir but ($top_srcdir). +- dnl Try to locate is. +- MKINSTALLDIRS= +- if test -n "$ac_aux_dir"; then +- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" +- fi +- if test -z "$MKINSTALLDIRS"; then +- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" +- fi +- AC_SUBST(MKINSTALLDIRS) ++# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- dnl Generate list of files to be processed by xgettext which will +- dnl be included in po/Makefile. +- test -d po || mkdir po +- if test "x$srcdir" != "x."; then +- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then +- posrcprefix="$srcdir/" +- else +- posrcprefix="../$srcdir/" +- fi +- else +- posrcprefix="../" +- fi +- rm -f po/POTFILES +- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ +- < $srcdir/po/POTFILES.in > po/POTFILES +- ]) ++# serial 6 ++ ++# AM_PROG_CC_C_O ++# -------------- ++# Like AC_PROG_CC_C_O, but changed for automake. ++AC_DEFUN([AM_PROG_CC_C_O], ++[AC_REQUIRE([AC_PROG_CC_C_O])dnl ++AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([compile])dnl ++# FIXME: we rely on the cache variable name because ++# there is no other way. ++set dummy $CC ++am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` ++eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o ++if test "$am_t" != yes; then ++ # Losing compiler, so override with the script. ++ # FIXME: It is wrong to rewrite CC. ++ # But if we don't then we get into trouble of one sort or another. ++ # A longer-term fix would be to have automake use am__CC in this case, ++ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" ++ CC="$am_aux_dir/compile $CC" ++fi ++dnl Make sure AC_PROG_CC is never called again, or it will override our ++dnl setting of CC. ++m4_define([AC_PROG_CC], ++ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) ++]) ++ ++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- ++ ++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 6 ++ ++# AM_MISSING_PROG(NAME, PROGRAM) ++# ------------------------------ ++AC_DEFUN([AM_MISSING_PROG], ++[AC_REQUIRE([AM_MISSING_HAS_RUN]) ++$1=${$1-"${am_missing_run}$2"} ++AC_SUBST($1)]) + +-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +-# ------------------------------- +-# Define VARIABLE to the location where catalog files will +-# be installed by po/Makefile. +-glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +-glib_save_prefix="$prefix" +-glib_save_exec_prefix="$exec_prefix" +-glib_save_datarootdir="$datarootdir" +-test "x$prefix" = xNONE && prefix=$ac_default_prefix +-test "x$exec_prefix" = xNONE && exec_prefix=$prefix +-datarootdir=`eval echo "${datarootdir}"` +-if test "x$CATOBJEXT" = "x.mo" ; then +- localedir=`eval echo "${libdir}/locale"` ++ ++# AM_MISSING_HAS_RUN ++# ------------------ ++# Define MISSING if not defined so far and test if it supports --run. ++# If it does, set am_missing_run to use it, otherwise, to nothing. ++AC_DEFUN([AM_MISSING_HAS_RUN], ++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl ++AC_REQUIRE_AUX_FILE([missing])dnl ++if test x"${MISSING+set}" != xset; then ++ case $am_aux_dir in ++ *\ * | *\ *) ++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; ++ *) ++ MISSING="\${SHELL} $am_aux_dir/missing" ;; ++ esac ++fi ++# Use eval to expand $SHELL ++if eval "$MISSING --run true"; then ++ am_missing_run="$MISSING --run " + else +- localedir=`eval echo "${datadir}/locale"` ++ am_missing_run= ++ AC_MSG_WARN([`missing' script is too old or missing]) + fi +-prefix="$glib_save_prefix" +-exec_prefix="$glib_save_exec_prefix" +-datarootdir="$glib_save_datarootdir" +-AC_DEFINE_UNQUOTED($1, "$localedir", +- [Define the location where the catalogs will be installed]) + ]) + +-dnl +-dnl Now the definitions that aclocal will find +-dnl +-ifdef(glib_configure_in,[],[ +-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +-])dnl ++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +-# +-# Create a temporary file with TEST-FILE as its contents and pass the +-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +-# 0 and perform ACTION-IF-FAIL for any other exit status. +-AC_DEFUN([GLIB_RUN_PROG], +-[cat >conftest.foo <<_ACEOF +-$2 +-_ACEOF +-if AC_RUN_LOG([$1 conftest.foo]); then +- m4_ifval([$3], [$3], [:]) +-m4_ifvaln([$4], [else $4])dnl +-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +-fi]) ++# AM_PROG_MKDIR_P ++# --------------- ++# Check for `mkdir -p'. ++AC_DEFUN([AM_PROG_MKDIR_P], ++[AC_PREREQ([2.60])dnl ++AC_REQUIRE([AC_PROG_MKDIR_P])dnl ++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, ++dnl while keeping a definition of mkdir_p for backward compatibility. ++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. ++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of ++dnl Makefile.ins that do not define MKDIR_P, so we do our own ++dnl adjustment using top_builddir (which is defined more often than ++dnl MKDIR_P). ++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl ++case $mkdir_p in ++ [[\\/$]]* | ?:[[\\/]]*) ;; ++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; ++esac ++]) + ++# Helper functions for option handling. -*- Autoconf -*- + +-# gnome-common.m4 +-# ++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl GNOME_COMMON_INIT ++# serial 4 + +-AC_DEFUN([GNOME_COMMON_INIT], +-[ +- dnl this macro should come after AC_CONFIG_MACRO_DIR +- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) ++# _AM_MANGLE_OPTION(NAME) ++# ----------------------- ++AC_DEFUN([_AM_MANGLE_OPTION], ++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +- dnl ensure that when the Automake generated makefile calls aclocal, +- dnl it honours the $ACLOCAL_FLAGS environment variable +- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" +- if test -n "$ac_macro_dir"; then +- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" +- fi ++# _AM_SET_OPTION(NAME) ++# ------------------------------ ++# Set option NAME. Presently that only means defining a flag for this option. ++AC_DEFUN([_AM_SET_OPTION], ++[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +- AC_SUBST([ACLOCAL_AMFLAGS]) +-]) ++# _AM_SET_OPTIONS(OPTIONS) ++# ---------------------------------- ++# OPTIONS is a space-separated list of Automake options. ++AC_DEFUN([_AM_SET_OPTIONS], ++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +-AC_DEFUN([GNOME_DEBUG_CHECK], +-[ +- AC_ARG_ENABLE([debug], +- AC_HELP_STRING([--enable-debug], +- [turn on debugging]),, +- [enable_debug=no]) ++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------- ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++AC_DEFUN([_AM_IF_OPTION], ++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +- if test x$enable_debug = xyes ; then +- AC_DEFINE(GNOME_ENABLE_DEBUG, 1, +- [Enable additional debugging at the expense of performance and size]) +- fi +-]) ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl GNOME_MAINTAINER_MODE_DEFINES () +-dnl define DISABLE_DEPRECATED +-dnl +-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +-[ +- AC_REQUIRE([AM_MAINTAINER_MODE]) ++# AM_RUN_LOG(COMMAND) ++# ------------------- ++# Run COMMAND, save the exit status in ac_status, and log it. ++# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) ++AC_DEFUN([AM_RUN_LOG], ++[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD ++ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ (exit $ac_status); }]) + +- DISABLE_DEPRECATED="" +- if test $USE_MAINTAINER_MODE = yes; then +- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" +- for DOMAIN in $DOMAINS; do +- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" +- done +- fi ++# Check to make sure that the build environment is sane. -*- Autoconf -*- + +- AC_SUBST(DISABLE_DEPRECATED) +-]) ++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 ++# Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +-dnl GNOME_COMPILE_WARNINGS +-dnl Turn on many useful compiler warnings +-dnl For now, only works on GCC +-AC_DEFUN([GNOME_COMPILE_WARNINGS],[ +- dnl ****************************** +- dnl More compiler warnings +- dnl ****************************** ++# serial 5 + +- AC_ARG_ENABLE(compile-warnings, +- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], +- [Turn on compiler warnings]),, +- [enable_compile_warnings="m4_default([$1],[yes])"]) ++# AM_SANITY_CHECK ++# --------------- ++AC_DEFUN([AM_SANITY_CHECK], ++[AC_MSG_CHECKING([whether build environment is sane]) ++# Just in case ++sleep 1 ++echo timestamp > conftest.file ++# Reject unsafe characters in $srcdir or the absolute working directory ++# name. Accept space and tab only in the latter. ++am_lf=' ++' ++case `pwd` in ++ *[[\\\"\#\$\&\'\`$am_lf]]*) ++ AC_MSG_ERROR([unsafe absolute working directory name]);; ++esac ++case $srcdir in ++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) ++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; ++esac + +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi ++# Do `set' in a subshell so we don't clobber the current shell's ++# arguments. Must try -L first in case configure is actually a ++# symlink; some systems play weird games with the mod time of symlinks ++# (eg FreeBSD returns the mod time of the symlink's containing ++# directory). ++if ( ++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` ++ if test "$[*]" = "X"; then ++ # -L didn't work. ++ set X `ls -t "$srcdir/configure" conftest.file` ++ fi ++ rm -f conftest.file ++ if test "$[*]" != "X $srcdir/configure conftest.file" \ ++ && test "$[*]" != "X conftest.file $srcdir/configure"; then ++ ++ # If neither matched, then we have a broken ls. This can happen ++ # if, for instance, CONFIG_SHELL is bash and it inherits a ++ # broken ls alias from the environment. This has actually ++ # happened. Such a system could not be considered "sane". ++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken ++alias in your environment]) ++ fi ++ ++ test "$[2]" = conftest.file ++ ) ++then ++ # Ok. ++ : ++else ++ AC_MSG_ERROR([newly created file is older than distributed files! ++Check your system clock]) ++fi ++AC_MSG_RESULT(yes)]) ++ ++# Copyright (C) 2009 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. ++ ++# serial 1 ++ ++# AM_SILENT_RULES([DEFAULT]) ++# -------------------------- ++# Enable less verbose build rules; with the default set to DEFAULT ++# (`yes' being less verbose, `no' or empty being verbose). ++AC_DEFUN([AM_SILENT_RULES], ++[AC_ARG_ENABLE([silent-rules], ++[ --enable-silent-rules less verbose build output (undo: `make V=1') ++ --disable-silent-rules verbose build output (undo: `make V=0')]) ++case $enable_silent_rules in ++yes) AM_DEFAULT_VERBOSITY=0;; ++no) AM_DEFAULT_VERBOSITY=1;; ++*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; ++esac ++AC_SUBST([AM_DEFAULT_VERBOSITY])dnl ++AM_BACKSLASH='\' ++AC_SUBST([AM_BACKSLASH])dnl ++_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ++]) + +- warning_flags= +- realsave_CFLAGS="$CFLAGS" ++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- AC_MSG_CHECKING([whether gcc understands $option]) +- AC_TRY_COMPILE([], [], +- has_option=yes, +- has_option=no,) +- CFLAGS="$SAVE_CFLAGS" +- AC_MSG_RESULT($has_option) +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- AC_MSG_CHECKING(what warning flags to pass to the C compiler) +- AC_MSG_RESULT($warning_flags) ++# AM_PROG_INSTALL_STRIP ++# --------------------- ++# One issue with vendor `install' (even GNU) is that you can't ++# specify the program used to strip binaries. This is especially ++# annoying in cross-compiling environments, where the build's strip ++# is unlikely to handle the host's binaries. ++# Fortunately install-sh will honor a STRIPPROG variable, so we ++# always use install-sh in `make install-strip', and initialize ++# STRIPPROG with the value of the STRIP variable (set by the user). ++AC_DEFUN([AM_PROG_INSTALL_STRIP], ++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl ++# Installed binaries are usually stripped using `strip' when the user ++# run `make install-strip'. However `strip' might not be the right ++# tool to use in cross-compilation environments, therefore Automake ++# will honor the `STRIP' environment variable to overrule this program. ++dnl Don't test for $cross_compiling = yes, because it might be `maybe'. ++if test "$cross_compiling" != no; then ++ AC_CHECK_TOOL([STRIP], [strip], :) ++fi ++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" ++AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +- AC_ARG_ENABLE(iso-c, +- AC_HELP_STRING([--enable-iso-c], +- [Try to warn if code is not ISO C ]),, +- [enable_iso_c=no]) ++# Copyright (C) 2006, 2008 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCFLAGS) ++# serial 2 + +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- AC_SUBST(WARN_CFLAGS) +-]) ++# _AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. ++# This macro is traced by Automake. ++AC_DEFUN([_AM_SUBST_NOTMAKE]) + +-dnl For C++, do basically the same thing. ++# AM_SUBST_NOTMAKE(VARIABLE) ++# --------------------------- ++# Public sister of _AM_SUBST_NOTMAKE. ++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +-AC_DEFUN([GNOME_CXX_WARNINGS],[ +- AC_ARG_ENABLE(cxx-warnings, +- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] +- [Turn on compiler warnings.]),, +- [enable_cxx_warnings="m4_default([$1],[minimum])"]) ++# Check how to create a tarball. -*- Autoconf -*- + +- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) +- warnCXXFLAGS= +- if test "x$GXX" != xyes; then +- enable_cxx_warnings=no +- fi +- if test "x$enable_cxx_warnings" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-Wall[\ \ ]*) ;; +- *) warnCXXFLAGS="-Wall -Wno-unused" ;; +- esac ++# Copyright (C) 2004, 2005 Free Software Foundation, Inc. ++# ++# This file is free software; the Free Software Foundation ++# gives unlimited permission to copy and/or distribute it, ++# with or without modifications, as long as this notice is preserved. + +- ## -W is not all that useful. And it cannot be controlled +- ## with individual -Wno-xxx flags, unlike -Wall +- if test "x$enable_cxx_warnings" = "xyes"; then +- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" +- fi +- fi +- fi +- AC_MSG_RESULT($warnCXXFLAGS) ++# serial 2 + +- AC_ARG_ENABLE(iso-cxx, +- AC_HELP_STRING([--enable-iso-cxx], +- [Try to warn if code is not ISO C++ ]),, +- [enable_iso_cxx=no]) ++# _AM_PROG_TAR(FORMAT) ++# -------------------- ++# Check how to create a tarball in format FORMAT. ++# FORMAT should be one of `v7', `ustar', or `pax'. ++# ++# Substitute a variable $(am__tar) that is a command ++# writing to stdout a FORMAT-tarball containing the directory ++# $tardir. ++# tardir=directory && $(am__tar) > result.tar ++# ++# Substitute a variable $(am__untar) that extract such ++# a tarball read from stdin. ++# $(am__untar) < result.tar ++AC_DEFUN([_AM_PROG_TAR], ++[# Always define AMTAR for backward compatibility. ++AM_MISSING_PROG([AMTAR], [tar]) ++m4_if([$1], [v7], ++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], ++ [m4_case([$1], [ustar],, [pax],, ++ [m4_fatal([Unknown tar format])]) ++AC_MSG_CHECKING([how to create a $1 tar archive]) ++# Loop over all known methods to create a tar archive until one works. ++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' ++_am_tools=${am_cv_prog_tar_$1-$_am_tools} ++# Do not fold the above two line into one, because Tru64 sh and ++# Solaris sh will not grok spaces in the rhs of `-'. ++for _am_tool in $_am_tools ++do ++ case $_am_tool in ++ gnutar) ++ for _am_tar in tar gnutar gtar; ++ do ++ AM_RUN_LOG([$_am_tar --version]) && break ++ done ++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' ++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' ++ am__untar="$_am_tar -xf -" ++ ;; ++ plaintar) ++ # Must skip GNU tar: if it does not support --format= it doesn't create ++ # ustar tarball either. ++ (tar --version) >/dev/null 2>&1 && continue ++ am__tar='tar chf - "$$tardir"' ++ am__tar_='tar chf - "$tardir"' ++ am__untar='tar xf -' ++ ;; ++ pax) ++ am__tar='pax -L -x $1 -w "$$tardir"' ++ am__tar_='pax -L -x $1 -w "$tardir"' ++ am__untar='pax -r' ++ ;; ++ cpio) ++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L' ++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L' ++ am__untar='cpio -i -H $1 -d' ++ ;; ++ none) ++ am__tar=false ++ am__tar_=false ++ am__untar=false ++ ;; ++ esac + +- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) +- complCXXFLAGS= +- if test "x$enable_iso_cxx" != "xno"; then +- if test "x$GXX" = "xyes"; then +- case " $CXXFLAGS " in +- *[\ \ ]-ansi[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; +- esac ++ # If the value was cached, stop now. We just wanted to have am__tar ++ # and am__untar set. ++ test -n "${am_cv_prog_tar_$1}" && break + +- case " $CXXFLAGS " in +- *[\ \ ]-pedantic[\ \ ]*) ;; +- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; +- esac +- fi +- fi +- AC_MSG_RESULT($complCXXFLAGS) ++ # tar/untar a dummy directory, and stop if the command works ++ rm -rf conftest.dir ++ mkdir conftest.dir ++ echo GrepMe > conftest.dir/file ++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) ++ rm -rf conftest.dir ++ if test -s conftest.tar; then ++ AM_RUN_LOG([$am__untar /dev/null 2>&1 && break ++ fi ++done ++rm -rf conftest.dir + +- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" +- AC_SUBST(WARN_CXXFLAGS) +-]) ++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) ++AC_MSG_RESULT([$am_cv_prog_tar_$1])]) ++AC_SUBST([am__tar]) ++AC_SUBST([am__untar]) ++]) # _AM_PROG_TAR + + m4_include([m4/gnome-doc-utils.m4]) + m4_include([m4/intltool.m4]) +Index: gnome-control-center-2.29.91/capplets/about-me/icons/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/about-me/icons/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/about-me/icons/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -85,6 +85,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -219,6 +221,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/about-me/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/about-me/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/about-me/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -63,6 +63,7 @@ + am__DEPENDENCIES_1 = + @BUILD_ABOUTME_TRUE@gnome_about_me_DEPENDENCIES = \ + @BUILD_ABOUTME_TRUE@ $(am__DEPENDENCIES_1) \ ++@BUILD_ABOUTME_TRUE@ $(am__DEPENDENCIES_1) \ + @BUILD_ABOUTME_TRUE@ $(am__DEPENDENCIES_1) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +@@ -167,6 +168,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -301,6 +304,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -390,7 +395,7 @@ + + MARSHALFILES = marshal.c marshal.h + BUILT_SOURCES = $(MARSHALFILES) +-@BUILD_ABOUTME_TRUE@gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBEBOOK_LIBS) ++@BUILD_ABOUTME_TRUE@gnome_about_me_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(UNIQUE_LIBS) $(LIBEBOOK_LIBS) + @BUILD_ABOUTME_TRUE@gnome_about_me_LDFLAGS = -export-dynamic + @BUILD_ABOUTME_TRUE@desktopdir = $(datadir)/applications + @BUILD_ABOUTME_TRUE@desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) +@@ -398,6 +403,7 @@ + @BUILD_ABOUTME_TRUE@ui_DATA = $(ui_files) + @BUILD_ABOUTME_TRUE@INCLUDES = \ + @BUILD_ABOUTME_TRUE@ $(GNOMECC_CAPPLETS_CFLAGS) \ ++@BUILD_ABOUTME_TRUE@ $(UNIQUE_CFLAGS) \ + @BUILD_ABOUTME_TRUE@ $(LIBEBOOK_CFLAGS) \ + @BUILD_ABOUTME_TRUE@ -DDATADIR="\"$(datadir)\"" \ + @BUILD_ABOUTME_TRUE@ -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \ +Index: gnome-control-center-2.29.91/capplets/accessibility/at-properties/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/accessibility/at-properties/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/accessibility/at-properties/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -125,6 +125,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -259,6 +261,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/accessibility/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/accessibility/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/accessibility/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -101,6 +101,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -235,6 +237,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/appearance/data/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/appearance/data/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/appearance/data/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -93,6 +93,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -227,6 +229,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/appearance/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/appearance/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/appearance/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -52,11 +52,12 @@ + am__installdirs = "$(DESTDIR)$(bindir)" + PROGRAMS = $(bin_PROGRAMS) + am_gnome_appearance_properties_OBJECTS = appearance-desktop.$(OBJEXT) \ +- appearance-font.$(OBJEXT) appearance-main.$(OBJEXT) \ +- appearance-themes.$(OBJEXT) appearance-style.$(OBJEXT) \ +- gnome-wp-info.$(OBJEXT) gnome-wp-item.$(OBJEXT) \ +- gnome-wp-xml.$(OBJEXT) theme-installer.$(OBJEXT) \ +- theme-save.$(OBJEXT) theme-util.$(OBJEXT) ++ appearance-effects.$(OBJEXT) appearance-font.$(OBJEXT) \ ++ appearance-main.$(OBJEXT) appearance-themes.$(OBJEXT) \ ++ appearance-style.$(OBJEXT) gnome-wp-info.$(OBJEXT) \ ++ gnome-wp-item.$(OBJEXT) gnome-wp-xml.$(OBJEXT) \ ++ theme-installer.$(OBJEXT) theme-save.$(OBJEXT) \ ++ theme-util.$(OBJEXT) + gnome_appearance_properties_OBJECTS = \ + $(am_gnome_appearance_properties_OBJECTS) + am__DEPENDENCIES_1 = +@@ -145,6 +146,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -279,6 +282,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -354,6 +359,8 @@ + appearance.h \ + appearance-desktop.c \ + appearance-desktop.h \ ++ appearance-effects.c\ ++ appearance-effects.h\ + appearance-font.c \ + appearance-font.h \ + appearance-main.c \ +@@ -485,6 +492,7 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-desktop.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-effects.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-font.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-main.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/appearance-style.Po@am__quote@ +Index: gnome-control-center-2.29.91/capplets/common/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/common/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/common/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -104,6 +104,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -238,6 +240,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/default-applications/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/default-applications/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/default-applications/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -139,6 +139,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -273,6 +275,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/display/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/display/Makefile.in 2010-03-05 16:13:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/display/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -60,7 +60,8 @@ + "$(DESTDIR)$(iconssvgdir)" "$(DESTDIR)$(uidir)" + PROGRAMS = $(bin_PROGRAMS) + am_gnome_display_properties_OBJECTS = xrandr-capplet.$(OBJEXT) \ +- scrollarea.$(OBJEXT) screen-package.$(OBJEXT) foo-marshal.$(OBJEXT) ++ scrollarea.$(OBJEXT) screen-package.$(OBJEXT) \ ++ foo-marshal.$(OBJEXT) + gnome_display_properties_OBJECTS = \ + $(am_gnome_display_properties_OBJECTS) + am__DEPENDENCIES_1 = +@@ -134,6 +135,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -268,6 +271,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -339,6 +344,8 @@ + # This is used in GNOMECC_CAPPLETS_CFLAGS + cappletname = display + uidir = $(pkgdatadir)/ui ++nvidia_settings = /usr/bin/nvidia-settings ++amdcccle = /usr/bin/amdcccle + dist_ui_DATA = display-capplet.ui + gnome_display_properties_SOURCES = \ + xrandr-capplet.c \ +@@ -370,6 +377,8 @@ + INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \ + $(GNOMECC_CAPPLETS_CFLAGS) \ + -DUIDIR="\"$(uidir)\"" \ ++ -DNVIDIA_SETTINGS="\"$(nvidia_settings)\"" \ ++ -DAMDCCCLE="\"$(amdcccle)\"" \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" + +@@ -465,8 +474,8 @@ + -rm -f *.tab.c + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/foo-marshal.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollarea.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/screen-package.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollarea.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrandr-capplet.Po@am__quote@ + + .c.o: +Index: gnome-control-center-2.29.91/capplets/keybindings/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/keybindings/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/keybindings/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -124,6 +124,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -258,6 +260,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/keyboard/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/keyboard/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/keyboard/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -129,6 +129,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -263,6 +265,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/Makefile.in 2010-02-24 15:07:18.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/Makefile.in 2010-03-05 16:13:32.000000000 +0100 +@@ -101,6 +101,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -235,6 +237,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/mouse/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/mouse/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/mouse/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -120,6 +120,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -254,6 +256,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/network/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/network/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/network/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -129,6 +129,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -263,6 +265,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/capplets/windows/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/windows/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/capplets/windows/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -122,6 +122,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -256,6 +258,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -339,7 +343,7 @@ + desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) + 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)"\" +Index: gnome-control-center-2.29.91/config.h.in +=================================================================== +--- gnome-control-center-2.29.91.orig/config.h.in 2010-02-24 15:07:17.000000000 +0100 ++++ gnome-control-center-2.29.91/config.h.in 2010-03-05 16:13:19.000000000 +0100 +@@ -9,6 +9,9 @@ + /* Enable additional debugging at the expense of performance and size */ + #undef GNOME_ENABLE_DEBUG + ++/* Have AppIndicator */ ++#undef HAVE_APP_INDICATOR ++ + /* Define to 1 if you have the `bind_textdomain_codeset' function. */ + #undef HAVE_BIND_TEXTDOMAIN_CODESET + +Index: gnome-control-center-2.29.91/configure +=================================================================== +--- gnome-control-center-2.29.91.orig/configure 2010-02-24 15:07:17.000000000 +0100 ++++ gnome-control-center-2.29.91/configure 2010-03-05 16:13:31.000000000 +0100 +@@ -810,6 +810,8 @@ + GNOME_DESKTOP_CFLAGS + DBUS_LIBS + DBUS_CFLAGS ++UNIQUE_LIBS ++UNIQUE_CFLAGS + GNOMECC_SHELL_LIBS + GNOMECC_SHELL_CFLAGS + GNOMECC_LIBS +@@ -817,6 +819,10 @@ + CAPPLET_LIBS + CAPPLET_CFLAGS + XF86MISC_LIBS ++HAVE_APP_INDICATOR_FALSE ++HAVE_APP_INDICATOR_TRUE ++APP_INDICATOR_LIBS ++APP_INDICATOR_CFLAGS + HAVE_TYPING_BREAK_FALSE + HAVE_TYPING_BREAK_TRUE + HAVE_LIBCANBERRA_GTK_FALSE +@@ -1015,6 +1021,7 @@ + enable_compile_warnings + enable_iso_c + with_x ++enable_appindicator + enable_aboutme + with_gconf_source + with_gconf_schema_file_dir +@@ -1034,12 +1041,16 @@ + XMKMF + LIBCANBERRA_GTK_CFLAGS + LIBCANBERRA_GTK_LIBS ++APP_INDICATOR_CFLAGS ++APP_INDICATOR_LIBS + CAPPLET_CFLAGS + CAPPLET_LIBS + GNOMECC_CFLAGS + GNOMECC_LIBS + GNOMECC_SHELL_CFLAGS + GNOMECC_SHELL_LIBS ++UNIQUE_CFLAGS ++UNIQUE_LIBS + DBUS_CFLAGS + DBUS_LIBS + GNOME_DESKTOP_CFLAGS +@@ -1717,6 +1728,8 @@ + --enable-compile-warnings=[no/minimum/yes/maximum/error] + Turn on compiler warnings + --enable-iso-c Try to warn if code is not ISO C ++ --enable-appindicator=[no/auto/yes] ++ Build support for application indicators + --enable-aboutme enable about-me capplet + --disable-schemas-install + Disable the schemas installation +@@ -1753,6 +1766,10 @@ + C compiler flags for LIBCANBERRA_GTK, overriding pkg-config + LIBCANBERRA_GTK_LIBS + linker flags for LIBCANBERRA_GTK, overriding pkg-config ++ APP_INDICATOR_CFLAGS ++ C compiler flags for APP_INDICATOR, overriding pkg-config ++ APP_INDICATOR_LIBS ++ linker flags for APP_INDICATOR, overriding pkg-config + CAPPLET_CFLAGS + C compiler flags for CAPPLET, overriding pkg-config + CAPPLET_LIBS +@@ -1765,6 +1782,9 @@ + C compiler flags for GNOMECC_SHELL, overriding pkg-config + GNOMECC_SHELL_LIBS + linker flags for GNOMECC_SHELL, overriding pkg-config ++ UNIQUE_CFLAGS ++ C compiler flags for UNIQUE, overriding pkg-config ++ UNIQUE_LIBS linker flags for UNIQUE, overriding pkg-config + DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config + DBUS_LIBS linker flags for DBUS, overriding pkg-config + GNOME_DESKTOP_CFLAGS +@@ -6002,13 +6022,13 @@ + else + lt_cv_nm_interface="BSD nm" + echo "int some_variable = 0;" > conftest.$ac_ext +- (eval echo "\"\$as_me:6005: $ac_compile\"" >&5) ++ (eval echo "\"\$as_me:6025: $ac_compile\"" >&5) + (eval "$ac_compile" 2>conftest.err) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6008: $NM \\\"conftest.$ac_objext\\\"\"" >&5) ++ (eval echo "\"\$as_me:6028: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) + cat conftest.err >&5 +- (eval echo "\"\$as_me:6011: output\"" >&5) ++ (eval echo "\"\$as_me:6031: output\"" >&5) + cat conftest.out >&5 + if $GREP 'External.*some_variable' conftest.out > /dev/null; then + lt_cv_nm_interface="MS dumpbin" +@@ -7213,7 +7233,7 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 7216 "configure"' > conftest.$ac_ext ++ echo '#line 7236 "configure"' > conftest.$ac_ext + if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -8493,11 +8513,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8496: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8516: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8500: \$? = $ac_status" >&5 ++ echo "$as_me:8520: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8832,11 +8852,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8835: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8855: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:8839: \$? = $ac_status" >&5 ++ echo "$as_me:8859: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -8937,11 +8957,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8940: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:8960: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8944: \$? = $ac_status" >&5 ++ echo "$as_me:8964: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -8992,11 +9012,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:8995: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:9015: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:8999: \$? = $ac_status" >&5 ++ echo "$as_me:9019: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -11376,7 +11396,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11379 "configure" ++#line 11399 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -11472,7 +11492,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <<_LT_EOF +-#line 11475 "configure" ++#line 11495 "configure" + #include "confdefs.h" + + #if HAVE_DLFCN_H +@@ -14213,6 +14233,145 @@ + fi + + ++APPINDICATOR_REQUIRED=0.0.7 ++ ++# Check whether --enable-appindicator was given. ++if test "${enable_appindicator+set}" = set; then : ++ enableval=$enable_appindicator; enable_appindicator=$enableval ++else ++ enable_appindicator="auto" ++fi ++ ++ ++if test x$enable_appindicator = xauto ; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ enable_appindicator="yes" ++else ++ enable_appindicator="no" ++fi ++fi ++ ++if test x$enable_appindicator = xyes ; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ : ++else ++ as_fn_error "appindicator-0.1 is not installed" "$LINENO" 5 ++fi ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APP_INDICATOR" >&5 ++$as_echo_n "checking for APP_INDICATOR... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APP_INDICATOR_CFLAGS"; then ++ pkg_cv_APP_INDICATOR_CFLAGS="$APP_INDICATOR_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_APP_INDICATOR_CFLAGS=`$PKG_CONFIG --cflags "appindicator-0.1 >= $APPINDICATOR_REQUIRED" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$APP_INDICATOR_LIBS"; then ++ pkg_cv_APP_INDICATOR_LIBS="$APP_INDICATOR_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"appindicator-0.1 >= \$APPINDICATOR_REQUIRED\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_APP_INDICATOR_LIBS=`$PKG_CONFIG --libs "appindicator-0.1 >= $APPINDICATOR_REQUIRED" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED"` ++ else ++ APP_INDICATOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "appindicator-0.1 >= $APPINDICATOR_REQUIRED"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$APP_INDICATOR_PKG_ERRORS" >&5 ++ ++ as_fn_error "Package requirements (appindicator-0.1 >= $APPINDICATOR_REQUIRED) were not met: ++ ++$APP_INDICATOR_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS ++and APP_INDICATOR_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables APP_INDICATOR_CFLAGS ++and APP_INDICATOR_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." "$LINENO" 5; } ++else ++ APP_INDICATOR_CFLAGS=$pkg_cv_APP_INDICATOR_CFLAGS ++ APP_INDICATOR_LIBS=$pkg_cv_APP_INDICATOR_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++ ++ ++ ++$as_echo "#define HAVE_APP_INDICATOR 1" >>confdefs.h ++ ++fi ++ if test x"$enable_appindicator" = xyes; then ++ HAVE_APP_INDICATOR_TRUE= ++ HAVE_APP_INDICATOR_FALSE='#' ++else ++ HAVE_APP_INDICATOR_TRUE='#' ++ HAVE_APP_INDICATOR_FALSE= ++fi ++ ++ + savecppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + for ac_header in X11/Xlib.h +@@ -14618,6 +14777,96 @@ + fi + + pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIQUE" >&5 ++$as_echo_n "checking for UNIQUE... " >&6; } ++ ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_CFLAGS"; then ++ pkg_cv_UNIQUE_CFLAGS="$UNIQUE_CFLAGS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_UNIQUE_CFLAGS=`$PKG_CONFIG --cflags "unique-1.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++if test -n "$PKG_CONFIG"; then ++ if test -n "$UNIQUE_LIBS"; then ++ pkg_cv_UNIQUE_LIBS="$UNIQUE_LIBS" ++ else ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"unique-1.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "unique-1.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_UNIQUE_LIBS=`$PKG_CONFIG --libs "unique-1.0" 2>/dev/null` ++else ++ pkg_failed=yes ++fi ++ fi ++else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "unique-1.0"` ++ else ++ UNIQUE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "unique-1.0"` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$UNIQUE_PKG_ERRORS" >&5 ++ ++ as_fn_error "Package requirements (unique-1.0) were not met: ++ ++$UNIQUE_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables UNIQUE_CFLAGS ++and UNIQUE_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++" "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables UNIQUE_CFLAGS ++and UNIQUE_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see . ++See \`config.log' for more details." "$LINENO" 5; } ++else ++ UNIQUE_CFLAGS=$pkg_cv_UNIQUE_CFLAGS ++ UNIQUE_LIBS=$pkg_cv_UNIQUE_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ : ++fi ++ ++pkg_failed=no + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5 + $as_echo_n "checking for DBUS... " >&6; } + +@@ -16702,6 +16951,10 @@ + as_fn_error "conditional \"HAVE_TYPING_BREAK\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi ++if test -z "${HAVE_APP_INDICATOR_TRUE}" && test -z "${HAVE_APP_INDICATOR_FALSE}"; then ++ as_fn_error "conditional \"HAVE_APP_INDICATOR\" was never defined. ++Usually this means the macro was only invoked conditionally." "$LINENO" 5 ++fi + if test -z "${HAVE_LIBSLAB_TRUE}" && test -z "${HAVE_LIBSLAB_FALSE}"; then + as_fn_error "conditional \"HAVE_LIBSLAB\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +Index: gnome-control-center-2.29.91/font-viewer/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/font-viewer/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/font-viewer/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -128,6 +128,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -262,6 +264,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/help/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/help/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/help/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -86,6 +86,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -220,6 +222,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/libslab/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/libslab/Makefile.in 2010-02-24 15:07:19.000000000 +0100 ++++ gnome-control-center-2.29.91/libslab/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -137,6 +137,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -271,6 +273,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/libwindow-settings/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/libwindow-settings/Makefile.in 2010-02-24 15:07:20.000000000 +0100 ++++ gnome-control-center-2.29.91/libwindow-settings/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -138,6 +138,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -272,6 +274,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -339,7 +343,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-WM_MODULE_DIR = $(libdir)/window-manager-settings ++WM_MODULE_DIR = $(libdir)/libgnome-window-settings1 + INCLUDES = \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" \ +Index: gnome-control-center-2.29.91/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/Makefile.in 2010-02-24 15:07:20.000000000 +0100 ++++ gnome-control-center-2.29.91/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -143,6 +143,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -277,6 +279,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/shell/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/shell/Makefile.in 2010-02-24 15:07:20.000000000 +0100 ++++ gnome-control-center-2.29.91/shell/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -124,6 +124,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -258,6 +260,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +Index: gnome-control-center-2.29.91/typing-break/Makefile.in +=================================================================== +--- gnome-control-center-2.29.91.orig/typing-break/Makefile.in 2010-02-24 15:07:20.000000000 +0100 ++++ gnome-control-center-2.29.91/typing-break/Makefile.in 2010-03-05 16:13:33.000000000 +0100 +@@ -38,6 +38,8 @@ + bin_PROGRAMS = gnome-typing-monitor$(EXEEXT) + @HAVE_LIBCANBERRA_GTK_TRUE@am__append_1 = -DHAVE_CANBERRA_GTK @LIBCANBERRA_GTK_CFLAGS@ + @HAVE_LIBCANBERRA_GTK_TRUE@am__append_2 = @LIBCANBERRA_GTK_LIBS@ ++@HAVE_APP_INDICATOR_TRUE@am__append_3 = -DHAVE_APP_INDICATOR @APP_INDICATOR_CFLAGS@ ++@HAVE_APP_INDICATOR_TRUE@am__append_4 = @APP_INDICATOR_LIBS@ + subdir = typing-break + DIST_COMMON = $(dist_icon_DATA) $(dist_image_DATA) \ + $(dist_svgicon_DATA) $(srcdir)/Makefile.am \ +@@ -66,7 +68,8 @@ + gnome_typing_monitor-drw-timer.$(OBJEXT) + gnome_typing_monitor_OBJECTS = $(am_gnome_typing_monitor_OBJECTS) + am__DEPENDENCIES_1 = +-gnome_typing_monitor_DEPENDENCIES = $(am__DEPENDENCIES_1) ++gnome_typing_monitor_DEPENDENCIES = $(am__DEPENDENCIES_1) \ ++ $(am__DEPENDENCIES_1) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +@@ -132,6 +135,8 @@ + ALL_LINGUAS = @ALL_LINGUAS@ + AMTAR = @AMTAR@ + AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ ++APP_INDICATOR_CFLAGS = @APP_INDICATOR_CFLAGS@ ++APP_INDICATOR_LIBS = @APP_INDICATOR_LIBS@ + AR = @AR@ + AT_CAPPLET_CFLAGS = @AT_CAPPLET_CFLAGS@ + AT_CAPPLET_LIBS = @AT_CAPPLET_LIBS@ +@@ -266,6 +271,8 @@ + TYPING_BREAK = @TYPING_BREAK@ + TYPING_CFLAGS = @TYPING_CFLAGS@ + TYPING_LIBS = @TYPING_LIBS@ ++UNIQUE_CFLAGS = @UNIQUE_CFLAGS@ ++UNIQUE_LIBS = @UNIQUE_LIBS@ + UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ +@@ -354,9 +361,9 @@ + $(AM_CPPFLAGS) + + gnome_typing_monitor_CFLAGS = @TYPING_CFLAGS@ $(AM_CFLAGS) \ +- $(am__append_1) ++ $(am__append_1) $(am__append_3) + gnome_typing_monitor_LDADD = @TYPING_LIBS@ @SCREENSAVER_LIBS@ \ +- $(am__append_2) ++ $(am__append_2) $(am__append_4) + imagedir = $(pkgdatadir)/pixmaps + dist_image_DATA = bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png + --- gnome-control-center-2.29.91.orig/debian/patches/series +++ gnome-control-center-2.29.91/debian/patches/series @@ -0,0 +1,21 @@ +01_remove_debian_default_applications.patch +02_use_application_indicator.patch +03_use_libunique.patch +100_at_properties_readd_gksudo_disable_grab_toggle.patch +109_screen_resolution_extra.patch +110_screen_resolution_package.patch +111_screen_resolution_vendor_fallback.patch +16_preferred_applications_list_cleanup.patch +25_window_manager_settings.patch +50_ubuntu_systemwide_prefs.patch +51_ubuntu_system_keyboard.patch +80_aspect_in_dropdown.patch +90_gnome-mouse-properties_small_screen.patch +91_gnome-about-me_small_screen.patch +95_desktop-effects-integration.patch +96_hide_accessible_login.patch +97_subpixel_hinting_defaults.patch +#98_password_dialog_launcher.patch +98_about-me-wid-fix.patch +99_ltmain_as-needed.patch +99_autoreconf.patch --- gnome-control-center-2.29.91.orig/debian/patches/02_use_application_indicator.patch +++ gnome-control-center-2.29.91/debian/patches/02_use_application_indicator.patch @@ -0,0 +1,461 @@ +# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=606671 +# Ubuntu: https://bugs.launchpad.net/bugs/497857 +# Description: use the new application indicator +diff --git configure.ac configure.ac +index eb90e68..306f3aa 100644 +--- configure.ac ++++ gnome-control-center-2.29.90/configure.ac +@@ -70,6 +70,31 @@ AM_CONDITIONAL(HAVE_LIBCANBERRA_GTK, test "x$CANBERRA_GTK" = "x1") + + AM_CONDITIONAL(HAVE_TYPING_BREAK, test "x$TYPING_BREAK" = xtyping-break) + ++dnl app indicator ++APPINDICATOR_REQUIRED=0.0.7 ++ ++AC_ARG_ENABLE(appindicator, ++ AS_HELP_STRING([--enable-appindicator[=@<:@no/auto/yes@:>@]],[Build support for application indicators ]), ++ [enable_appindicator=$enableval], ++ [enable_appindicator="auto"]) ++ ++if test x$enable_appindicator = xauto ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED], ++ enable_appindicator="yes", ++ enable_appindicator="no") ++fi ++ ++if test x$enable_appindicator = xyes ; then ++ PKG_CHECK_EXISTS([appindicator-0.1 >= $APPINDICATOR_REQUIRED],, ++ AC_MSG_ERROR([appindicator-0.1 is not installed])) ++ PKG_CHECK_MODULES(APP_INDICATOR, ++ appindicator-0.1 >= $APPINDICATOR_REQUIRED) ++ AC_SUBST(APP_INDICATOR_CFLAGS) ++ AC_SUBST(APP_INDICATOR_LIBS) ++ AC_DEFINE(HAVE_APP_INDICATOR, 1, [Have AppIndicator]) ++fi ++AM_CONDITIONAL(HAVE_APP_INDICATOR, test x"$enable_appindicator" = xyes) ++ + dnl keyboard-properties-capplet + savecppflags=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $X_CFLAGS" +diff --git typing-break/Makefile.am typing-break/Makefile.am +index f1b89bf..c03e604 100644 +--- gnome-control-center-2.29.90/typing-break/Makefile.am ++++ gnome-control-center-2.29.90/typing-break/Makefile.am +@@ -30,6 +30,11 @@ if HAVE_LIBCANBERRA_GTK + gnome_typing_monitor_LDADD += @LIBCANBERRA_GTK_LIBS@ + endif + ++if HAVE_APP_INDICATOR ++ gnome_typing_monitor_CFLAGS += -DHAVE_APP_INDICATOR @APP_INDICATOR_CFLAGS@ ++ gnome_typing_monitor_LDADD += @APP_INDICATOR_LIBS@ ++endif ++ + imagedir = $(pkgdatadir)/pixmaps + dist_image_DATA = bar.png bar-red.png bar-green.png bar-disabled.png ocean-stripes.png + +diff --git typing-break/drwright.c typing-break/drwright.c +index 9c7c2a0..5a4dd9e 100644 +--- gnome-control-center-2.29.90/typing-break/drwright.c ++++ gnome-control-center-2.29.90/typing-break/drwright.c +@@ -29,15 +29,21 @@ + #include + #include + ++#ifdef HAVE_APP_INDICATOR ++#include ++#endif /* HAVE_APP_INDICATOR */ ++ + #include "drwright.h" + #include "drw-break-window.h" + #include "drw-monitor.h" + #include "drw-utils.h" + #include "drw-timer.h" + ++#ifndef HAVE_APP_INDICATOR + #define BLINK_TIMEOUT 200 + #define BLINK_TIMEOUT_MIN 120 + #define BLINK_TIMEOUT_FACTOR 100 ++#endif /* HAVE_APP_INDICATOR */ + + #define POPUP_ITEM_ENABLED 1 + #define POPUP_ITEM_BREAK 2 +@@ -52,6 +58,11 @@ typedef enum { + STATE_BREAK_DONE + } DrwState; + ++#ifdef HAVE_APP_INDICATOR ++#define TYPING_MONITOR_ACTIVE_ICON "bar-green" ++#define TYPING_MONITOR_ATTENTION_ICON "bar-red" ++#endif /* HAVE_APP_INDICATOR */ ++ + struct _DrWright { + /* Widgets. */ + GtkWidget *break_window; +@@ -76,10 +87,15 @@ struct _DrWright { + gboolean enabled; + + guint clock_timeout_id; ++#ifndef HAVE_APP_INDICATOR + guint blink_timeout_id; + + gboolean blink_on; ++#endif /* HAVE_APP_INDICATOR */ + ++#ifdef HAVE_APP_INDICATOR ++ AppIndicator *indicator; ++#else + GtkStatusIcon *icon; + + GdkPixbuf *neutral_bar; +@@ -87,6 +103,7 @@ struct _DrWright { + GdkPixbuf *green_bar; + GdkPixbuf *disabled_bar; + GdkPixbuf *composite_bar; ++#endif /* HAVE_APP_INDICATOR */ + + GtkWidget *warn_dialog; + }; +@@ -94,7 +111,12 @@ struct _DrWright { + static void activity_detected_cb (DrwMonitor *monitor, + DrWright *drwright); + static gboolean maybe_change_state (DrWright *drwright); ++static gint get_time_left (DrWright *drwright); ++#ifdef HAVE_APP_INDICATOR ++static gboolean update_menu_text (DrWright *drwright); ++#else + static gboolean update_tooltip (DrWright *drwright); ++#endif /* HAVE_APP_INDICATOR */ + static void break_window_done_cb (GtkWidget *window, + DrWright *dr); + static void break_window_postpone_cb (GtkWidget *window, +@@ -107,7 +129,11 @@ static void popup_preferences_cb (GtkAction *action, + DrWright *dr); + static void popup_about_cb (GtkAction *action, + DrWright *dr); ++#ifdef HAVE_APP_INDICATOR ++static void init_app_indicator (DrWright *dr); ++#else + static void init_tray_icon (DrWright *dr); ++#endif /* HAVE_APP_INDICATOR */ + static GList * create_secondary_break_windows (void); + + static const GtkActionEntry actions[] = { +@@ -126,6 +152,31 @@ setup_debug_values (DrWright *dr) + dr->break_time = 10; + } + ++#ifdef HAVE_APP_INDICATOR ++static void ++update_app_indicator (DrWright *dr) ++{ ++ AppIndicatorStatus new_status; ++ ++ if (!dr->enabled) { ++ app_indicator_set_status (dr->indicator, ++ APP_INDICATOR_STATUS_PASSIVE); ++ return; ++ } ++ ++ switch (dr->state) { ++ case STATE_WARN: ++ case STATE_BREAK_SETUP: ++ case STATE_BREAK: ++ new_status = APP_INDICATOR_STATUS_ATTENTION; ++ break; ++ default: ++ new_status = APP_INDICATOR_STATUS_ACTIVE; ++ } ++ ++ app_indicator_set_status (dr->indicator, new_status); ++} ++#else + static void + update_icon (DrWright *dr) + { +@@ -264,6 +315,7 @@ stop_blinking (DrWright *dr) + + /*gtk_widget_hide (GTK_WIDGET (dr->icon));*/ + } ++#endif /* HAVE_APP_INDICATOR */ + + static gboolean + grab_keyboard_on_window (GdkWindow *window, +@@ -317,8 +369,10 @@ maybe_change_state (DrWright *dr) + dr->break_window = NULL; + } + ++#ifndef HAVE_APP_INDICATOR + gtk_status_icon_set_from_pixbuf (dr->icon, + dr->neutral_bar); ++#endif /* HAVE_APP_INDICATOR */ + + dr->save_last_time = 0; + +@@ -329,8 +383,12 @@ maybe_change_state (DrWright *dr) + dr->state = STATE_RUNNING; + } + ++#ifdef HAVE_APP_INDICATOR ++ update_menu_text (dr); ++#else + update_tooltip (dr); + stop_blinking (dr); ++#endif /* HAVE_APP_INDICATOR */ + break; + + case STATE_RUNNING: +@@ -342,7 +400,9 @@ maybe_change_state (DrWright *dr) + } else if (dr->state != STATE_WARN + && elapsed_time >= dr->type_time - dr->warn_time) { + dr->state = STATE_WARN; ++#ifndef HAVE_APP_INDICATOR + start_blinking (dr); ++#endif /* HAVE_APP_INDICATOR */ + } + break; + +@@ -355,9 +415,11 @@ maybe_change_state (DrWright *dr) + break; + } + ++#ifndef HAVE_APP_INDICATOR + stop_blinking (dr); + gtk_status_icon_set_from_pixbuf (dr->icon, + dr->red_bar); ++#endif /* HAVE_APP_INDICATOR */ + + drw_timer_start (dr->timer); + +@@ -397,9 +459,11 @@ maybe_change_state (DrWright *dr) + break; + + case STATE_BREAK_DONE_SETUP: ++#ifndef HAVE_APP_INDICATOR + stop_blinking (dr); + gtk_status_icon_set_from_pixbuf (dr->icon, + dr->green_bar); ++#endif /* HAVE_APP_INDICATOR */ + + dr->state = STATE_BREAK_DONE; + break; +@@ -415,15 +479,53 @@ maybe_change_state (DrWright *dr) + + dr->last_elapsed_time = elapsed_time; + ++#ifdef HAVE_APP_INDICATOR ++ update_app_indicator (dr); ++#else + update_icon (dr); ++#endif /* HAVE_APP_INDICATOR */ + + return TRUE; + } + ++#ifdef HAVE_APP_INDICATOR ++static gboolean ++update_menu_text (DrWright *dr) ++{ ++ const gchar normal_msg_template[] = "Take a break now (next in %dm)"; ++ const gchar less_than_one_msg_template[] = "Take a break now (next in less than one minute)"; ++ ++ gint min; ++ gchar *str; ++ GtkWidget *item; ++ ++ if (!dr->enabled) { ++ app_indicator_set_status (dr->indicator, ++ APP_INDICATOR_STATUS_PASSIVE); ++ return TRUE; ++ } ++ ++ min = get_time_left (dr); ++ ++ if (min >= 1) { ++ str = g_strdup_printf (_(normal_msg_template), min); ++ } else { ++ str = g_strdup_printf (_(less_than_one_msg_template)); ++ } ++ ++ /* set menu text */ ++ item = gtk_ui_manager_get_widget(dr->ui_manager, "/Pop/TakeABreak"); ++ gtk_menu_item_set_label (GTK_MENU_ITEM (item), str); ++ ++ g_free (str); ++ ++ return TRUE; ++} ++#else + static gboolean + update_tooltip (DrWright *dr) + { +- gint elapsed_time, min; ++ gint min; + gchar *str; + + if (!dr->enabled) { +@@ -432,9 +534,7 @@ update_tooltip (DrWright *dr) + return TRUE; + } + +- elapsed_time = drw_timer_elapsed (dr->timer); +- +- min = floor (0.5 + (dr->type_time - elapsed_time - dr->save_last_time) / 60.0); ++ min = get_time_left (dr); + + if (min >= 1) { + str = g_strdup_printf (ngettext("%d minute until the next break", +@@ -451,6 +551,17 @@ update_tooltip (DrWright *dr) + + return TRUE; + } ++#endif /* HAVE_APP_INDICATOR */ ++ ++static gint ++get_time_left (DrWright *dr) ++{ ++ gint elapsed_time; ++ ++ elapsed_time = drw_timer_elapsed (dr->timer); ++ ++ return floor (0.5 + (dr->type_time - elapsed_time - dr->save_last_time) / 60.0); ++} + + static void + activity_detected_cb (DrwMonitor *monitor, +@@ -491,7 +602,11 @@ gconf_notify_cb (GConfClient *client, + "/Pop/TakeABreak"); + gtk_widget_set_sensitive (item, dr->enabled); + ++#ifdef HAVE_APP_INDICATOR ++ update_menu_text (dr); ++#else + update_tooltip (dr); ++#endif /* HAVE_APP_INDICATOR */ + } + } + +@@ -557,6 +672,7 @@ popup_about_cb (GtkAction *action, DrWright *dr) + NULL); + } + ++#ifndef HAVE_APP_INDICATOR + static void + popup_menu_cb (GtkWidget *widget, + guint button, +@@ -575,6 +691,7 @@ popup_menu_cb (GtkWidget *widget, + 0, + gtk_get_current_event_time()); + } ++#endif /* HAVE_APP_INDICATOR */ + + static void + break_window_done_cb (GtkWidget *window, +@@ -585,7 +702,11 @@ break_window_done_cb (GtkWidget *window, + dr->state = STATE_BREAK_DONE_SETUP; + dr->break_window = NULL; + ++#ifdef HAVE_APP_INDICATOR ++ update_menu_text (dr); ++#else + update_tooltip (dr); ++#endif /* HAVE_APP_INDICATOR */ + maybe_change_state (dr); + } + +@@ -613,8 +734,13 @@ break_window_postpone_cb (GtkWidget *window, + + drw_timer_start (dr->timer); + maybe_change_state (dr); ++#ifdef HAVE_APP_INDICATOR ++ update_menu_text (dr); ++ update_app_indicator (dr); ++#else + update_icon (dr); + update_tooltip (dr); ++#endif /* HAVE_APP_INDICATOR */ + } + + static void +@@ -631,6 +757,33 @@ break_window_destroy_cb (GtkWidget *window, + dr->secondary_break_windows = NULL; + } + ++#ifdef HAVE_APP_INDICATOR ++static void ++init_app_indicator (DrWright *dr) ++{ ++ GtkWidget *indicator_menu; ++ ++ dr->indicator = ++ app_indicator_new_with_path ("typing-break-indicator", ++ TYPING_MONITOR_ACTIVE_ICON, ++ APP_INDICATOR_CATEGORY_APPLICATION_STATUS, ++ IMAGEDIR); ++ if (dr->enabled) { ++ app_indicator_set_status (dr->indicator, ++ APP_INDICATOR_STATUS_ACTIVE); ++ } else { ++ app_indicator_set_status (dr->indicator, ++ APP_INDICATOR_STATUS_PASSIVE); ++ } ++ ++ indicator_menu = gtk_ui_manager_get_widget (dr->ui_manager, "/Pop"); ++ app_indicator_set_menu (dr->indicator, GTK_MENU (indicator_menu)); ++ app_indicator_set_attention_icon (dr->indicator, TYPING_MONITOR_ATTENTION_ICON); ++ ++ update_menu_text (dr); ++ update_app_indicator (dr); ++} ++#else + static void + init_tray_icon (DrWright *dr) + { +@@ -644,6 +797,7 @@ init_tray_icon (DrWright *dr) + G_CALLBACK (popup_menu_cb), + dr); + } ++#endif /* HAVE_APP_INDICATOR */ + + static GList * + create_secondary_break_windows (void) +@@ -758,6 +912,12 @@ drwright_new (void) + G_CALLBACK (activity_detected_cb), + dr); + ++#ifdef HAVE_APP_INDICATOR ++ init_app_indicator (dr); ++ g_timeout_add_seconds (12, ++ (GSourceFunc) update_menu_text, ++ dr); ++#else + dr->neutral_bar = gdk_pixbuf_new_from_file (IMAGEDIR "/bar.png", NULL); + dr->red_bar = gdk_pixbuf_new_from_file (IMAGEDIR "/bar-red.png", NULL); + dr->green_bar = gdk_pixbuf_new_from_file (IMAGEDIR "/bar-green.png", NULL); +@@ -768,6 +928,7 @@ drwright_new (void) + g_timeout_add_seconds (12, + (GSourceFunc) update_tooltip, + dr); ++#endif /* HAVE_APP_INDICATOR */ + g_timeout_add_seconds (1, + (GSourceFunc) maybe_change_state, + dr); +diff --git typing-break/main.c typing-break/main.c +index 30f5c3e..7dfe980 100644 +--- gnome-control-center-2.29.90/typing-break/main.c ++++ gnome-control-center-2.29.90/typing-break/main.c +@@ -95,6 +95,7 @@ main (int argc, char *argv[]) + return 0; + } + ++#ifndef HAVE_APP_INDICATOR + if (!no_check && !have_tray ()) { + GtkWidget *dialog; + +@@ -112,6 +113,7 @@ main (int argc, char *argv[]) + + gtk_widget_destroy (dialog); + } ++#endif /* HAVE_APP_INDICATOR */ + + drwright = drwright_new (); + --- gnome-control-center-2.29.91.orig/debian/patches/03_use_libunique.patch +++ gnome-control-center-2.29.91/debian/patches/03_use_libunique.patch @@ -0,0 +1,163 @@ +# Description: use libunique so only one instance of the capplet is opened +# Ubuntu: https://bugs.launchpad.net/bugs/531974 +# Upstream: +=== modified file 'gnome-control-center-2.29.91/capplets/about-me/Makefile.am' +--- gnome-control-center-2.29.91/capplets/about-me/Makefile.am 2010-03-03 11:33:36 +0000 ++++ gnome-control-center-2.29.91/capplets/about-me/Makefile.am 2010-03-03 12:07:27 +0000 +@@ -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)\"" \ +=== modified file 'gnome-control-center-2.29.91/capplets/about-me/gnome-about-me.c' +--- gnome-control-center-2.29.91/capplets/about-me/gnome-about-me.c 2010-03-03 11:33:36 +0000 ++++ gnome-control-center-2.29.91/capplets/about-me/gnome-about-me.c 2010-03-03 12:48:10 +0000 +@@ -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 (me); +- return -1; ++ return NULL; + } + + if (gdk_screen_get_default () != NULL && gdk_screen_get_height (gdk_screen_get_default ()) <= 600) { +@@ -966,7 +967,7 @@ + "Evolution Data Server can't handle the protocol")); + g_clear_error (&error); + about_me_destroy (me); +- return -1; ++ return NULL; + } + + g_clear_error (&error); +@@ -1054,27 +1055,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); +- +- rc = about_me_setup_dialog (); +- +- if (rc != -1) { ++ G_TYPE_NONE, G_TYPE_STRING, ++ G_TYPE_BOOLEAN, G_TYPE_INVALID); ++ ++ main_dialog = about_me_setup_dialog (); ++ ++ 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; + } +=== modified file 'gnome-control-center-2.29.91/configure.ac' +--- gnome-control-center-2.29.91/configure.ac 2010-03-03 11:33:36 +0000 ++++ gnome-control-center-2.29.91/configure.ac 2010-03-03 12:07:27 +0000 +@@ -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.29.91.orig/debian/patches/110_screen_resolution_package.patch +++ gnome-control-center-2.29.91/debian/patches/110_screen_resolution_package.patch @@ -0,0 +1,315 @@ +Index: gnome-control-center-2.29.6/capplets/display/Makefile.am +=================================================================== +--- gnome-control-center-2.29.6.orig/capplets/display/Makefile.am 2009-07-16 07:33:13.000000000 -0700 ++++ gnome-control-center-2.29.6/capplets/display/Makefile.am 2010-02-02 16:17:52.000000000 -0800 +@@ -9,8 +9,10 @@ + gnome_display_properties_SOURCES = \ + xrandr-capplet.c \ + scrollarea.c \ ++ screen-package.c \ + foo-marshal.c \ + scrollarea.h \ ++ screen-package.h \ + foo-marshal.h + + gnome_display_properties_LDFLAGS = -export-dynamic +Index: gnome-control-center-2.29.6/capplets/display/Makefile.in +=================================================================== +--- gnome-control-center-2.29.6.orig/capplets/display/Makefile.in 2010-01-26 00:51:46.000000000 -0800 ++++ gnome-control-center-2.29.6/capplets/display/Makefile.in 2010-02-02 16:17:52.000000000 -0800 +@@ -60,7 +60,7 @@ + "$(DESTDIR)$(iconssvgdir)" "$(DESTDIR)$(uidir)" + PROGRAMS = $(bin_PROGRAMS) + am_gnome_display_properties_OBJECTS = xrandr-capplet.$(OBJEXT) \ +- scrollarea.$(OBJEXT) foo-marshal.$(OBJEXT) ++ scrollarea.$(OBJEXT) screen-package.$(OBJEXT) foo-marshal.$(OBJEXT) + gnome_display_properties_OBJECTS = \ + $(am_gnome_display_properties_OBJECTS) + am__DEPENDENCIES_1 = +@@ -343,8 +343,10 @@ + gnome_display_properties_SOURCES = \ + xrandr-capplet.c \ + scrollarea.c \ ++ screen-package.c \ + foo-marshal.c \ + scrollarea.h \ ++ screen-package.h \ + foo-marshal.h + + gnome_display_properties_LDFLAGS = -export-dynamic +@@ -464,6 +466,7 @@ + + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/foo-marshal.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scrollarea.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/screen-package.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xrandr-capplet.Po@am__quote@ + + .c.o: +Index: gnome-control-center-2.29.6/capplets/display/screen-package.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-control-center-2.29.6/capplets/display/screen-package.c 2010-02-02 16:18:00.000000000 -0800 +@@ -0,0 +1,219 @@ ++/* ++ * screen-package.c ++ * ++ * Copyright (C) 2004 Vincent Untz ++ * Copyright (C) 2008 Alberto Milone ++ * ++ * 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 program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ * ++ * Authors: Carlos Garnacho Parro ++ * Authors: Vincent Untz ++ * Authors: Guillaume Desmottes ++ * ++ */ ++ ++ ++#ifdef HAVE_CONFIG_H ++# include ++#endif ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "screen-package.h" ++ ++static void ++show_error_dialog (GtkWindow *window, ++ const gchar *secondary_text) ++{ ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new (window, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_CLOSE, ++ "%s", ++ _("Could not install package")); ++ ++ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", secondary_text); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++} ++ ++static gboolean ++find_app (GtkWindow *window, ++ const gchar *app) ++{ ++ gchar *path; ++ ++ path = g_find_program_in_path (app); ++ ++ if (!path) ++ { ++ show_error_dialog (window, ++ _("The necessary applications to install" ++ " the package could not be found.")); ++ return FALSE; ++ } ++ ++ g_free (path); ++ ++ return TRUE; ++} ++ ++static gchar * ++create_temp_file (const gchar *packages[]) ++{ ++ int fd; ++ gchar *path, *str; ++ ++ path = g_strdup_printf ("/tmp/packages.XXXXXX"); ++ fd = mkstemp (path); ++ ++ while (*packages) ++ { ++ str = g_strdup_printf ("%s\ti\n", *packages); ++ write (fd, str, strlen (str)); ++ g_free (str); ++ packages++; ++ } ++ ++ close (fd); ++ return path; ++} ++ ++static gchar* ++get_synaptic_command_line (GtkWindow *window, ++ const gchar *path) ++{ ++ gchar *synaptic_path, *command; ++ ++ synaptic_path = g_find_program_in_path ("synaptic"); ++ command = g_strdup_printf ("%s --hide-main-window --non-interactive " ++ "--set-selections-file %s --parent-window-id %d", ++ synaptic_path, path, GDK_WINDOW_XID (GTK_WIDGET (window)->window)); ++ g_free (synaptic_path); ++ return command; ++} ++ ++static gboolean ++spawn_synaptic (GtkWindow *window, ++ const gchar *path, ++ gint *child_pid) ++{ ++ gchar **argv; ++ GError *error = NULL; ++ gboolean retval = TRUE; ++ gint i = 0; ++ ++ argv = g_new0 (gchar*, 6); ++ argv[i++] = g_find_program_in_path ("gksudo"); ++ argv[i++] = g_strdup ("--desktop"); ++ argv[i++] = g_strdup ("/usr/share/applications/synaptic.desktop"); ++ argv[i++] = g_strdup ("--disable-grab"); ++ argv[i++] = get_synaptic_command_line (window, path); ++ argv[i++] = NULL; ++ ++ if (!gdk_spawn_on_screen (gtk_window_get_screen (window), ++ NULL, argv, NULL, ++ G_SPAWN_SEARCH_PATH | G_SPAWN_DO_NOT_REAP_CHILD, ++ NULL, NULL, child_pid, &error)) ++ { ++ show_error_dialog (window, (error) ? error->message : ""); ++ g_error_free (error); ++ retval = FALSE; ++ } ++ ++ g_strfreev (argv); ++ ++ return retval; ++} ++ ++static gboolean ++on_wait_timeout (gpointer data) ++{ ++ gint pid, status; ++ ++ pid = GPOINTER_TO_INT (data); ++ ++ if (waitpid (pid, &status, WNOHANG) > 0) ++ { ++ /* FIXME: should show an error dialog if the installation fails, ++ * but funnily I'm getting always an exit status 0 here... maybe gksudo fault? */ ++ gtk_main_quit (); ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gboolean ++wait_for_synaptic (GtkWindow *window, gint pid) ++{ ++ GdkCursor *cursor; ++ gint timer; ++ ++ cursor = gdk_cursor_new (GDK_WATCH); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, cursor); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), FALSE); ++ ++ /* wait here a bit until the process has exited */ ++ timer = g_timeout_add (500, on_wait_timeout, GINT_TO_POINTER (pid)); ++ gtk_main (); ++ ++ g_source_remove (timer); ++ gtk_widget_set_sensitive (GTK_WIDGET (window), TRUE); ++ gdk_window_set_cursor (GTK_WIDGET (window)->window, NULL); ++ ++ gdk_cursor_unref (cursor); ++ ++ /* keep this until we can get status ++ * info from the launched process */ ++ return TRUE; ++} ++ ++gboolean ++ubuntu_packages_install (GtkWindow *window, ++ const gchar *packages[]) ++{ ++ gchar *path; ++ pid_t pid; ++ gboolean retval = FALSE; ++ ++ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); ++ ++ if (!find_app (window, "synaptic") || !find_app (window, "gksudo")) ++ return FALSE; ++ ++ path = create_temp_file (packages); ++ ++ if (spawn_synaptic (window, path, &pid)) ++ retval = wait_for_synaptic (window, pid); ++ ++ unlink (path); ++ g_free (path); ++ ++ return retval; ++} ++ +Index: gnome-control-center-2.29.6/capplets/display/screen-package.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-control-center-2.29.6/capplets/display/screen-package.h 2010-02-02 16:17:52.000000000 -0800 +@@ -0,0 +1,39 @@ ++/* ++ * screen-package.h ++ * ++ * Copyright (C) 2004 Vincent Untz ++ * Copyright 2008 Alberto Milone ++ * ++ * 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 program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ * MA 02110-1301, USA. ++ * ++ * Authors: Carlos Garnacho Parro ++ * Authors: Vincent Untz ++ * Authors: Guillaume Desmottes ++ * ++ */ ++ ++#ifndef __SCREEN_PACKAGES_H__ ++#define __SCREEN_PACKAGES_H__ ++ ++#include ++ ++G_BEGIN_DECLS ++ ++gboolean ubuntu_packages_install (GtkWindow *window, const char **packages); ++ ++G_END_DECLS ++ ++#endif /* __SCREEN_PACKAGES_H__ */ --- gnome-control-center-2.29.91.orig/debian/patches/111_screen_resolution_vendor_fallback.patch +++ gnome-control-center-2.29.91/debian/patches/111_screen_resolution_vendor_fallback.patch @@ -0,0 +1,162 @@ +# +# Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/gnome-control-center/+bug/319725 +# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=571214 +# Patch: http://bugzilla.gnome.org/attachment.cgi?id=128398&action=view +# Description: If vendor utilities are found *and* this driver doesn't support RR1.2, +# offer fallback to those vendor utilities instead. +# This helps to alleviate possible crashes from unsupported features in RR1.0 +# drivers. +# +Index: gnome-control-center-2.29.91/capplets/display/display-capplet.ui +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/display/display-capplet.ui 2010-02-18 19:07:46.000000000 +0000 ++++ gnome-control-center-2.29.91/capplets/display/display-capplet.ui 2010-03-01 08:38:40.230385752 +0000 +@@ -398,6 +398,34 @@ + button2 + + ++ ++ 5 ++ False ++ GTK_WIN_POS_CENTER_ON_PARENT ++ GDK_WINDOW_TYPE_HINT_DIALOG ++ True ++ False ++ GTK_MESSAGE_QUESTION ++ GTK_BUTTONS_YES_NO ++ It appears that your graphics driver does not support the necessary extensions to use this tool. Do you want to use your graphics driver vendor's tool instead? ++ ++ ++ ++ True ++ 2 ++ ++ ++ True ++ GTK_BUTTONBOX_END ++ ++ ++ False ++ GTK_PACK_END ++ ++ ++ ++ ++ + + + +Index: gnome-control-center-2.29.91/capplets/display/Makefile.am +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/display/Makefile.am 2010-03-01 08:38:38.170386504 +0000 ++++ gnome-control-center-2.29.91/capplets/display/Makefile.am 2010-03-01 08:38:40.230385752 +0000 +@@ -2,6 +2,9 @@ + cappletname = display + + uidir = $(pkgdatadir)/ui ++nvidia_settings = /usr/bin/nvidia-settings ++amdcccle = /usr/bin/amdcccle ++ + dist_ui_DATA = display-capplet.ui + + bin_PROGRAMS = gnome-display-properties +@@ -40,6 +43,8 @@ + INCLUDES = $(DISPLAY_CAPPLET_CFLAGS) \ + $(GNOMECC_CAPPLETS_CFLAGS) \ + -DUIDIR="\"$(uidir)\"" \ ++ -DNVIDIA_SETTINGS="\"$(nvidia_settings)\"" \ ++ -DAMDCCCLE="\"$(amdcccle)\"" \ + -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \ + -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" + +Index: gnome-control-center-2.29.91/capplets/display/xrandr-capplet.c +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/display/xrandr-capplet.c 2010-03-01 08:38:29.712886181 +0000 ++++ gnome-control-center-2.29.91/capplets/display/xrandr-capplet.c 2010-03-01 08:38:40.230385752 +0000 +@@ -469,7 +469,6 @@ + return count; + } + +-#if 0 + static int + count_all_outputs (GnomeRRConfig *config) + { +@@ -480,7 +479,6 @@ + + return i; + } +-#endif + + /* Computes whether "Mirror Screens" (clone mode) is supported based on these criteria: + * +@@ -2208,7 +2206,6 @@ + } + } + +-#if 0 + /* Returns whether the graphics driver doesn't advertise RANDR 1.2 features, and just 1.0 */ + static gboolean + driver_is_randr_10 (GnomeRRConfig *config) +@@ -2229,7 +2226,6 @@ + + return (count_all_outputs (config) == 1 && strcmp (config->outputs[0]->name, "default") == 0); + } +-#endif + + static void + on_detect_displays (GtkWidget *widget, gpointer data) +@@ -2439,6 +2435,8 @@ + GtkBuilder *builder; + GtkWidget *align; + GError *error; ++ GtkWidget *active_dialog; ++ gchar* command=NULL; + + error = NULL; + builder = gtk_builder_new (); +@@ -2547,12 +2545,25 @@ + g_signal_connect (app->apply_button, "clicked", + G_CALLBACK (apply_button_clicked_cb), app); + ++ active_dialog=app->dialog; + on_screen_changed (app->screen, app); + ++ if (driver_is_randr_10(app->current_configuration)) ++ { ++ if (g_file_test(NVIDIA_SETTINGS,G_FILE_TEST_IS_EXECUTABLE)) ++ command=NVIDIA_SETTINGS; ++ else if (g_file_test(AMDCCCLE,G_FILE_TEST_IS_EXECUTABLE)) ++ command=AMDCCCLE; ++ if (command != NULL) ++ { ++ active_dialog = _gtk_builder_get_widget (builder, "legacy_question"); ++ } ++ } ++ + g_object_unref (builder); + + restart: +- switch (gtk_dialog_run (GTK_DIALOG (app->dialog))) ++ switch (gtk_dialog_run (GTK_DIALOG (active_dialog))) + { + default: + /* Fall Through */ +@@ -2574,6 +2585,18 @@ + apply (app); + goto restart; + break; ++ ++ /* Legacy dialog question posed, but user wants this tool */ ++ case GTK_RESPONSE_NO: ++ gtk_widget_destroy(active_dialog); ++ active_dialog=app->dialog; ++ goto restart; ++ break; ++ ++ /* Legacy dialog question posed, user wants vendor tool */ ++ case GTK_RESPONSE_YES: ++ g_spawn_command_line_async (command, NULL); ++ break; + } + + gtk_widget_destroy (app->dialog); --- gnome-control-center-2.29.91.orig/debian/patches/97_subpixel_hinting_defaults.patch +++ gnome-control-center-2.29.91/debian/patches/97_subpixel_hinting_defaults.patch @@ -0,0 +1,13 @@ +Index: gnome-control-center-2.28.1/capplets/appearance/appearance-font.c +=================================================================== +--- gnome-control-center-2.28.1.orig/capplets/appearance/appearance-font.c 2009-12-10 13:11:37.101719614 +1100 ++++ gnome-control-center-2.28.1/capplets/appearance/appearance-font.c 2009-12-10 13:12:14.461719769 +1100 +@@ -958,7 +958,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.29.91.orig/debian/patches/50_ubuntu_systemwide_prefs.patch +++ gnome-control-center-2.29.91/debian/patches/50_ubuntu_systemwide_prefs.patch @@ -0,0 +1,280 @@ +=== modified file 'capplets/network/gnome-network-preferences.c' +Index: gnome-control-center-2.29.4/capplets/network/gnome-network-properties.c +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/network/gnome-network-properties.c 2009-12-23 22:30:02.000000000 +0000 ++++ gnome-control-center-2.29.4/capplets/network/gnome-network-properties.c 2010-01-11 01:59:32.000000000 +0000 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "capplet-util.h" + #include "gconf-property-editor.h" +@@ -191,6 +192,210 @@ + } + } + ++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", 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", dbus_g_error_get_name(error), error->message); ++} ++ ++static void ++cb_make_system_default (GtkButton *button, gpointer data) ++{ ++ DBusGConnection *systembus, *sessionbus; ++ GError *error = NULL; ++ DBusGProxy *dbus_proxy; ++ GConfClient *client; ++ gchar *http_proxy, *proxy_str, *ftp_proxy, *https_proxy; ++ gint http_port, ftp_port, https_port; ++ gboolean use_proxy; ++ gboolean res; ++ ++ g_print ("cb_make_system_default\n"); ++ ++ // do ride the dbus ++ 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 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 void + cb_dialog_response (GtkDialog *dialog, gint response_id) + { +@@ -1355,6 +1560,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.29.4/capplets/network/gnome-network-properties.ui +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/network/gnome-network-properties.ui 2009-08-18 06:59:34.000000000 +0100 ++++ gnome-control-center-2.29.4/capplets/network/gnome-network-properties.ui 2010-01-11 01:59:32.000000000 +0000 +@@ -491,6 +491,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.29.91.orig/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch +++ gnome-control-center-2.29.91/debian/patches/100_at_properties_readd_gksudo_disable_grab_toggle.patch @@ -0,0 +1,116 @@ +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); + --- gnome-control-center-2.29.91.orig/debian/patches/99_ltmain_as-needed.patch +++ gnome-control-center-2.29.91/debian/patches/99_ltmain_as-needed.patch @@ -0,0 +1,32 @@ +Index: gnome-control-center-2.29.90/ltmain.sh +=================================================================== +--- gnome-control-center-2.29.90.orig/ltmain.sh 2010-02-10 01:29:29.010098529 +0000 ++++ gnome-control-center-2.29.90/ltmain.sh 2010-02-10 01:29:58.140119661 +0000 +@@ -4716,6 +4716,11 @@ + arg=$func_stripname_result + ;; + ++ -Wl,--as-needed) ++ deplibs="$deplibs $arg" ++ continue ++ ;; ++ + -Wl,*) + func_stripname '-Wl,' '' "$arg" + args=$func_stripname_result +@@ -5070,6 +5075,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.29.91.orig/debian/patches/51_ubuntu_system_keyboard.patch +++ gnome-control-center-2.29.91/debian/patches/51_ubuntu_system_keyboard.patch @@ -0,0 +1,198 @@ +Index: gnome-control-center-2.29.4/capplets/keyboard/gnome-keyboard-properties-dialog.ui +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/keyboard/gnome-keyboard-properties-dialog.ui 2009-12-04 17:11:07.000000000 +0000 ++++ gnome-control-center-2.29.4/capplets/keyboard/gnome-keyboard-properties-dialog.ui 2010-01-11 02:00:09.000000000 +0000 +@@ -720,6 +720,26 @@ + 6 + end + ++ ++ True ++ True ++ True ++ ++ ++ True ++ 4 ++ 4 ++ ++ ++ True ++ Apply System-Wide... ++ ++ ++ ++ ++ ++ ++ + + _Options... + True +Index: gnome-control-center-2.29.4/capplets/keyboard/gnome-keyboard-properties-xkb.c +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/keyboard/gnome-keyboard-properties-xkb.c 2009-12-04 17:11:07.000000000 +0000 ++++ gnome-control-center-2.29.4/capplets/keyboard/gnome-keyboard-properties-xkb.c 2010-01-11 02:00:09.000000000 +0000 +@@ -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.29.91.orig/debian/patches/98_about-me-wid-fix.patch +++ gnome-control-center-2.29.91/debian/patches/98_about-me-wid-fix.patch @@ -0,0 +1,20 @@ +Description: The name returned from gtk_widget_get_name isn't the same + as the widget ID in the GtkBuilder UI file, so don't rely on this + to identify widgets by ID +Author: Chris Coulson +Forwarded: no +Bug-Ubuntu: https://bugs.launchpad.net/bugs/525520 +Bug: https://bugzilla.gnome.org/show_bug.cgi?id=611463 +Index: gnome-control-center-2.29.91/capplets/about-me/gnome-about-me.c +=================================================================== +--- gnome-control-center-2.29.91.orig/capplets/about-me/gnome-about-me.c 2010-03-02 01:00:25.097134732 +0000 ++++ gnome-control-center-2.29.91/capplets/about-me/gnome-about-me.c 2010-03-02 01:01:40.704622280 +0000 +@@ -279,7 +279,7 @@ + if (me == NULL) + return FALSE; + +- wid = gtk_widget_get_name (widget); ++ wid = gtk_buildable_get_name (GTK_BUILDABLE (widget)); + + if (wid == NULL) + return FALSE; --- gnome-control-center-2.29.91.orig/debian/patches/98_password_dialog_launcher.patch +++ gnome-control-center-2.29.91/debian/patches/98_password_dialog_launcher.patch @@ -0,0 +1,22 @@ +Description: there needs to be a UI for changing the current user's password, + that can be launched externally. Currently, this is the best work-around + available. +Ubuntu: https://launchpad.net/bugs/307019 + +Index: gnome-control-center-2.29.4/capplets/about-me/gnome-about-me.c +=================================================================== +--- gnome-control-center-2.29.4.orig/capplets/about-me/gnome-about-me.c 2010-01-11 02:16:27.000000000 +0000 ++++ gnome-control-center-2.29.4/capplets/about-me/gnome-about-me.c 2010-01-11 02:18:34.000000000 +0000 +@@ -1073,6 +1073,12 @@ + rc = about_me_setup_dialog (); + + if (rc != -1) { ++ if (argc > 1 && strcmp(argv[1],"--password")==0) { ++ GtkBuilder *dialog = me->dialog; ++ gtk_widget_hide_all ( WID ("about-me-dialog") ); ++ about_me_passwd_clicked_cb (NULL, me); ++ return rc; ++ } + gtk_main (); + } + --- gnome-control-center-2.29.91.orig/debian/patches/95_desktop-effects-integration.patch +++ gnome-control-center-2.29.91/debian/patches/95_desktop-effects-integration.patch @@ -0,0 +1,1585 @@ +Index: gnome-control-center-2.29.90/capplets/appearance/appearance-effects.c +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-control-center-2.29.90/capplets/appearance/appearance-effects.c 2010-02-23 02:45:24.082445648 +0000 +@@ -0,0 +1,1089 @@ ++/* ++ * Copyright (C) 2007 Canonical ++ * Written by Michael Vogt ++ * and Mirco Müller ++ * All Rights Reserved ++ * ++ * Based on desktop-effects.c: ++ * Desktop Effects. A preference panel for compiz. ++ * Copyright (C) 2006 Red Hat, Inc. ++ * Author: Soren Sandmann (sandmann@redhat.com) * ++ * ++ * 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 program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "appearance.h" ++#include "appearance-effects.h" ++ ++#include "gconf-property-editor.h" ++ ++typedef enum { ++ COMPIZ, ++ METACITY ++} WindowManager; ++ ++#define WINDOW_MANAGER_KEY "/desktop/gnome/session/required_components/windowmanager" ++#define REVERT_COUNT 40 ++#define SECONDS_WE_WILL_WAIT_FOR_COMPIZ_TO_START 8 ++#define PLUGIN_LIST_KEY "/apps/compiz/general/allscreens/options/active_plugins" ++#define NUM_WORKSPACES "/apps/metacity/general/num_workspaces" ++ ++/* helper structure to pass pager data around */ ++typedef struct _TraversalChunk { ++ GConfClient *client; ++ GArray *numRowsArray; ++ gint rows; ++} TraversalChunk; ++ ++/* possible effects level */ ++enum { ++ NO_EFFECTS, ++ NORMAL_EFFECTS, ++ EXTRA_EFFECTS, ++ CUSTOM_EFFECTS ++}; ++ ++/* radio-button names in ui-file */ ++static const char *effect_choices[] = { ++ "no_effects_button", ++ "normal_effects_button", ++ "extra_effects_button", ++ "custom_effects_button" ++}; ++ ++/* plugin-set for extra-effects level */ ++static const gchar* extra_effects[] = { ++ "shift", ++ "wobbly", ++ NULL ++}; ++ ++static gboolean ++check_graphics_driver (void) ++{ ++ return system ("jockey-gtk --check-composite") == 0; ++} ++ ++static gboolean ++check_simple_ccsm (void) ++{ ++ return g_file_test ("/usr/bin/simple-ccsm", G_FILE_TEST_IS_EXECUTABLE); ++} ++ ++static void ++run_simple_ccsm (GtkButton *widget, ++ gpointer data) ++{ ++ g_spawn_command_line_async ("/usr/bin/simple-ccsm", NULL); ++} ++ ++static GSList * ++get_plugins (AppearanceData *app, ++ GError **err) ++{ ++ return gconf_client_get_list (app->client, ++ PLUGIN_LIST_KEY, ++ GCONF_VALUE_STRING, ++ err); ++} ++ ++static gboolean ++contains_string (GSList *plugins, ++ const gchar *needle) ++{ ++ GSList *slist; ++ ++ for (slist = plugins; slist != NULL; slist = slist->next) ++ { ++ const char *s = slist->data; ++ ++ if (s && strcmp (s, needle) == 0) ++ return TRUE; ++ } ++ ++ return FALSE; ++} ++ ++ ++static void ++show_info (const char *text) ++{ ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_INFO, ++ GTK_BUTTONS_OK, ++ "%s", ++ text); ++ ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++} ++ ++static gchar* ++get_string_value (GConfClient* client, ++ const gchar* key) ++{ ++ gchar *value = NULL; ++ GError *error = NULL; ++ ++ g_assert (client != NULL); ++ g_assert (key != NULL); ++ ++ value = gconf_client_get_string (client, key, &error); ++ if (error) ++ return NULL; ++ ++ return value; ++} ++ ++static gint ++get_int_value (GConfClient* client, ++ const gchar* key) ++{ ++ gint value = 0; ++ GError* error = NULL; ++ ++ g_assert (client != NULL); ++ g_assert (key != NULL); ++ ++ value = gconf_client_get_int (client, key, &error); ++ if (error) ++ return 0; ++ ++ return value; ++} ++ ++static void ++check_for_wnck_entry (gpointer data, ++ gpointer user_data) ++{ ++ gchar *appletId = (gchar*) data; ++ TraversalChunk *chunk = (TraversalChunk*) user_data; ++ GString *propertyPath = NULL; ++ gchar *value = NULL; ++ gint rows = 0; ++ gint position = 0; ++ ++ /* get bonobo-id of applet */ ++ propertyPath = g_string_new ("/apps/panel/applets/"); ++ propertyPath = g_string_append (propertyPath, appletId); ++ propertyPath = g_string_append (propertyPath, "/bonobo_iid"); ++ value = get_string_value (chunk->client, propertyPath->str); ++ ++ /* just exit if no bonobo-id was found */ ++ if (!value) ++ { ++ g_string_free (propertyPath, TRUE); ++ return; ++ } ++ ++ /* test if it is actually a switcher */ ++ if (!g_ascii_strncasecmp (value, ++ "OAFIID:GNOME_WorkspaceSwitcherApplet", ++ 36)) ++ { ++ /* assemble new gconf-path for num_rows gconf-key */ ++ g_string_free (propertyPath, TRUE); ++ propertyPath = g_string_new ("/apps/panel/applets/"); ++ propertyPath = g_string_append (propertyPath, appletId); ++ propertyPath = g_string_append (propertyPath, "/position"); ++ ++ /* get the value of position */ ++ position = get_int_value (chunk->client, propertyPath->str); ++ ++ if (position > 1) ++ { ++ /* assemble new gconf-path for num_rows gconf-key */ ++ g_string_free (propertyPath, TRUE); ++ propertyPath = g_string_new ("/apps/panel/applets/"); ++ propertyPath = g_string_append (propertyPath, appletId); ++ propertyPath = g_string_append (propertyPath, ++ "/prefs/num_rows"); ++ ++ /* get the value of rows */ ++ rows = get_int_value (chunk->client, propertyPath->str); ++ ++ if (!chunk->numRowsArray) ++ chunk->numRowsArray = g_array_new (TRUE, ++ TRUE, ++ sizeof (gint)); ++ ++ g_array_append_val (chunk->numRowsArray, rows); ++ } ++ } ++ ++ g_string_free (propertyPath, TRUE); ++} ++ ++gboolean ++set_int_value (GConfClient *client, ++ const gchar *key, ++ gint value) ++{ ++ gboolean result = FALSE; ++ GError *error = NULL; ++ ++ g_assert (client != NULL); ++ g_assert (key != NULL); ++ ++ result = gconf_client_set_int (client, ++ key, ++ value, ++ &error); ++ ++ if (error) ++ return FALSE; ++ ++ return result; ++} ++ ++static void ++set_wnck_entry (gpointer data, ++ gpointer user_data) ++{ ++ gchar *appletId = (gchar*) data; ++ TraversalChunk *chunk = (TraversalChunk*) user_data; ++ GString *propertyPath = NULL; ++ gchar *value = NULL; ++ gint position = 0; ++ ++ /* get bonobo-id of applet */ ++ propertyPath = g_string_new ("/apps/panel/applets/"); ++ propertyPath = g_string_append (propertyPath, appletId); ++ propertyPath = g_string_append (propertyPath, "/bonobo_iid"); ++ value = get_string_value (chunk->client, propertyPath->str); ++ ++ /* just exit if no bonobo-id was found */ ++ if (!value) ++ { ++ g_string_free (propertyPath, TRUE); ++ return; ++ } ++ ++ /* test if it is actually a switcher */ ++ if (!g_ascii_strncasecmp (value, ++ "OAFIID:GNOME_WorkspaceSwitcherApplet", ++ 36)) ++ { ++ /* assemble new gconf-path for applets position gconf-key */ ++ g_string_free (propertyPath, TRUE); ++ propertyPath = g_string_new ("/apps/panel/applets/"); ++ propertyPath = g_string_append (propertyPath, appletId); ++ propertyPath = g_string_append (propertyPath, "/position"); ++ ++ /* get the value of position */ ++ position = get_int_value (chunk->client, propertyPath->str); ++ ++ /* not the best way to test, if this applet is really active */ ++ if (position > 1) ++ { ++ /* assemble new gconf-path for num_rows gconf-key */ ++ g_string_free (propertyPath, TRUE); ++ propertyPath = g_string_new ("/apps/panel/applets/"); ++ propertyPath = g_string_append (propertyPath, appletId); ++ propertyPath = g_string_append (propertyPath, ++ "/prefs/num_rows"); ++ ++ /* set the value of rows */ ++ set_int_value (chunk->client, ++ propertyPath->str, ++ chunk->rows); ++ } ++ } ++ ++ /* cleanup */ ++ g_string_free (propertyPath, TRUE); ++} ++ ++static gint ++get_pager_num_rows (GConfClient *client) ++{ ++ GSList *idList = NULL; ++ TraversalChunk *chunk = NULL; ++ gint rows = 0; ++ ++ /* get ids of all used applets */ ++ idList = gconf_client_get_list (client, ++ "/apps/panel/general/applet_id_list", ++ GCONF_VALUE_STRING, ++ NULL); ++ ++ if (!idList) ++ return 1; ++ ++ /* create and initialize helper-structure */ ++ chunk = g_new0 (TraversalChunk, 1); ++ if (!chunk) ++ { ++ g_slist_free (idList); ++ return 1; ++ } ++ ++ chunk->client = client; ++ ++ /* search list of applets for wnck-applet */ ++ g_slist_foreach (idList, ++ check_for_wnck_entry, ++ (gpointer) chunk); ++ ++ if (chunk->numRowsArray == NULL) ++ rows = 1; ++ else ++ rows = g_array_index (chunk->numRowsArray, gint, 0); ++ ++ /* clean up */ ++ g_slist_free (idList); ++ if (chunk->numRowsArray) ++ g_array_free (chunk->numRowsArray, TRUE); ++ g_free (chunk); ++ ++ return rows; ++} ++ ++/* sets the number of rows of the first pager-applet found */ ++void static ++set_pager_num_rows (GConfClient *client, ++ gint rows) ++{ ++ GSList *idList = NULL; ++ TraversalChunk *chunk = NULL; ++ ++ /* get ids of all used applets */ ++ idList = gconf_client_get_list (client, ++ "/apps/panel/general/applet_id_list", ++ GCONF_VALUE_STRING, ++ NULL); ++ ++ /* if nothing is found at least return 1 to avoid a div. by 0 later */ ++ if (!idList) ++ return; ++ ++ /* create and initialize helper-structure */ ++ chunk = g_new0 (TraversalChunk, 1); ++ if (!chunk) ++ { ++ g_slist_free (idList); ++ return; ++ } ++ ++ chunk->client = client; ++ chunk->rows = rows; ++ ++ /* search list of applets for wnck-applet */ ++ g_slist_foreach (idList, ++ set_wnck_entry, ++ (gpointer) chunk); ++ ++ /* clean up */ ++ g_slist_free (idList); ++ if (chunk->numRowsArray) ++ g_array_free (chunk->numRowsArray, TRUE); ++ g_free (chunk); ++} ++ ++static void ++apply_settings (AppearanceData *app, ++ gboolean effects_enabled) ++{ ++ const char *str = effects_enabled? "compiz" : "metacity"; ++ char *session_file; ++ gint vsize; ++ gint hsize; ++ gint workspaces; ++ gint rows; ++ ++ gconf_client_set_string (app->client, ++ WINDOW_MANAGER_KEY, ++ str, ++ NULL); ++ ++ session_file = g_build_filename (g_get_home_dir (), ++ ".gnome2", ++ "session", ++ NULL); ++ ++ g_unlink (session_file); ++ g_free (session_file); ++ ++ /* here the whole logic for mapping any N:M workspace-layout from ++ * metacity to compiz or vice versa is handled, currently only ++ * implemented for one-screen setups */ ++ if (effects_enabled) ++ { ++ workspaces = get_int_value (app->client, ++ "/apps/metacity/general/num_workspaces"); ++ rows = get_pager_num_rows (app->client); ++ set_int_value (app->client, ++ "/apps/compiz/general/screen0/options/vsize", ++ rows); ++ set_int_value (app->client, ++ "/apps/compiz/general/screen0/options/hsize", ++ (gint) ceilf ((gfloat) workspaces / (gfloat) rows)); ++ set_pager_num_rows (app->client, 1); ++ } ++ else if (app->compiz_was_running) ++ { ++ vsize = get_int_value (app->client, ++ "/apps/compiz/general/screen0/options/vsize"); ++ hsize = get_int_value (app->client, ++ "/apps/compiz/general/screen0/options/hsize"); ++ set_int_value (app->client, ++ "/apps/metacity/general/num_workspaces", ++ vsize * hsize); ++ set_pager_num_rows (app->client, vsize); ++ } ++} ++ ++static void ++set_busy (GtkWidget *widget, ++ gboolean busy) ++{ ++ GdkCursor *cursor; ++ ++ if (busy) ++ cursor = gdk_cursor_new (GDK_WATCH); ++ else ++ cursor = NULL; ++ ++ gdk_window_set_cursor (widget->window, cursor); ++ ++ if (cursor) ++ gdk_cursor_unref (cursor); ++ ++ gdk_flush (); ++} ++ ++ ++gchar* ++get_current_window_manager (void) ++{ ++ Window *xwindow; ++ Atom type; ++ gint format; ++ gulong nitems; ++ gulong bytes_after; ++ gchar *name; ++ ++ XGetWindowProperty (GDK_DISPLAY (), ++ GDK_ROOT_WINDOW (), ++ XInternAtom (GDK_DISPLAY (), ++ "_NET_SUPPORTING_WM_CHECK", ++ False), ++ 0, ++ G_MAXLONG, ++ False, ++ XA_WINDOW, ++ &type, ++ &format, ++ &nitems, ++ &bytes_after, ++ (guchar **) &xwindow); ++ ++ if (type != XA_WINDOW) ++ return NULL; ++ ++ gdk_error_trap_push (); ++ XSelectInput (GDK_DISPLAY (), ++ *xwindow, ++ StructureNotifyMask | PropertyChangeMask); ++ XSync (GDK_DISPLAY (), False); ++ ++ if (gdk_error_trap_pop ()) ++ { ++ XFree (xwindow); ++ return NULL; ++ } ++ ++ name = NULL; ++ ++ gdk_error_trap_push (); ++ ++ XGetWindowProperty (GDK_DISPLAY (), ++ *xwindow, ++ XInternAtom (GDK_DISPLAY (), ++ "_NET_WM_NAME", ++ False), ++ 0, ++ G_MAXLONG, ++ False, ++ XInternAtom (GDK_DISPLAY (), ++ "UTF8_STRING", ++ False), ++ &type, ++ &format, ++ &nitems, ++ &bytes_after, ++ (guchar **)&name); ++ ++ gdk_display_sync (GDK_DISPLAY ()); ++ gdk_error_trap_pop (); ++ XFree (xwindow); ++ return name; ++} ++ ++static gboolean ++compiz_started (void) ++{ ++ gboolean result; ++ gchar *wm = get_current_window_manager (); ++ ++ result = wm && strcmp (wm, "compiz") == 0; ++ g_free (wm); ++ ++ return result; ++} ++ ++typedef struct TimedDialogInfo { ++ AppearanceData *app; ++ GTimer *timer; ++ GtkWidget *button; ++} TimedDialogInfo; ++ ++static WindowManager ++current_configured_wm (AppearanceData *app, ++ GError **err) ++{ ++ GError *tmp = NULL; ++ ++ const char *str = gconf_client_get_string (app->client, ++ WINDOW_MANAGER_KEY, ++ &tmp); ++ ++ if (tmp) ++ { ++ g_propagate_error (err, tmp); ++ return METACITY; ++ } ++ ++ if (str && strcmp (str, "compiz") == 0) ++ return COMPIZ; ++ else ++ return METACITY; ++} ++ ++static void ++show_error (const GError *err) ++{ ++ GtkWidget *dialog; ++ ++ if (!err) ++ return; ++ ++ dialog = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_OK, ++ "%s", ++ err->message); ++ ++ gtk_window_set_title (GTK_WINDOW (dialog), ""); ++ ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++} ++ ++struct TimeoutData { ++ int time; ++ GtkLabel *label; ++ GtkDialog *dialog; ++ gboolean timed_out; ++}; ++ ++static gboolean ++free_at_idle (gpointer data) ++{ ++ g_free (data); ++ return FALSE; ++} ++ ++static char* ++idle_free (char *str) ++{ ++ g_idle_add (free_at_idle, str); ++ return str; ++} ++ ++static char * ++timeout_string (int time) ++{ ++ char *str = g_strdup_printf (ngettext ("Testing the new settings. If you don't respond in %d second the previous settings will be restored.", "Testing the new settings. If you don't respond in %d seconds the previous settings will be restored.", time), time); ++ ++ return idle_free (str); ++} ++ ++static gboolean ++save_timeout_callback (gpointer data) ++{ ++ struct TimeoutData *timeData = data; ++ ++ timeData->time--; ++ ++ if (timeData->time == 0) ++ { ++ gtk_dialog_response (timeData->dialog, GTK_RESPONSE_NO); ++ timeData->timed_out = TRUE; ++ return FALSE; ++ } ++ ++ gtk_label_set_text (timeData->label, timeout_string (timeData->time)); ++ ++ return TRUE; ++} ++ ++static gboolean ++run_timed_dialog (AppearanceData *app) ++{ ++ GtkWidget *dialog; ++ GtkWidget *hbox; ++ GtkWidget *vbox; ++ GtkWidget *label; ++ GtkWidget *label_sec; ++ GtkWidget *image; ++ int res; ++ struct TimeoutData timeout_data; ++ guint timeout; ++ ++ dialog = gtk_dialog_new (); ++ gtk_window_set_transient_for (GTK_WINDOW (dialog), ++ GTK_WINDOW (app->dialog)); ++ gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE); ++ gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); ++ gtk_container_set_border_width (GTK_CONTAINER (dialog), 12); ++ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); ++ gtk_window_set_title (GTK_WINDOW (dialog), _("Keep Settings")); ++ gtk_window_set_position (GTK_WINDOW(dialog), GTK_WIN_POS_CENTER_ALWAYS); ++ ++ label = gtk_label_new (NULL); ++ gtk_label_set_markup (GTK_LABEL (label), ++ idle_free (g_strdup_printf ("%s", ++ _("Do you want to keep these settings?")))); ++ image = gtk_image_new_from_stock (GTK_STOCK_DIALOG_QUESTION, ++ GTK_ICON_SIZE_DIALOG); ++ gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); ++ ++ gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); ++ gtk_label_set_selectable (GTK_LABEL (label), TRUE); ++ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); ++ ++ label_sec = gtk_label_new (timeout_string (REVERT_COUNT)); ++ gtk_label_set_line_wrap (GTK_LABEL (label_sec), TRUE); ++ gtk_label_set_selectable (GTK_LABEL (label_sec), TRUE); ++ gtk_misc_set_alignment (GTK_MISC (label_sec), 0.0, 0.5); ++ ++ hbox = gtk_hbox_new (FALSE, 6); ++ vbox = gtk_vbox_new (FALSE, 6); ++ ++ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (vbox), label_sec, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), ++ hbox, ++ FALSE, ++ FALSE, ++ 0); ++ gtk_dialog_add_buttons (GTK_DIALOG (dialog), ++ _("Use _previous settings"), ++ GTK_RESPONSE_NO, ++ _("_Keep settings"), ++ GTK_RESPONSE_YES, ++ NULL); ++ ++ gtk_widget_show_all (hbox); ++ ++ timeout_data.time = REVERT_COUNT; ++ timeout_data.label = GTK_LABEL (label_sec); ++ timeout_data.dialog = GTK_DIALOG (dialog); ++ timeout_data.timed_out = FALSE; ++ ++ timeout = g_timeout_add (1000, save_timeout_callback, &timeout_data); ++ res = gtk_dialog_run (GTK_DIALOG (dialog)); ++ ++ if (!timeout_data.timed_out) ++ g_source_remove (timeout); ++ ++ gtk_widget_destroy (dialog); ++ ++ return (res == GTK_RESPONSE_YES); ++} ++ ++static gboolean ++show_dialog_timeout (gpointer data) ++{ ++ TimedDialogInfo *info = data; ++ gboolean has_compiz; ++ ++ gtk_window_present (GTK_WINDOW (info->app->dialog)); ++ ++ has_compiz = compiz_started (); ++ ++ if (has_compiz || ++ g_timer_elapsed (info->timer, ++ NULL) > SECONDS_WE_WILL_WAIT_FOR_COMPIZ_TO_START) ++ { ++ if (has_compiz) ++ { ++ set_busy (info->app->dialog, FALSE); ++ ++ if (run_timed_dialog (info->app)) ++ apply_settings (info->app, ++ info->app->desktop_effects_level >= 1); ++ else ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (info->button), ++ TRUE); ++ } ++ else ++ { ++ GtkWidget *dialog; ++ ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (info->button), ++ TRUE); ++ ++ set_busy (info->app->dialog, FALSE); ++ ++ dialog = gtk_message_dialog_new ((GtkWindow*) info->app->dialog, ++ GTK_DIALOG_DESTROY_WITH_PARENT, ++ GTK_MESSAGE_WARNING, ++ GTK_BUTTONS_OK, ++ _("Desktop effects could not be enabled")); ++ ++ gtk_window_set_title (GTK_WINDOW (dialog), ""); ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++ gtk_widget_destroy (dialog); ++ } ++ ++ gtk_widget_set_sensitive (info->app->dialog, TRUE); ++ ++ g_timer_destroy (info->timer); ++ g_free (info); ++ ++ return FALSE; ++ } ++ ++ return TRUE; ++} ++ ++static gboolean ++start_compiz (AppearanceData *app, ++ GError **err) ++{ ++ if (!g_spawn_command_line_async ("compiz --replace", err)) ++ return FALSE; ++ ++ app->compiz_running = TRUE; ++ ++ return TRUE; ++} ++ ++static gboolean ++start_metacity (AppearanceData *app, GError **err) ++{ ++ if (!g_spawn_command_line_async ("metacity --replace", err)) ++ return FALSE; ++ ++ app->compiz_running = FALSE; ++ ++ return TRUE; ++} ++ ++static gboolean ++has_composite () ++{ ++ int dummy1; ++ int dummy2; ++ ++ if (XCompositeQueryExtension (GDK_DISPLAY (), &dummy1, &dummy2)) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++static void ++show_alert (const char *text) ++{ ++ GtkWidget *dialog; ++ ++ dialog = gtk_message_dialog_new (NULL, ++ GTK_DIALOG_MODAL, ++ GTK_MESSAGE_ERROR, ++ GTK_BUTTONS_OK, ++ "%s", ++ text); ++ ++ gtk_dialog_run (GTK_DIALOG (dialog)); ++} ++ ++static gboolean ++are_effects_enabled (AppearanceData* app, ++ const gchar** effects_list) ++{ ++ int i; ++ gboolean res = TRUE; ++ GError *tmp = NULL; ++ GSList *plugins; ++ ++ plugins = get_plugins (app, &tmp); ++ for (i = 0; effects_list[i] != NULL; i++) ++ res &= contains_string (plugins, effects_list[i]); ++ ++ return res; ++} ++ ++static gboolean ++reset_plugins (AppearanceData *app) ++{ ++ GError *error = NULL; ++ ++ return gconf_client_unset (app->client, PLUGIN_LIST_KEY, &error); ++} ++ ++static gboolean ++are_normal_effects_enabled (AppearanceData *app) ++{ ++ gboolean res = TRUE; ++ GError *err = NULL; ++ GSList *plugins, *default_plugins; ++ ++ default_plugins = gconf_value_get_list ( gconf_client_get_default_from_schema (app->client, PLUGIN_LIST_KEY, &err)); ++ ++ err = NULL; ++ plugins = get_plugins (app, &err); ++ for(;default_plugins; default_plugins = g_slist_next(default_plugins)) ++ res &= contains_string(plugins, gconf_value_get_string(default_plugins->data)); ++ ++ return res; ++} ++ ++static gboolean ++are_extra_effects_enabled (AppearanceData *app) ++{ ++ return (are_effects_enabled (app, extra_effects) && ++ are_normal_effects_enabled (app)); ++} ++ ++static gint ++get_effects_level (AppearanceData *data) ++{ ++ if (data->compiz_running) ++ { ++ if (are_extra_effects_enabled (data)) ++ return EXTRA_EFFECTS; ++ else if (are_normal_effects_enabled (data)) ++ return NORMAL_EFFECTS; ++ else ++ return CUSTOM_EFFECTS; ++ } ++ else ++ return NO_EFFECTS; ++} ++ ++static gboolean ++enable_normal_effects (AppearanceData* app) ++{ ++ return reset_plugins (app); ++} ++ ++static gboolean ++enable_extra_effects (AppearanceData* app) ++{ ++ GError *err = NULL; ++ GSList *plugins = NULL; ++ int i; ++ ++ reset_plugins (app); ++ ++ plugins = get_plugins (app, &err); ++ for (i = 0; extra_effects[i] != NULL; i++) ++ plugins = g_slist_append (plugins, ++ (gchar*) extra_effects[i]); ++ ++ err = NULL; ++ gconf_client_set_list (app->client, ++ PLUGIN_LIST_KEY, ++ GCONF_VALUE_STRING, ++ plugins, ++ &err); ++ ++ return TRUE; ++} ++ ++static void ++on_effects_toggle (GtkWidget *widget, ++ gpointer user_data) ++{ ++ AppearanceData *appdata = user_data; ++ GtkWidget *previously_selected_button; ++ static gint old_effects_level; ++ static gboolean do_init = TRUE; ++ gint i; ++ GError *err = NULL; ++ ++ if (do_init == TRUE) ++ { ++ old_effects_level = get_effects_level (appdata); ++ do_init = FALSE; ++ } ++ ++ if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))) ++ return; ++ ++ previously_selected_button = appearance_capplet_get_widget (appdata, ++ effect_choices [old_effects_level]); ++ ++ /* Look for the button which has been selected */ ++ for (i = 0; i < G_N_ELEMENTS (effect_choices); i++) ++ { ++ if (widget == appearance_capplet_get_widget (appdata, ++ effect_choices [i])) ++ break; ++ } ++ ++ appdata->desktop_effects_level = i; ++ ++ if (appdata->desktop_effects_level >= 1) ++ { ++ if (old_effects_level == 0 && check_graphics_driver()) ++ { ++ show_info (_("Please run \"Appearance/Desktop Effects\" again after restarting " ++ "the computer, when the new graphics driver is active.")); ++ g_signal_handlers_block_by_func (widget, ++ on_effects_toggle, ++ appdata); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (appearance_capplet_get_widget (appdata, ++ effect_choices [old_effects_level])), ++ TRUE); ++ g_signal_handlers_unblock_by_func (widget, ++ on_effects_toggle, ++ appdata); ++ return; ++ } ++ ++ if (!has_composite ()) ++ { ++ show_alert ("The Composite extension is not available"); ++ return; ++ } ++ ++ if (old_effects_level == 0) ++ start_compiz (appdata, &err); ++ ++ if (appdata->desktop_effects_level == NORMAL_EFFECTS) ++ enable_normal_effects (appdata); ++ ++ if (appdata->desktop_effects_level == EXTRA_EFFECTS) ++ enable_extra_effects (appdata); ++ } ++ else ++ { ++ apply_settings (appdata, FALSE); ++ start_metacity (appdata, &err); ++ } ++ ++ if (err) ++ { ++ show_error (err); ++ ++ g_signal_handlers_block_by_func (widget, ++ on_effects_toggle, ++ appdata); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (appearance_capplet_get_widget (appdata, ++ effect_choices [old_effects_level])), ++ TRUE); ++ g_signal_handlers_unblock_by_func (widget, ++ on_effects_toggle, ++ appdata); ++ } ++ else ++ { ++ if (appdata->desktop_effects_level >= 1 && ++ old_effects_level == 0) ++ { ++ TimedDialogInfo *info = g_new0 (TimedDialogInfo, 1); ++ ++ info->app = appdata; ++ info->button = previously_selected_button; ++ info->timer = g_timer_new (); ++ ++ set_busy (info->app->dialog, TRUE); ++ gtk_widget_set_sensitive (appdata->dialog, FALSE); ++ ++ g_timeout_add (250, show_dialog_timeout, info); ++ } ++ } ++ ++ old_effects_level = i; ++} ++ ++void ++effects_init (AppearanceData *data) ++{ ++ GtkWidget *level_effects_button = NULL; ++ GtkWidget *hbox_custom_effects = NULL; ++ WindowManager wm = METACITY; ++ gint i; ++ gchar *str = get_current_window_manager (); ++ if (str && (strcmp (str, "compiz") == 0)) ++ wm = COMPIZ; ++ g_free (str); ++ ++ data->compiz_running = (wm == COMPIZ); ++ data->compiz_was_running = (wm == COMPIZ); ++ data->dialog = appearance_capplet_get_widget (data, "appearance_window"); ++ ++ data->desktop_effects_level = get_effects_level (data); ++ ++ for (i = 0; i < G_N_ELEMENTS (effect_choices); i++) ++ { ++ level_effects_button = appearance_capplet_get_widget (data, ++ effect_choices[i]); ++ if (i == data->desktop_effects_level) ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (level_effects_button), ++ TRUE); ++ ++ g_signal_connect (level_effects_button, ++ "toggled", ++ G_CALLBACK (on_effects_toggle), ++ data); ++ } ++ ++ hbox_custom_effects = appearance_capplet_get_widget (data, ++ "hbox_custom_effects"); ++ if (check_simple_ccsm ()) ++ { ++ GtkWidget *button = NULL; ++ ++ gtk_widget_show (hbox_custom_effects); ++ button = appearance_capplet_get_widget (data, ++ "custom_effects_edit_button"); ++ g_signal_connect (button, ++ "clicked", ++ G_CALLBACK (run_simple_ccsm), ++ NULL); ++ } ++ else ++ gtk_widget_hide (hbox_custom_effects); ++} ++ +Index: gnome-control-center-2.29.90/capplets/appearance/appearance-effects.h +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ gnome-control-center-2.29.90/capplets/appearance/appearance-effects.h 2010-02-23 02:45:24.082445648 +0000 +@@ -0,0 +1,22 @@ ++/* ++ * Copyright (C) 2007 Canonical ++ * Written by Michael Vogt ++ * All Rights Reserved ++ * ++ * 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 program; if not, write to the Free Software Foundation, Inc., ++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ++ */ ++ ++void effects_init (AppearanceData *data); ++gchar* get_current_window_manager (void); +Index: gnome-control-center-2.29.90/capplets/appearance/appearance.h +=================================================================== +--- gnome-control-center-2.29.90.orig/capplets/appearance/appearance.h 2010-02-23 02:45:01.412442341 +0000 ++++ gnome-control-center-2.29.90/capplets/appearance/appearance.h 2010-02-23 02:45:24.082445648 +0000 +@@ -79,6 +79,12 @@ + gchar *revert_windowtitle_font; + gchar *revert_monospace_font; + ++ /* effects */ ++ gboolean compiz_running; ++ gboolean compiz_was_running; ++ gint desktop_effects_level; ++ GtkWidget *dialog; ++ + /* style */ + GdkPixbuf *gtk_theme_icon; + GdkPixbuf *window_theme_icon; +Index: gnome-control-center-2.29.90/capplets/appearance/appearance-main.c +=================================================================== +--- gnome-control-center-2.29.90.orig/capplets/appearance/appearance-main.c 2010-02-23 02:45:01.442443569 +0000 ++++ gnome-control-center-2.29.90/capplets/appearance/appearance-main.c 2010-02-23 02:47:47.124969629 +0000 +@@ -21,6 +21,7 @@ + #include + #include "appearance.h" + #include "appearance-desktop.h" ++#include "appearance-effects.h" + #include "appearance-font.h" + #include "appearance-themes.h" + #include "appearance-style.h" +@@ -114,11 +115,19 @@ + } + } + ++static void ++set_sensitivity (GtkWidget *widget, GtkWidget *warning) ++{ ++ if (widget != warning) ++ gtk_widget_set_sensitive (widget, FALSE); ++} ++ + int + main (int argc, char **argv) + { + AppearanceData *data; + GtkWidget *w; ++ GtkWidget *warning; + + gchar *install_filename = NULL; + gchar *start_page = NULL; +@@ -164,6 +173,7 @@ + desktop_init (data, (const gchar **) wallpaper_files); + g_strfreev (wallpaper_files); + font_init (data); ++ effects_init (data); + + /* prepare the main window */ + w = appearance_capplet_get_widget (data, "appearance_window"); +@@ -205,6 +215,34 @@ + + g_option_context_free (option_context); + ++ warning = appearance_capplet_get_widget (data, "no_compiz_box"); ++ ++ if (g_find_program_in_path ("compiz") == NULL) { ++ GtkWidget *box; ++ ++ box = appearance_capplet_get_widget (data, "effects_vbox"); ++ gtk_container_foreach (GTK_CONTAINER (box), ++ (GtkCallback) set_sensitivity, warning); ++ } ++ else ++ gtk_widget_hide_all (warning); ++ ++ warning = appearance_capplet_get_widget (data, "mutter_box"); ++ ++ gchar *wm = get_current_window_manager (); ++ ++ if (wm != NULL && strcmp (wm, "Mutter") == 0) { ++ GtkWidget *box; ++ ++ box = appearance_capplet_get_widget (data, "effects_vbox"); ++ gtk_container_foreach (GTK_CONTAINER (box), ++ (GtkCallback) set_sensitivity, warning); ++ } ++ else ++ gtk_widget_hide_all (warning); ++ ++ g_free (wm); ++ + /* start the mainloop */ + gtk_main (); + +Index: gnome-control-center-2.29.90/capplets/appearance/data/appearance.ui +=================================================================== +--- gnome-control-center-2.29.90.orig/capplets/appearance/data/appearance.ui 2010-02-23 02:45:01.382443277 +0000 ++++ gnome-control-center-2.29.90/capplets/appearance/data/appearance.ui 2010-02-23 02:45:24.092453554 +0000 +@@ -1549,6 +1549,342 @@ + False + + ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ 18 ++ True ++ ++ ++ 26 ++ True ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ gtk-dialog-warning ++ 6 ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ 6 ++ <b>Compiz is not installed</b> ++ True ++ ++ ++ ++ ++ ++ ++ 26 ++ True ++ ++ ++ True ++ 6 ++ ++ ++ True ++ 0 ++ gtk-dialog-warning ++ 6 ++ ++ ++ False ++ False ++ 0 ++ ++ ++ ++ ++ True ++ 0 ++ 6 ++ <b>Mutter is running, can't switch to other effects.</b> ++ True ++ ++ ++ ++ ++ ++ ++ 0 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ True ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ /usr/share/gnome-control-center/pixmaps/visual-effects_none.svg ++ 6 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ <b>_None:</b> Provides a simple desktop environment without any effects. ++ True ++ True ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 6 ++ 1 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ True ++ no_effects_button ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ /usr/share/gnome-control-center/pixmaps/visual-effects_normal.svg ++ 6 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ <b>N_ormal:</b> Provides improved usability and good balance between attractiveness and moderate performance requirements. ++ True ++ True ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 6 ++ 2 ++ ++ ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ True ++ no_effects_button ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ /usr/share/gnome-control-center/pixmaps/visual-effects_extra.svg ++ 6 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ <b>E_xtra:</b> Provides more aesthetically pleasing set of effects. Requires faster graphics card. ++ True ++ True ++ True ++ ++ ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ 6 ++ 3 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ ++ ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ True ++ True ++ no_effects_button ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ 6 ++ /usr/share/gnome-control-center/pixmaps/visual-effects_custom.svg ++ 6 ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ <b>C_ustom:</b> Uses custom set of effects. ++ True ++ True ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ False ++ False ++ ++ ++ ++ ++ True ++ True ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ gtk-preferences ++ True ++ ++ ++ False ++ False ++ 1 ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ ++ ++ False ++ False ++ 2 ++ ++ ++ ++ ++ False ++ False ++ 6 ++ 1 ++ ++ ++ ++ ++ False ++ False ++ 4 ++ ++ ++ ++ ++ ++ ++ True ++ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK ++ Visual Effects ++ ++ ++ 4 ++ False ++ ++ + + + 1 +Index: gnome-control-center-2.29.90/capplets/appearance/Makefile.am +=================================================================== +--- gnome-control-center-2.29.90.orig/capplets/appearance/Makefile.am 2010-02-23 02:45:01.402442467 +0000 ++++ gnome-control-center-2.29.90/capplets/appearance/Makefile.am 2010-02-23 02:45:24.092453554 +0000 +@@ -9,6 +9,8 @@ + appearance.h \ + appearance-desktop.c \ + appearance-desktop.h \ ++ appearance-effects.c\ ++ appearance-effects.h\ + appearance-font.c \ + appearance-font.h \ + appearance-main.c \ +Index: gnome-control-center-2.29.90/po/POTFILES.in +=================================================================== +--- gnome-control-center-2.29.90.orig/po/POTFILES.in 2010-02-23 02:45:01.462452955 +0000 ++++ gnome-control-center-2.29.90/po/POTFILES.in 2010-02-23 02:45:24.092453554 +0000 +@@ -16,6 +16,7 @@ + capplets/accessibility/at-properties/at-properties.desktop.in.in + capplets/accessibility/at-properties/main.c + capplets/appearance/appearance-desktop.c ++capplets/appearance/appearance-effects.c + capplets/appearance/appearance-font.c + capplets/appearance/appearance-main.c + capplets/appearance/appearance-style.c