--- control-center-2.15.90.orig/debian/control.in +++ control-center-2.15.90/debian/control.in @@ -0,0 +1,85 @@ +Source: control-center +Section: gnome +Priority: optional +Maintainer: Marco Cabizza +Uploaders: Marc Dequènes (Duck) , @GNOME_TEAM@ +Standards-Version: 3.7.2 +Build-Depends: cdbs, gnome-pkg-tools, dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), libgnomeui-dev (>= 2.8.1-3), intltool, libglade2-dev (>= 2.4.0-1), libgnome-desktop-dev (>= 2.7.92-1), zlib1g-dev, flex,liborbit2-dev (>= 2.10.2-1.1), libmetacity-dev (>= 1:2.8.1-3), libxcursor-dev, libbonobo2-dev (>= 2.6.2-6), libnautilus-extension-dev, libgtk2.0-dev (>= 2.6.0), libxklavier-dev (>= 2.91), libxrandr-dev, docbook-to-man, libgstreamer-plugins-base0.10-dev, autotools-dev, libasound2-dev (>= 1.0.3b-1), libxss-dev, libxinerama-dev, libxft-dev (>= 2.1.2), libxxf86misc-dev, libxkbfile-dev, libebook1.2-dev (>= 1.3.0), desktop-file-utils, gnome-doc-utils (>= 0.3.2), libgnome-menu-dev (>= 2.12.0), libx11-dev, libxrender-dev, libgconf2-dev, libbonoboui2-dev, libesd0-dev, libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libxt-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.32), libdbus-glib-1-dev (>= 0.32) + +Package: gnome-control-center +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, ${misc:Depends}, capplets-data (= ${source:Version}), libgnome-window-settings1 (= ${binary:Version}), gnome-menus, gnome-desktop-data, gnome-icon-theme (>= 1.2.3-1), desktop-file-utils, alsa-utils (>= 1.0.10-1ubuntu10) +Recommends: evolution-data-server, gnome2-user-guide, gnome-session +Replaces: capplets +Conflicts: capplets, gnome-session (<< 2.15.4) +Suggests: esound-clients, xscreensaver (>= 4.0) | gnome-screensaver, xbase-clients, gstreamer0.10-alsa | gstreamer0.10-esd, xrdb +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: gnome-control-center-dbg +Architecture: any +Section: gnome +Depends: gnome-control-center (= ${Source-Version}) +Replaces: capplets-dbg +Provides: capplets-dbg +Conflicts: capplets-dbg +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. + . + This development package contains unstripped binaries compiled with + debugging symbols needed by gdb. + +Package: gnome-control-center-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends} +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. + . + This package contains the dbus interface for gnome-settings-daemon + +Package: capplets-data +Architecture: all +Section: gnome +Depends: scrollkeeper (>= 0.3.14-5), ${misc:Depends} +Recommends: gnome-control-center (>= ${source:Version}) +Description: configuration applets for GNOME 2 - 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} +Replaces: gnome-control-center (<< 1:2.14.2-1), capplets +Conflicts: capplets +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 (= ${binary:Version}) +Replaces: gnome-control-center (<< 1:2.14.2-1) +Description: Utility library for getting window manager settings (headers) + This package contains the libwindow-settings library header files. --- control-center-2.15.90.orig/debian/changelog +++ control-center-2.15.90/debian/changelog @@ -0,0 +1,1477 @@ +control-center (1:2.15.90-0ubuntu1) edgy; urgency=low + + * New upstream release: + - misc: + - add an encoding key to some .directory.in + - don't use the Application category for the .desktops, use + HardwareSettings for some + - made gconf-property-editor.c use GtkColorButton instead of GnomeColorPicker + - mouse: + - fix the non-xcursor case for solaris + - use ngettext() correctly + - theme-switcher: + - fixed messages wording + - removed duplicate check for the tar utility + - updated translations: ca, cs, de, dz, el, es, fi, fr, gu, id, ja, ko, + sv, th. + + -- Daniel Holbach Tue, 25 Jul 2006 18:57:33 +0200 + +control-center (1:2.15.4-0ubuntu1) edgy; urgency=low + + * New upstream version: + background: + - Removed redundant GNOMELOCALEDIR + display: + - Replaced deprecated GtkOptionMenu with GtkComboBox + - Added rotation support + keyboard: + - Massive libgswitchit API change + - Made model chooser button more verbose + sound: + - Fixed build + theme-switcher: + - Fixed strange wording + settings daemon: + - Activation is now done via DBUS + - Added DBUS interface for keyboard indication + documentation: + - Initial Russian translation + * debian/capplets-data.install: + - updated list of files to install + * debian/control.in, debian/gnome-control-center-dev.install: + - create a gnome-control-center-dev shipping the .h and .pc for the new + gnome-settings-daemon dbus interface (used by gnome-session) + - gnome-control-center Conflicts with gnome-session (<< 2.15.4) since + the gnome-settings-daemon has to be started by dbus now + * debian/libgnome-window-settings-dev.install: + - install only the corresponding .pc + + -- Sebastien Bacher Tue, 11 Jul 2006 23:18:20 +0200 + +control-center (1:2.15.3-0ubuntu1) edgy; urgency=low + + * Sync with Debian + * New upstream version: + about me: + - Fixed typo + - Fixed compilation issues + default applications: + - Added support for Sylpheed + - Removed unnecessary gnome-terminal argument + keybindings: + - Removed brightness keybindings, now in gnome-power-manager + keyboard: + - Save/restore layout preview window geometry + mouse: + - Fixed selection when no cursor font is set in GConf + sound: + - Added sound device selection + - Fixed button strings + theme-switcher: + - Removed drag & drop information text + - Added Install buttons to each tab in the details window + - Remember last browsed or installed from location + - Don't allow invalid characters in theme names + - Don't ask user whether to overwrite or not internal files + - Allow saving background image for custom themes + - Fixed UI issues in the save dialog + settings daemon: + - Fixed libxklavier engine initialization logic + - Removed references to brightness controls + - Fixed leaks + general: + - Updated to new libxklavier API + * debian/control.in: + - build a gnome-control-center-dbg package. + - Build-Depends on libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.32), + libdbus-glib-1-dev (>= 0.32) + - don't use type-handling. + - gnome-control-center Depends on alsa-utils (>= 1.0.10-1ubuntu10) + - require new libxklavier + - Suggests xrdb + - updated libgnome-window-settings1, libgnome-window-settings-dev + Replaces version on gnome-control-center + * debian/index.theme: + - drop the Debian specific Default theme entry, it's confusing + (Ubuntu: #15268). + * debian/patches/01_debian_ubuntu.patch, + debian/patches/07_default_keys.patch, + debian/patches/13_unlink_out_of_date_thumbs.patch, + debian/patches/16_gsd-reaper-no-iopipe.patch, + debian/patches/17_menu-changes.patch: + - ubuntu changes. + * debian/patches/02_xrdb.patch: + - use xrdb + * debian/patches/08_transparency_for_notication_area_icon.patch: + - make the icon on the notification area be transparent with the panel + (Ubuntu: #42894) + * debian/patches/11_sleepkey.patch: + - dropped + * debian/patches/18_use_stock_icons.patch: + - initial patch by j^ , use stock icons for the volume popup + (Ubuntu: #20302) + * debian/patches/19_extra_keybindings.patch: + - updated + * debian/patches/20_keybindings_allow_print.patch: + - patch by Gary Coady , fix keys range so print + and pause keys are accepted again (Ubuntu: #33102) + * debian/patches/21_no_sleep_key.patch: + - replace 27_remove_hibernation_and_sleeping..patch, the power function + is useful, only drop the sleep shortcut assignation + * debian/patches/23_default_soundcard_selector.patch: + - sound card selector + * debian/patches/23_menu_files_conflict.patch: + - Debian specific change. + * debian/patches/26_ignore_pmu_permissions.patch: + - dropped, gnome-power-manager is used for that with the new GNOME + * debian/patches/31_call_thunderbird_correctly.patch: + - new patch to call Thunderbird correctly (and use its icon) + (Malone: #38730, #45693) + + -- Sebastien Bacher Mon, 10 Jul 2006 12:14:46 +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 + + --- control-center-2.15.90.orig/debian/control +++ control-center-2.15.90/debian/control @@ -0,0 +1,85 @@ +Source: control-center +Section: gnome +Priority: optional +Maintainer: Marco Cabizza +Uploaders: Marc Dequènes (Duck) , Debian GNOME Maintainers , Andrew Lau , Clément Stenac , Dafydd Harries , Guilherme de S. Pastore , Gustavo Franco , Gustavo Noronha Silva , J.H.M. Dassen (Ray) , Jordi Mallach , Jose Carlos Garcia Sogo , Josselin Mouette , Loic Minier , Marc 'HE' Brockschmidt , Oystein Gisnas , Ondřej Surý , Ross Burton , Sebastien Bacher , Sjoerd Simons +Standards-Version: 3.7.2 +Build-Depends: cdbs, gnome-pkg-tools, dpkg-dev (>= 1.13.19), debhelper (>= 5.0.0), libgnomeui-dev (>= 2.8.1-3), intltool, libglade2-dev (>= 2.4.0-1), libgnome-desktop-dev (>= 2.7.92-1), zlib1g-dev, flex,liborbit2-dev (>= 2.10.2-1.1), libmetacity-dev (>= 1:2.8.1-3), libxcursor-dev, libbonobo2-dev (>= 2.6.2-6), libnautilus-extension-dev, libgtk2.0-dev (>= 2.6.0), libxklavier-dev (>= 2.91), libxrandr-dev, docbook-to-man, libgstreamer-plugins-base0.10-dev, autotools-dev, libasound2-dev (>= 1.0.3b-1), libxss-dev, libxinerama-dev, libxft-dev (>= 2.1.2), libxxf86misc-dev, libxkbfile-dev, libebook1.2-dev (>= 1.3.0), desktop-file-utils, gnome-doc-utils (>= 0.3.2), libgnome-menu-dev (>= 2.12.0), libx11-dev, libxrender-dev, libgconf2-dev, libbonoboui2-dev, libesd0-dev, libgnomevfs2-dev, libfontconfig1-dev, libfreetype6-dev, libglib2.0-dev, libxt-dev, libhal-dev (>= 0.5.6), libdbus-1-dev (>= 0.32), libdbus-glib-1-dev (>= 0.32) + +Package: gnome-control-center +Architecture: any +Section: gnome +Depends: ${shlibs:Depends}, ${misc:Depends}, capplets-data (= ${source:Version}), libgnome-window-settings1 (= ${binary:Version}), gnome-menus, gnome-desktop-data, gnome-icon-theme (>= 1.2.3-1), desktop-file-utils, alsa-utils (>= 1.0.10-1ubuntu10) +Recommends: evolution-data-server, gnome2-user-guide, gnome-session +Replaces: capplets +Conflicts: capplets, gnome-session (<< 2.15.4) +Suggests: esound-clients, xscreensaver (>= 4.0) | gnome-screensaver, xbase-clients, gstreamer0.10-alsa | gstreamer0.10-esd, xrdb +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: gnome-control-center-dbg +Architecture: any +Section: gnome +Depends: gnome-control-center (= ${Source-Version}) +Replaces: capplets-dbg +Provides: capplets-dbg +Conflicts: capplets-dbg +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. + . + This development package contains unstripped binaries compiled with + debugging symbols needed by gdb. + +Package: gnome-control-center-dev +Architecture: all +Section: libdevel +Depends: ${shlibs:Depends}, ${misc:Depends} +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. + . + This package contains the dbus interface for gnome-settings-daemon + +Package: capplets-data +Architecture: all +Section: gnome +Depends: scrollkeeper (>= 0.3.14-5), ${misc:Depends} +Recommends: gnome-control-center (>= ${source:Version}) +Description: configuration applets for GNOME 2 - 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} +Replaces: gnome-control-center (<< 1:2.14.2-1), capplets +Conflicts: capplets +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 (= ${binary:Version}) +Replaces: gnome-control-center (<< 1:2.14.2-1) +Description: Utility library for getting window manager settings (headers) + This package contains the libwindow-settings library header files. --- control-center-2.15.90.orig/debian/rules +++ control-center-2.15.90/debian/rules @@ -0,0 +1,33 @@ +#!/usr/bin/make -f +# -*- mode: makefile; coding: utf-8 -*- +# + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.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 + +DEB_BUILDDIR = $(CURDIR)/debian/build +DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed" + +DEB_CONFIGURE_EXTRA_FLAGS += --disable-mime-cache \ + --disable-scrollkeeper \ + --enable-aboutme \ + --enable-gstreamer=0.10 + +DEB_CONFIGURE_LOCALSTATEDIR := /var/lib + +DEB_INSTALL_MANPAGES_gnome-control-center += debian/gnome-control-center.1 + +build/gnome-control-center:: $(DEB_INSTALL_MANPAGES_gnome-control-center) + +%.1: %.sgml + /usr/bin/docbook-to-man $< > $@ + +binary-post-install/capplets-data:: + rm -rf debian/capplets-data/usr/share/applications/mimeinfo.cache + +clean:: + rm -f $(DEB_INSTALL_MANPAGES_gnome-control-center) + rm -rf $(DEB_BUILDDIR) --- control-center-2.15.90.orig/debian/compat +++ control-center-2.15.90/debian/compat @@ -0,0 +1 @@ +5 --- control-center-2.15.90.orig/debian/patches/23_default_soundcard_selector.patch +++ control-center-2.15.90/debian/patches/23_default_soundcard_selector.patch @@ -0,0 +1,290 @@ +diff -Nur control-center-2.15.3/capplets/sound/Makefile.in control-center-2.15.3.new/capplets/sound/Makefile.in +--- control-center-2.15.3/capplets/sound/Makefile.in 2006-06-12 23:23:07.000000000 +0200 ++++ control-center-2.15.3.new/capplets/sound/Makefile.in 2006-07-10 13:05:30.000000000 +0200 +@@ -352,6 +352,7 @@ + $(HAL_LIBS) + + gnome_sound_properties_SOURCES = sound-properties-capplet.c pipeline-tests.h pipeline-tests.c ++gnome_sound_properties_LDFLAGS = -lasound + Gladedir = $(GNOMECC_GLADE_DIR) + Glade_DATA = sound-properties.glade + desktop_iconsdir = $(GNOMECC_PIXMAPS_DIR) +diff -Nur control-center-2.15.3/capplets/sound/sound-properties-capplet.c control-center-2.15.3.new/capplets/sound/sound-properties-capplet.c +--- control-center-2.15.3/capplets/sound/sound-properties-capplet.c 2006-05-09 15:24:29.000000000 +0200 ++++ control-center-2.15.3.new/capplets/sound/sound-properties-capplet.c 2006-07-10 13:05:04.000000000 +0200 +@@ -49,6 +49,9 @@ + #include + #include + ++#include ++#include ++ + #include "activate-settings-daemon.h" + #include "pipeline-tests.h" + +@@ -151,6 +154,167 @@ + return new_value; + } + ++/* get_soundcards ++ * ++ * Put a list of all available sound cards into the given combo box and store ++ * the sound card IDs into card_ids (in the same order). ++ */ ++static void ++get_soundcards (GtkComboBox* combo, GArray* card_ids) ++{ ++ int card = -1; ++ char* name = NULL; ++ char* id; ++ snd_ctl_t *handle; ++ snd_ctl_card_info_t *info; ++ char hwname[32]; ++ ++ snd_ctl_card_info_alloca(&info); ++ ++ for(;;) { ++ if (snd_card_next(&card) < 0 || card < 0) ++ break; ++ ++ /* get human readable name and store it into the combo box */ ++ if (snd_card_get_name (card, &name) >= 0) { ++ gtk_combo_box_append_text (combo, name); ++ g_free (name); ++ } ++ ++ /* retrieve card ID */ ++ snprintf(hwname, sizeof(hwname), "hw:%d", card); ++ id = NULL; ++ if (snd_ctl_open(&handle, hwname, 0) >= 0) { ++ if (snd_ctl_card_info(handle, info) >= 0) ++ id = g_strdup(snd_ctl_card_info_get_id(info)); ++ snd_ctl_close(handle); ++ } ++ g_array_append_val(card_ids, id); ++ } ++} ++ ++/* get_default_soundcard_asoundrc ++ * ++ * Return the default sound card number as configured in ~/.asoundrc. ++ */ ++static gint ++get_default_soundcard_asoundrc() ++{ ++ gint exit_status; ++ char* out = NULL; ++ char* argv[] = {"asoundconf", "get", "defaults.pcm.card", NULL}; ++ gboolean result; ++ int card; ++ ++ result = g_spawn_sync (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, ++ &out, NULL, &exit_status, NULL); ++ if (!result || !WIFEXITED(exit_status) || WEXITSTATUS(exit_status)) { ++ g_free(out); ++ return 0; ++ } ++ card = atoi(out); ++ g_free(out); ++ return (card >= 0) ? card : -1; ++} ++ ++/* get_default_soundcard ++ * ++ * Return the default sound card number, or -1 if sound card cannot be opened. ++ */ ++static gint ++get_default_soundcard() ++{ ++ snd_pcm_t *handle; ++ snd_pcm_info_t *info = NULL; ++ int card = -1; ++ ++ if (snd_pcm_open(&handle, "default", SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK) < 0) ++ /* if the card is busy, read ~/.asoundrc */ ++ return get_default_soundcard_asoundrc(); ++ if (snd_pcm_info_malloc (&info) < 0) { ++ snd_pcm_close (handle); ++ return -1; ++ } ++ if (snd_pcm_info (handle, info) >= 0) { ++ card = snd_pcm_info_get_card (info); ++ if (card == -1) ++ card = 0; /* default card cannot be detected for some reason */ ++ } ++ ++ snd_pcm_info_free (info); ++ snd_pcm_close (handle); ++ return card; ++} ++ ++/* can_change_card ++ * ++ * Check whether asoundconf is available and configuration can be ++ * changed. ++ */ ++static gboolean ++can_change_card() { ++ char* argv[] = { "/usr/bin/asoundconf", "is-active", NULL }; ++ gint exitcode; ++ ++ if (!g_spawn_sync (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, &exitcode, ++ NULL)) ++ return FALSE; ++ ++ return WIFEXITED (exitcode) && WEXITSTATUS (exitcode) == 0; ++} ++ ++/* set_default_card ++ * ++ * Write 'defaults.{ctl,pcm}.card value' to ALSA configuration. Return TRUE on ++ * success, FALSE on failure. ++ */ ++static gboolean set_default_card (const char* val) ++{ ++ const char* argv[] = { "/usr/bin/asoundconf", "set-default-card", val, NULL }; ++ gint exitcode; ++ ++ if (!g_spawn_sync (NULL, (gchar**) argv, NULL, 0, NULL, NULL, NULL, NULL, &exitcode, ++ NULL)) ++ return FALSE; ++ ++ return WIFEXITED (exitcode) && WEXITSTATUS (exitcode) == 0; ++} ++ ++/* default_card_changed ++ * ++ * Callback for the "changed" signal of the default card combo box. ++ */ ++static gboolean ++default_card_changed (GtkComboBox *c, gpointer card_ids) ++{ ++ char cardstr[256]; ++ int success; ++ char* id; ++ ++ gint card = gtk_combo_box_get_active (c); ++ if (card < 0) ++ return FALSE; ++ ++ id = g_array_index((GArray*) card_ids, char*, card); ++ ++ /* prefer to write the ID instead of the card number */ ++ if (id) ++ snprintf(cardstr, sizeof (cardstr), "%s", id); ++ else ++ snprintf (cardstr, sizeof (cardstr), "%i", card); ++ ++ success = set_default_card (cardstr); ++ ++ if (success) { ++ /* signal esd to reconnect to the sound card */ ++ char* killargv[] = { "/usr/bin/killall", "-s", "USR1", "/usr/bin/esd", NULL }; ++ g_spawn_sync (NULL, killargv, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); ++ } ++ ++ return success; ++} ++ ++ + /* create_dialog + * + * Create the dialog box and return it as a GtkWidget +@@ -180,6 +344,22 @@ + gtk_image_set_from_file (GTK_IMAGE (WID ("bell_image")), + GNOMECC_DATA_DIR "/pixmaps/visual-bell.png"); + ++ /* setup available sound cards */ ++ GtkComboBox* default_card_combo = GTK_COMBO_BOX (glade_xml_get_widget (dialog, "default_card_combo")); ++ gtk_list_store_clear (GTK_LIST_STORE (gtk_combo_box_get_model (default_card_combo))); ++ gtk_widget_set_sensitive (GTK_WIDGET (default_card_combo), FALSE); ++ if (can_change_card()) { ++ int default_card = get_default_soundcard(); ++ if (default_card >= 0) { ++ GArray *sound_card_ids = g_array_new(FALSE, FALSE, sizeof(char*)); ++ get_soundcards (default_card_combo, sound_card_ids); ++ gtk_combo_box_set_active (default_card_combo, default_card); ++ g_signal_connect (default_card_combo, "changed", ++ (GCallback) default_card_changed, sound_card_ids); ++ gtk_widget_set_sensitive (GTK_WIDGET (default_card_combo), TRUE); ++ } ++ } ++ + gtk_widget_set_size_request (widget, 475, -1); + + if (!CheckXKB()) { +diff -Nur control-center-2.15.3/capplets/sound/sound-properties.glade control-center-2.15.3.new/capplets/sound/sound-properties.glade +--- control-center-2.15.3/capplets/sound/sound-properties.glade 2006-06-11 10:49:12.000000000 +0200 ++++ control-center-2.15.3.new/capplets/sound/sound-properties.glade 2006-07-10 13:05:04.000000000 +0200 +@@ -874,6 +874,71 @@ + True + + ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ True ++ Default sound card: ++ False ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 10 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Test ++ False ++ True ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ 0 ++ True ++ True ++ ++ + + + False --- control-center-2.15.90.orig/debian/patches/19_extra_keybindings.patch +++ control-center-2.15.90/debian/patches/19_extra_keybindings.patch @@ -0,0 +1,112 @@ +diff -Nur control-center-2.15.3/capplets/keybindings/gnome-keybinding-properties.c control-center-2.15.3.new/capplets/keybindings/gnome-keybinding-properties.c +--- control-center-2.15.3/capplets/keybindings/gnome-keybinding-properties.c 2006-04-28 12:36:54.000000000 +0200 ++++ control-center-2.15.3.new/capplets/keybindings/gnome-keybinding-properties.c 2006-07-10 13:02:12.000000000 +0200 +@@ -42,6 +42,7 @@ + { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/email", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/www", ALWAYS_VISIBLE, 0 }, ++ { "/apps/gnome_settings_daemon/keybindings/calculator", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/panel_run_dialog", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/panel_main_menu", ALWAYS_VISIBLE, 0 }, + { "/apps/metacity/global_keybindings/run_command_screenshot", ALWAYS_VISIBLE, 0 }, +@@ -51,6 +52,7 @@ + }; + static const KeyListEntry sounds_key_list[] = + { ++ { "/apps/gnome_settings_daemon/keybindings/music", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/volume_mute", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/volume_down", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/volume_up", ALWAYS_VISIBLE, 0 }, +@@ -512,6 +514,17 @@ + g_free (key_value); + key_entry->description = g_strdup (gconf_schema_get_short_desc (schema)); + ++ if (!strcmp (key_entry->description, "Launch music player")) ++ { ++ g_free (key_entry->description); ++ key_entry->description = g_strdup (_("Launch music player")); ++ } ++ else if (!strcmp (key_entry->description, "Launch calculator")) ++ { ++ g_free (key_entry->description); ++ key_entry->description = g_strdup (_("Launch calculator")); ++ } ++ + if (i == MAX_ELEMENTS_BEFORE_SCROLLING) + { + GtkRequisition rectangle; +diff -Nur control-center-2.15.3/gnome-settings-daemon/actions/acme.h control-center-2.15.3.new/gnome-settings-daemon/actions/acme.h +--- control-center-2.15.3/gnome-settings-daemon/actions/acme.h 2006-04-28 12:35:24.000000000 +0200 ++++ control-center-2.15.3.new/gnome-settings-daemon/actions/acme.h 2006-07-10 13:02:12.000000000 +0200 +@@ -38,6 +38,8 @@ + SCREENSAVER_KEY, + HELP_KEY, + WWW_KEY, ++ MUSIC_KEY, ++ CALCULATOR_KEY, + PLAY_KEY, + PAUSE_KEY, + STOP_KEY, +@@ -69,6 +71,8 @@ + { SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL }, + { HELP_KEY, GCONF_BINDING_DIR "/help", NULL }, + { WWW_KEY, GCONF_BINDING_DIR "/www", NULL }, ++ { MUSIC_KEY, GCONF_BINDING_DIR "/music", NULL }, ++ { CALCULATOR_KEY, GCONF_BINDING_DIR "/calculator", NULL }, + { PLAY_KEY, GCONF_BINDING_DIR "/play", NULL }, + { PAUSE_KEY, GCONF_BINDING_DIR "/pause", NULL }, + { STOP_KEY, GCONF_BINDING_DIR "/stop", NULL }, +diff -Nur control-center-2.15.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.15.3.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c +--- control-center-2.15.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-07-10 13:02:11.000000000 +0200 ++++ control-center-2.15.3.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-07-10 13:02:12.000000000 +0200 +@@ -788,6 +788,12 @@ + + g_free (cmd); + break; ++ case MUSIC_KEY: ++ execute ("rhythmbox", FALSE); ++ break; ++ case CALCULATOR_KEY: ++ execute ("gcalctool", FALSE); ++ break; + case HELP_KEY: + do_help_action (acme); + break; +diff -Nur control-center-2.15.3/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.15.3.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +--- control-center-2.15.3/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-07-10 13:02:11.000000000 +0200 ++++ control-center-2.15.3.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-07-10 13:02:12.000000000 +0200 +@@ -14,6 +14,16 @@ + + + ++ /schemas/apps/gnome_settings_daemon/keybindings/music ++ /apps/gnome_settings_daemon/keybindings/music ++ string ++ 0x76 ++ ++ Launch music player ++ Launch music players's shortcut ++ ++ ++ + /schemas/apps/gnome_settings_daemon/keybindings/volume_mute + /apps/gnome_settings_daemon/keybindings/volume_mute + string +@@ -156,6 +166,17 @@ + + + ++ ++ /schemas/apps/gnome_settings_daemon/keybindings/calculator ++ /apps/gnome_settings_daemon/keybindings/calculator ++ string ++ 0xa1 ++ ++ Launch calculator ++ Launch calculator's shortcut ++ ++ ++ + + + /schemas/apps/gnome_settings_daemon/keybindings/play --- control-center-2.15.90.orig/debian/patches/18_use_stock_icons.patch +++ control-center-2.15.90/debian/patches/18_use_stock_icons.patch @@ -0,0 +1,87 @@ +diff -Nur control-center-2.15.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.15.3.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c +--- control-center-2.15.3/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-06-11 10:49:12.000000000 +0200 ++++ control-center-2.15.3.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-07-10 12:58:18.000000000 +0200 +@@ -63,11 +63,24 @@ + } Acme; + + enum { +- ICON_MUTED, +- ICON_LOUD, ++ ICON_VOLUME_MUTE, ++ ICON_VOLUME_0, ++ ICON_VOLUME_MIN, ++ ICON_VOLUME_MED, ++ ICON_VOLUME_MAX, + ICON_EJECT, + }; + ++static const gchar *images[] = { ++ "stock_volume-mute", ++ "stock_volume-0", ++ "stock_volume-min", ++ "stock_volume-med", ++ "stock_volume-max", ++ PIXMAPSDIR "/acme-eject.png", ++ NULL ++}; ++ + static void + acme_error (char * msg) + { +@@ -137,12 +150,6 @@ + } + } + +-static char *images[] = { +- PIXMAPSDIR "/gnome-speakernotes-muted.png", +- PIXMAPSDIR "/gnome-speakernotes.png", +- PIXMAPSDIR "/acme-eject.png", +-}; +- + static void + acme_image_set (Acme *acme, int icon) + { +@@ -154,7 +161,7 @@ + if (icon > ICON_EJECT) + g_assert_not_reached (); + +- gtk_image_set_from_file (GTK_IMAGE(image), images[icon]); ++ gtk_image_set_from_icon_name (GTK_IMAGE(image), images[icon], GTK_ICON_SIZE_DIALOG); + } + + static void +@@ -170,7 +177,7 @@ + return; + } + acme->dialog = glade_xml_get_widget (acme->xml, "dialog"); +- acme_image_set (acme, ICON_LOUD); ++ acme_image_set (acme, ICON_VOLUME_MAX); + } + } + +@@ -683,6 +690,7 @@ + gboolean muted; + int vol; + int vol_step; ++ int volume_icon; + + if (acme->volobj == NULL) + return; +@@ -726,10 +734,16 @@ + + muted = acme_volume_get_mute(acme->volobj); + dialog_init (acme); +- acme_image_set (acme, muted ? ICON_MUTED : ICON_LOUD); + + vol = acme_volume_get_volume (acme->volobj); + ++ volume_icon = 3 * vol / 100 + 2; ++ if (volume_icon <= 0 || vol <= 0) ++ volume_icon = ICON_VOLUME_MUTE; ++ if (volume_icon >= 4) ++ volume_icon = ICON_VOLUME_MAX; ++ acme_image_set (acme, muted ? ICON_VOLUME_MUTE : volume_icon); ++ + progress = glade_xml_get_widget (acme->xml, "progressbar"); + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progress), + (double) vol / 100); --- control-center-2.15.90.orig/debian/patches/01_debian_ubuntu.patch +++ control-center-2.15.90/debian/patches/01_debian_ubuntu.patch @@ -0,0 +1,21 @@ +diff -Nur control-center-2.13.5.orig/capplets/default-applications/gnome-default-applications.xml.in control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in +--- control-center-2.13.5.orig/capplets/default-applications/gnome-default-applications.xml.in 2006-01-16 16:13:33.000000000 +0100 ++++ control-center-2.13.5/capplets/default-applications/gnome-default-applications.xml.in 2006-01-16 23:02:08.000000000 +0100 +@@ -16,7 +16,7 @@ + opera -newwindow %s + + +- <_name>Debian Sensible Browser ++ <_name>Ubuntu Sensible Browser + sensible-browser + sensible-browser %s + +@@ -238,7 +238,7 @@ + + + +- <_name>Debian Terminal Emulator ++ <_name>Ubuntu Terminal Emulator + x-terminal-emulator + x-terminal-emulator + gnome-mime-application-x-executable --- control-center-2.15.90.orig/debian/patches/12_sort_entries.patch +++ control-center-2.15.90/debian/patches/12_sort_entries.patch @@ -0,0 +1,25 @@ +--- control-center-2.12.1/control-center/control-center-categories.c.orig 2005-05-02 10:05:27.000000000 +0200 ++++ control-center-2.12.1/control-center/control-center-categories.c 2005-11-21 15:16:35.000000000 +0100 +@@ -123,6 +123,14 @@ + g_free (entry); + } + ++static int ++compare_entries (ControlCenterEntry *a, ++ ControlCenterEntry *b) ++{ ++ return strcmp (a->title, b->title); ++} ++ ++ + static void + populate_category (ControlCenterCategory *category, + GMenuTreeDirectory *menu_directory) +@@ -145,6 +153,7 @@ + gmenu_tree_item_unref (item); + } + ++ entries = g_slist_sort (entries, (GCompareFunc) compare_entries); + g_slist_free (items); + + if (entries != NULL) { --- control-center-2.15.90.orig/debian/patches/07_default_keys.patch +++ control-center-2.15.90/debian/patches/07_default_keys.patch @@ -0,0 +1,84 @@ +diff -Nur control-center-2.14.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.14.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +--- control-center-2.14.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-04-10 22:21:48.000000000 +0200 ++++ control-center-2.14.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-04-10 22:26:09.000000000 +0200 +@@ -17,7 +17,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/volume_mute + /apps/gnome_settings_daemon/keybindings/volume_mute + string +- ++ 0xa0 + + Volume mute + Volume mute's shortcut +@@ -29,7 +29,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/volume_down + /apps/gnome_settings_daemon/keybindings/volume_down + string +- ++ 0xae + + Volume down + Volume down's shortcut. +@@ -41,7 +41,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/volume_up + /apps/gnome_settings_daemon/keybindings/volume_up + string +- ++ 0xb0 + + Volume up + Volume up's shortcut. +@@ -65,7 +65,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/eject + /apps/gnome_settings_daemon/keybindings/eject + string +- ++ 0xcc + + Eject + Eject's shortcut. +@@ -89,7 +89,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/search + /apps/gnome_settings_daemon/keybindings/search + string +- ++ 0xe5 + + Search + Search's shortcut. +@@ -101,7 +101,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/email + /apps/gnome_settings_daemon/keybindings/email + string +- ++ 0xec + + E-mail + E-mail's shortcut. +@@ -137,7 +137,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/help + /apps/gnome_settings_daemon/keybindings/help + string +- ++ 0xf5 + + Launch help browser + Launch help browser's shortcut. +@@ -149,7 +149,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/www + /apps/gnome_settings_daemon/keybindings/www + string +- ++ 0xb2 + + Launch web browser + Launch web browser's shortcut. +@@ -173,7 +173,7 @@ + /schemas/apps/gnome_settings_daemon/keybindings/brightness_up + /apps/gnome_settings_daemon/keybindings/brightness_up + string +- ++ 0xa2 + + Brightness up + Brightness up's shortcut. --- control-center-2.15.90.orig/debian/patches/13_unlink_out_of_date_thumbs.patch +++ control-center-2.15.90/debian/patches/13_unlink_out_of_date_thumbs.patch @@ -0,0 +1,49 @@ +diff -Nur control-center-2.11.90.orig/capplets/background/gnome-wp-info.c control-center-2.11.90/capplets/background/gnome-wp-info.c +--- control-center-2.11.90.orig/capplets/background/gnome-wp-info.c 2005-07-14 05:06:24.000000000 +0200 ++++ control-center-2.11.90/capplets/background/gnome-wp-info.c 2005-07-27 16:25:23.000000000 +0200 +@@ -22,6 +22,36 @@ + #include + #include "gnome-wp-info.h" + ++static void _invalidate_thumb (const gchar * uri, const gchar * thumburi) { ++ GnomeVFSFileInfo * info; ++ GnomeVFSResult result; ++ time_t mtime, thumb_mtime; ++ ++ info = gnome_vfs_file_info_new (); ++ result = gnome_vfs_get_file_info (gnome_vfs_escape_path_string (uri), info, ++ GNOME_VFS_FILE_INFO_DEFAULT); ++ if (info != NULL && result == GNOME_VFS_OK) { ++ mtime = info->mtime; ++ } else { ++ mtime = 0; ++ } ++ ++ result = gnome_vfs_get_file_info (gnome_vfs_escape_path_string (thumburi), info, ++ GNOME_VFS_FILE_INFO_DEFAULT); ++ if (info != NULL && result == GNOME_VFS_OK) { ++ thumb_mtime = info->mtime; ++ } else { ++ thumb_mtime = 0; ++ } ++ ++ gnome_vfs_file_info_unref (info); ++ ++ ++ if (!mtime || !thumb_mtime || mtime > thumb_mtime) { ++ gnome_vfs_unlink (thumburi); ++ } ++} ++ + GnomeWPInfo * gnome_wp_info_new (const gchar * uri, + GnomeThumbnailFactory * thumbs) { + GnomeWPInfo * new; +@@ -78,7 +108,7 @@ + md5sum, + ".png", + NULL); +- ++ _invalidate_thumb(uri, new->thumburi); + g_free (md5sum); + } + new->name = g_strdup (info->name); --- control-center-2.15.90.orig/debian/patches/16_gsd-reaper-no-iopipe.patch +++ control-center-2.15.90/debian/patches/16_gsd-reaper-no-iopipe.patch @@ -0,0 +1,26 @@ +--- orig/control-center-2.8.0/gnome-settings-daemon/reaper.c 2004-03-31 13:30:23.000000000 -0800 ++++ control-center-2.8.0/gnome-settings-daemon/reaper.c 2004-10-04 02:39:45.497670576 -0700 +@@ -97,23 +97,6 @@ + struct sigaction action; + int ret; + +- /* Open the signal pipe. */ +- ret = pipe(reaper->iopipe); +- if (ret == -1) { +- g_error(_("Error creating signal pipe.")); +- } +- +- /* Create the channel. */ +- reaper->channel = g_io_channel_unix_new(reaper->iopipe[0]); +- +- /* Add the channel to the source list. */ +- g_io_add_watch_full(reaper->channel, +- G_PRIORITY_HIGH, +- G_IO_IN, +- vte_reaper_emit_signal, +- reaper, +- vte_reaper_channel_destroyed); +- + /* Set the signal handler. */ + action.sa_handler = vte_reaper_signal_handler; + sigemptyset(&action.sa_mask); --- control-center-2.15.90.orig/debian/patches/17_menu-changes.patch +++ control-center-2.15.90/debian/patches/17_menu-changes.patch @@ -0,0 +1,23 @@ +diff -Nur control-center-2.13.91/capplets/accessibility/at-properties/at-properties.desktop.in.in control-center-2.13.91.new/capplets/accessibility/at-properties/at-properties.desktop.in.in +--- control-center-2.13.91/capplets/accessibility/at-properties/at-properties.desktop.in.in 2006-01-24 11:03:10.000000000 +0000 ++++ control-center-2.13.91.new/capplets/accessibility/at-properties/at-properties.desktop.in.in 2006-02-02 10:40:09.000000000 +0000 +@@ -7,7 +7,7 @@ + Terminal=false + Type=Application + StartupNotify=true +-Categories=GNOME;GTK;Settings;Accessibility; ++Categories=GNOME;GTK;Settings; + OnlyShowIn=GNOME; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=control-center +diff -Nur control-center-2.13.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in control-center-2.13.91.new/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in +--- control-center-2.13.91/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-01-24 11:03:11.000000000 +0000 ++++ control-center-2.13.91.new/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in 2006-02-02 10:40:30.000000000 +0000 +@@ -9,6 +9,7 @@ + StartupNotify=true + Categories=GNOME;GTK;Application;Settings;Accessibility; + OnlyShowIn=GNOME; ++NoDisplay=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=control-center + X-GNOME-Bugzilla-Component=Keyboard Accessibility --- control-center-2.15.90.orig/debian/patches/06_disable_update_mime_at_install.patch +++ control-center-2.15.90/debian/patches/06_disable_update_mime_at_install.patch @@ -0,0 +1,64 @@ +diff -puNr control-center-2.10.1.orig/configure.in control-center-2.10.1/configure.in +--- control-center-2.10.1.orig/configure.in 2005-04-10 20:25:10.000000000 +0000 ++++ control-center-2.10.1/configure.in 2005-04-10 20:26:10.000000000 +0000 +@@ -401,6 +401,20 @@ AC_MSG_RESULT($have_fb) + AM_CONDITIONAL(HAVE_FB, test x"$have_fb" = "xyes") + + dnl ============================================== ++dnl Tell if we should or not update mime database ++dnl at install stage ++dnl ============================================== ++AC_ARG_ENABLE(mime-cache, ++AC_HELP_STRING([--disable-mime-cache],[update or not mime datas during install]), ++[case "${enableval}" in ++ yes) update_cache=true ;; ++ no) update_cache=false ;; ++ *) AC_MSG_ERROR(bad value ${enableval} for --disable-mime-cache) ;; ++esac], ++[update_cache=true]) dnl Default value ++AM_CONDITIONAL(UPDATE_MIME_CACHE, test x$update_cache = xtrue) ++ ++dnl ============================================== + dnl Define the main variables + dnl ============================================== + COMMON_CFLAGS="-I\$(top_srcdir)/capplets/common" +diff -puNr control-center-2.10.1.orig/vfs-methods/fontilus/Makefile.am control-center-2.10.1/vfs-methods/fontilus/Makefile.am +--- control-center-2.10.1.orig/vfs-methods/fontilus/Makefile.am 2005-04-10 20:25:10.000000000 +0000 ++++ control-center-2.10.1/vfs-methods/fontilus/Makefile.am 2005-04-10 20:24:59.000000000 +0000 +@@ -49,11 +49,16 @@ else + install-gconf-schemas: + endif + ++if UPDATE_MIME_CACHE + install-desktop-database: install-desktopDATA + update-desktop-database $(DESTDIR)$(desktopdir) + + uninstall-local: + rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache ++else ++install-desktop-database: install-desktopDATA ++uninstall-local: ++endif + + @INTLTOOL_DESKTOP_RULE@ + @INTLTOOL_DIRECTORY_RULE@ +diff -puNr control-center-2.10.1.orig/vfs-methods/themus/Makefile.am control-center-2.10.1/vfs-methods/themus/Makefile.am +--- control-center-2.10.1.orig/vfs-methods/themus/Makefile.am 2005-04-10 20:25:10.000000000 +0000 ++++ control-center-2.10.1/vfs-methods/themus/Makefile.am 2005-04-10 20:24:59.000000000 +0000 +@@ -70,11 +70,16 @@ else + install-gconf-schemas: + endif + ++if UPDATE_MIME_CACHE + install-desktop-database: install-desktopDATA + update-desktop-database $(DESTDIR)$(desktopdir) + + distclean-local: + rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache ++else ++install-desktop-database: install-desktopDATA ++distclean-local: ++endif + + @INTLTOOL_DESKTOP_RULE@ + @INTLTOOL_SCHEMAS_RULE@ --- control-center-2.15.90.orig/debian/patches/22_bkg_capplet_follow_symlink.patch +++ control-center-2.15.90/debian/patches/22_bkg_capplet_follow_symlink.patch @@ -0,0 +1,120 @@ +diff -Nur control-center-2.11.90.orig/capplets/background/gnome-wp-info.c control-center-2.11.90/capplets/background/gnome-wp-info.c +--- control-center-2.11.90.orig/capplets/background/gnome-wp-info.c 2005-07-14 05:06:24.000000000 +0200 ++++ control-center-2.11.90/capplets/background/gnome-wp-info.c 2005-07-27 16:40:25.000000000 +0200 +@@ -65,8 +65,30 @@ + + new->uri = g_strdup (uri); + ++ /* If one have a symlink, resolv it */ ++ if (info->flags & GNOME_VFS_FILE_FLAGS_SYMLINK) { ++ do { ++ if (new->symlink_name) ++ g_free(new->symlink_name); ++ new->symlink_name = g_strdup (info->symlink_name); ++ gnome_vfs_file_info_unref (info); ++ info = gnome_vfs_file_info_new (); ++ ++ result = gnome_vfs_get_file_info (gnome_vfs_escape_path_string (new->symlink_name), info, ++ GNOME_VFS_FILE_INFO_DEFAULT | ++ GNOME_VFS_FILE_INFO_GET_MIME_TYPE | ++ GNOME_VFS_FILE_INFO_FOLLOW_LINKS); ++ ++ if (info == NULL || info->mime_type == NULL || result != GNOME_VFS_OK) { ++ if (info) ++ gnome_vfs_file_info_unref (info); ++ return NULL; ++ } ++ } while (info->flags & GNOME_VFS_FILE_FLAGS_SYMLINK); ++ } ++ + new->thumburi = gnome_thumbnail_factory_lookup (thumbs, +- escaped_path, ++ new->symlink_name ? gnome_vfs_escape_path_string (new->symlink_name) : escaped_path, + info->mtime); + if (new->thumburi == NULL) { + gchar * md5sum; +@@ -75,7 +97,7 @@ + + new->thumburi = g_strconcat (g_get_home_dir (), + "/.thumbnails/normal/", +- md5sum, ++ gnome_thumbnail_md5 (new->symlink_name ? gnome_vfs_escape_path_string (new->symlink_name) : escaped_path), + ".png", + NULL); + +@@ -99,6 +121,7 @@ + new = g_new0 (GnomeWPInfo, 1); + + new->uri = g_strdup (info->uri); ++ new->symlink_name = g_strdup(info->symlink_name); + new->thumburi = g_strdup (info->uri); + + new->name = g_strdup (info->name); +@@ -116,6 +139,7 @@ + } + + g_free (info->uri); ++ g_free (info->symlink_name); + g_free (info->thumburi); + g_free (info->name); + g_free (info->mime_type); +diff -Nur control-center-2.11.90.orig/capplets/background/gnome-wp-info.h control-center-2.11.90/capplets/background/gnome-wp-info.h +--- control-center-2.11.90.orig/capplets/background/gnome-wp-info.h 2005-02-26 20:15:58.000000000 +0100 ++++ control-center-2.11.90/capplets/background/gnome-wp-info.h 2005-07-27 16:36:47.000000000 +0200 +@@ -29,6 +29,7 @@ + + struct _GnomeWPInfo { + gchar * uri; ++ gchar * symlink_name; + gchar * thumburi; + gchar * name; + gchar * mime_type; +diff -Nur control-center-2.11.90.orig/capplets/background/gnome-wp-item.c control-center-2.11.90/capplets/background/gnome-wp-item.c +--- control-center-2.11.90.orig/capplets/background/gnome-wp-item.c 2005-07-10 17:58:14.000000000 +0200 ++++ control-center-2.11.90/capplets/background/gnome-wp-item.c 2005-07-27 16:36:47.000000000 +0200 +@@ -205,17 +205,36 @@ + } else if (!strcmp (item->filename, "(none)")) { + return bgpixbuf; + } else { +- gchar * escaped_path; ++ if (item->fileinfo->symlink_name) { ++ gchar * escaped_path; + +- escaped_path = gnome_vfs_escape_path_string (item->filename); ++ escaped_path = gnome_vfs_escape_path_string (item->fileinfo->symlink_name); ++ ++ pixbuf = gnome_thumbnail_factory_generate_thumbnail (thumbs, ++ escaped_path, ++ item->fileinfo->mime_type); ++ ++ gnome_thumbnail_factory_save_thumbnail (thumbs, pixbuf, ++ escaped_path, ++ item->fileinfo->mtime); ++ ++ g_free (escaped_path); ++ } ++ else { ++ gchar * escaped_path; + +- pixbuf = gnome_thumbnail_factory_generate_thumbnail (thumbs, +- escaped_path, +- item->fileinfo->mime_type); +- gnome_thumbnail_factory_save_thumbnail (thumbs, pixbuf, +- escaped_path, +- item->fileinfo->mtime); +- g_free (escaped_path); ++ escaped_path = gnome_vfs_escape_path_string (item->filename); ++ ++ pixbuf = gnome_thumbnail_factory_generate_thumbnail (thumbs, ++ escaped_path, ++ item->fileinfo->mime_type); ++ ++ gnome_thumbnail_factory_save_thumbnail (thumbs, pixbuf, ++ escaped_path, ++ item->fileinfo->mtime); ++ ++ g_free (escaped_path); ++ } + } + + if (pixbuf != NULL) { --- control-center-2.15.90.orig/debian/patches/08_transparency_for_notication_area_icon.patch +++ control-center-2.15.90/debian/patches/08_transparency_for_notication_area_icon.patch @@ -0,0 +1,91 @@ +diff -Nur control-center-2.14.1/typing-break/eggtrayicon.c control-center-2.14.1.new/typing-break/eggtrayicon.c +--- control-center-2.14.1/typing-break/eggtrayicon.c 2005-10-07 19:40:50.000000000 +0200 ++++ control-center-2.14.1.new/typing-break/eggtrayicon.c 2006-05-05 10:59:35.000000000 +0200 +@@ -67,6 +67,9 @@ + static void egg_tray_icon_realize (GtkWidget *widget); + static void egg_tray_icon_unrealize (GtkWidget *widget); + ++static void egg_tray_icon_add (GtkContainer *container, ++ GtkWidget *widget); ++ + #ifdef GDK_WINDOWING_X11 + static void egg_tray_icon_update_manager_window (EggTrayIcon *icon, + gboolean dock_if_realized); +@@ -113,6 +116,7 @@ + { + GObjectClass *gobject_class = (GObjectClass *)klass; + GtkWidgetClass *widget_class = (GtkWidgetClass *)klass; ++ GtkContainerClass *container_class = (GtkContainerClass *)klass; + + parent_class = g_type_class_peek_parent (klass); + +@@ -121,6 +125,8 @@ + widget_class->realize = egg_tray_icon_realize; + widget_class->unrealize = egg_tray_icon_unrealize; + ++ container_class->add = egg_tray_icon_add; ++ + g_object_class_install_property (gobject_class, + PROP_ORIENTATION, + g_param_spec_enum ("orientation", +@@ -367,6 +373,36 @@ + + #endif + ++static gboolean ++transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data) ++{ ++ gdk_window_clear_area (widget->window, event->area.x, event->area.y, ++ event->area.width, event->area.height); ++ return FALSE; ++} ++ ++static void ++make_transparent_again (GtkWidget *widget, GtkStyle *previous_style, ++ gpointer user_data) ++{ ++ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); ++} ++ ++static void ++make_transparent (GtkWidget *widget, gpointer user_data) ++{ ++ if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget)) ++ return; ++ ++ gtk_widget_set_app_paintable (widget, TRUE); ++ gtk_widget_set_double_buffered (widget, FALSE); ++ gdk_window_set_back_pixmap (widget->window, NULL, TRUE); ++ g_signal_connect (widget, "expose_event", ++ G_CALLBACK (transparent_expose_event), NULL); ++ g_signal_connect_after (widget, "style_set", ++ G_CALLBACK (make_transparent_again), NULL); ++} ++ + static void + egg_tray_icon_realize (GtkWidget *widget) + { +@@ -381,6 +417,8 @@ + if (GTK_WIDGET_CLASS (parent_class)->realize) + GTK_WIDGET_CLASS (parent_class)->realize (widget); + ++ make_transparent (widget, NULL); ++ + screen = gtk_widget_get_screen (widget); + display = gdk_screen_get_display (screen); + xdisplay = gdk_x11_display_get_xdisplay (display); +@@ -413,6 +451,14 @@ + #endif + } + ++static void ++egg_tray_icon_add (GtkContainer *container, GtkWidget *widget) ++{ ++ g_signal_connect (widget, "realize", ++ G_CALLBACK (make_transparent), NULL); ++ GTK_CONTAINER_CLASS (parent_class)->add (container, widget); ++} ++ + EggTrayIcon * + egg_tray_icon_new_for_screen (GdkScreen *screen, const char *name) + { --- control-center-2.15.90.orig/debian/patches/24_theme_dont_require_metacity.patch +++ control-center-2.15.90/debian/patches/24_theme_dont_require_metacity.patch @@ -0,0 +1,15 @@ +--- capplets/theme-switcher/gnome-theme-manager.c.old 2005-06-25 16:26:41.000000000 +0200 ++++ capplets/theme-switcher/gnome-theme-manager.c 2005-06-25 17:10:47.000000000 +0200 +@@ -1453,8 +1453,11 @@ + window_theme_default_name = get_default_string_from_key (METACITY_THEME_KEY); + icon_theme_default_name = get_default_string_from_key (ICON_THEME_KEY); + ++ if (window_theme_default_name == NULL) ++ { ++ window_theme_default_name = g_strdup ("null"); ++ } + if (gtk_theme_default_name == NULL || +- window_theme_default_name == NULL || + icon_theme_default_name == NULL) + { + GtkWidget *msg_dialog; --- control-center-2.15.90.orig/debian/patches/20_keybindings_allow_print.patch +++ control-center-2.15.90/debian/patches/20_keybindings_allow_print.patch @@ -0,0 +1,23 @@ +--- control-center-2.14.1/capplets/keybindings/gnome-keybinding-properties.c 2006-01-30 14:41:53.000000000 +0000 ++++ control-center-2.14.1-new/capplets/keybindings/gnome-keybinding-properties.c 2006-04-23 13:07:02.000000000 +0100 +@@ -656,13 +656,15 @@ accel_edited_callback (GtkCellRendererTe + { + if ((tmp_key.keyval >= GDK_a && tmp_key.keyval <= GDK_z) + || (tmp_key.keyval >= GDK_A && tmp_key.keyval <= GDK_Z) +- || (tmp_key.keyval >= GDK_kana_fullstop && tmp_key.keyval <= GDK_kana_switch) +- || (tmp_key.keyval >= GDK_Arabic_comma && tmp_key.keyval <= GDK_Arabic_switch) ++ || (tmp_key.keyval >= GDK_kana_fullstop && tmp_key.keyval <= GDK_semivoicedsound) ++ || (tmp_key.keyval >= GDK_Arabic_comma && tmp_key.keyval <= GDK_Arabic_sukun) + || (tmp_key.keyval >= GDK_Serbian_dje && tmp_key.keyval <= GDK_Cyrillic_HARDSIGN) +- || (tmp_key.keyval >= GDK_Greek_ALPHAaccent && tmp_key.keyval <= GDK_Greek_switch) +- || (tmp_key.keyval >= GDK_hebrew_doublelowline && tmp_key.keyval <= GDK_Hebrew_switch) ++ || (tmp_key.keyval >= GDK_Greek_ALPHAaccent && tmp_key.keyval <= GDK_Greek_omega) ++ || (tmp_key.keyval >= GDK_hebrew_doublelowline && tmp_key.keyval <= GDK_hebrew_taf) + || (tmp_key.keyval >= GDK_Thai_kokai && tmp_key.keyval <= GDK_Thai_lekkao) +- || (tmp_key.keyval >= GDK_Hangul && tmp_key.keyval <= GDK_Hangul_J_YeorinHieuh)) { ++ || (tmp_key.keyval >= GDK_Hangul && tmp_key.keyval <= GDK_Hangul_Special) ++ || (tmp_key.keyval >= GDK_Hangul_Kiyeog && tmp_key.keyval <= GDK_Hangul_J_YeorinHieuh) ++ || tmp_key.keyval == GDK_Mode_switch) { + GtkWidget *dialog; + char *name; + --- control-center-2.15.90.orig/debian/patches/15_gconf_peditor.patch +++ control-center-2.15.90/debian/patches/15_gconf_peditor.patch @@ -0,0 +1,11 @@ +--- capplets/common/gconf-property-editor.c.orig 2004-10-08 11:43:40.000000000 +0200 ++++ capplets/common/gconf-property-editor.c 2004-10-08 11:44:28.000000000 +0200 +@@ -594,7 +594,7 @@ + if (value != NULL) { + value_wid = peditor->p->conv_to_widget_cb (peditor, value); + entry_current_text = gtk_entry_get_text (GTK_ENTRY (peditor->p->ui_control)); +- if (strcmp (entry_current_text, gconf_value_get_string (value)) != 0) { ++ if ((value->type == GCONF_VALUE_STRING) && strcmp (entry_current_text, gconf_value_get_string (value)) != 0) { + gtk_entry_set_text (GTK_ENTRY (peditor->p->ui_control), gconf_value_get_string (value_wid)); + } + gconf_value_free (value_wid); --- control-center-2.15.90.orig/debian/patches/21_no_sleep_key.patch +++ control-center-2.15.90/debian/patches/21_no_sleep_key.patch @@ -0,0 +1,66 @@ +diff -Nur control-center-2.14.1/capplets/keybindings/gnome-keybinding-properties.c control-center-2.14.1.new/capplets/keybindings/gnome-keybinding-properties.c +--- control-center-2.14.1/capplets/keybindings/gnome-keybinding-properties.c 2006-05-15 00:13:28.000000000 +0200 ++++ control-center-2.14.1.new/capplets/keybindings/gnome-keybinding-properties.c 2006-05-15 00:15:35.000000000 +0200 +@@ -42,7 +42,6 @@ + { + { "/apps/gnome_settings_daemon/keybindings/help", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/power", ALWAYS_VISIBLE, 0 }, +- { "/apps/gnome_settings_daemon/keybindings/sleep", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/screensaver", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/home", ALWAYS_VISIBLE, 0 }, + { "/apps/gnome_settings_daemon/keybindings/search", ALWAYS_VISIBLE, 0 }, +diff -Nur control-center-2.14.1/gnome-settings-daemon/actions/acme.h control-center-2.14.1.new/gnome-settings-daemon/actions/acme.h +--- control-center-2.14.1/gnome-settings-daemon/actions/acme.h 2006-05-15 00:13:27.000000000 +0200 ++++ control-center-2.14.1.new/gnome-settings-daemon/actions/acme.h 2006-05-15 00:15:07.000000000 +0200 +@@ -34,7 +34,6 @@ + HOME_KEY, + SEARCH_KEY, + EMAIL_KEY, +- SLEEP_KEY, + SCREENSAVER_KEY, + HELP_KEY, + WWW_KEY, +@@ -71,7 +70,6 @@ + { HOME_KEY, GCONF_BINDING_DIR "/home", NULL }, + { SEARCH_KEY, GCONF_BINDING_DIR "/search", NULL }, + { EMAIL_KEY, GCONF_BINDING_DIR "/email", NULL }, +- { SLEEP_KEY, GCONF_BINDING_DIR "/sleep", NULL }, + { SCREENSAVER_KEY, GCONF_BINDING_DIR "/screensaver", NULL }, + { HELP_KEY, GCONF_BINDING_DIR "/help", NULL }, + { WWW_KEY, GCONF_BINDING_DIR "/www", NULL }, +diff -Nur control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c control-center-2.14.1.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c +--- control-center-2.14.1/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-05-15 00:13:28.000000000 +0200 ++++ control-center-2.14.1.new/gnome-settings-daemon/gnome-settings-multimedia-keys.c 2006-05-15 00:14:36.000000000 +0200 +@@ -815,9 +815,6 @@ + case EMAIL_KEY: + do_mail_action (acme); + break; +- case SLEEP_KEY: +- do_sleep_action ("apm", "xset dpms force off"); +- break; + case SCREENSAVER_KEY: + if ((cmd = g_find_program_in_path ("gnome-screensaver-command"))) + execute ("gnome-screensaver-command --lock", FALSE); +diff -Nur control-center-2.14.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in control-center-2.14.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in +--- control-center-2.14.1/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-05-15 00:13:27.000000000 +0200 ++++ control-center-2.14.1.new/schemas/apps_gnome_settings_daemon_keybindings.schemas.in 2006-05-15 00:16:12.000000000 +0200 +@@ -118,19 +118,6 @@ + + + +- +- +- /schemas/apps/gnome_settings_daemon/keybindings/sleep +- /apps/gnome_settings_daemon/keybindings/sleep +- string +- +- +- Sleep +- Sleep's shortcut. +- +- +- +- + + /schemas/apps/gnome_settings_daemon/keybindings/screensaver + /apps/gnome_settings_daemon/keybindings/screensaver --- control-center-2.15.90.orig/debian/patches/25_window_manager_settings.patch +++ control-center-2.15.90/debian/patches/25_window_manager_settings.patch @@ -0,0 +1,41 @@ +--- libwindow-settings/Makefile.am 2005-07-20 14:10:55.000000000 +0200 ++++ libwindow-settings/Makefile.am.new 2006-05-10 17:38:27.000000000 +0200 +@@ -1,4 +1,4 @@ +-WM_MODULE_DIR=$(libdir)/window-manager-settings ++WM_MODULE_DIR=$(libdir)/libgnome-window-settings1 + + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ +--- libwindow-settings/Makefile.in 2006-04-10 19:03:25.000000000 +0200 ++++ libwindow-settings/Makefile.in.new 2006-05-10 17:38:53.000000000 +0200 +@@ -353,7 +353,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-WM_MODULE_DIR = $(libdir)/window-manager-settings ++WM_MODULE_DIR = $(libdir)/libgnome-window-settings1 + INCLUDES = \ + -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\" \ +--- capplets/windows/Makefile.am 2004-11-28 09:14:05.000000000 +0100 ++++ capplets/windows/Makefile.am.new 2006-05-10 17:37:25.000000000 +0200 +@@ -17,7 +17,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"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DPIXMAPDIR=\""$(pixmapdir)"\" + +--- capplets/windows/Makefile.in 2006-04-10 19:03:22.000000000 +0200 ++++ capplets/windows/Makefile.in.new 2006-05-10 17:37:41.000000000 +0200 +@@ -358,7 +358,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"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ + -DPIXMAPDIR=\""$(pixmapdir)"\" + --- control-center-2.15.90.orig/debian/patches/10_eggaccelerators.patch +++ control-center-2.15.90/debian/patches/10_eggaccelerators.patch @@ -0,0 +1,16 @@ +diff -Naur control-center-2.6.1/gnome-settings-daemon/eggaccelerators.c control-center-2.6.1-vesuri/gnome-settings-daemon/eggaccelerators.c +--- control-center-2.6.1/gnome-settings-daemon/eggaccelerators.c 2004-04-01 08:45:16.000000000 +0300 ++++ control-center-2.6.1-vesuri/gnome-settings-daemon/eggaccelerators.c 2004-07-01 23:59:49.000000000 +0300 +@@ -352,8 +352,11 @@ + bad_keyval = TRUE; + } + } +- } else if (keycode != NULL) ++ } else if (keycode != NULL) { + *keycode = XKeysymToKeycode (GDK_DISPLAY(), keyval); ++ if (*keycode == 0) ++ bad_keyval = TRUE; ++ } + + accelerator += len; + len -= len; --- control-center-2.15.90.orig/debian/patches/31_call_thunderbird_correctly.patch +++ control-center-2.15.90/debian/patches/31_call_thunderbird_correctly.patch @@ -0,0 +1,21 @@ +--- control-center-2.14.1/capplets/default-applications/gnome-default-applications.xml.in.orig 2006-03-30 03:00:20.000000000 +1100 ++++ control-center-2.14.1/capplets/default-applications/gnome-default-applications.xml.in 2006-05-22 11:30:52.000000000 +1000 +@@ -202,15 +202,15 @@ + + <_name>Thunderbird + thunderbird +- thunderbird -compose %s ++ thunderbird %s + thunderbird + false + + + <_name>Mozilla Thunderbird + mozilla-thunderbird +- mozilla-thunderbird -compose %s +- thunderbird ++ mozilla-thunderbird %s ++ mozilla-thunderbird + false + + --- control-center-2.15.90.orig/debian/patches/04_path_xtra.patch +++ control-center-2.15.90/debian/patches/04_path_xtra.patch @@ -0,0 +1,12 @@ +diff -Nur control-center-2.6.1.orig/configure.in control-center-2.6.1/configure.in +--- control-center-2.6.1.orig/configure.in 2004-05-29 17:57:08.000000000 +0200 ++++ control-center-2.6.1/configure.in 2004-05-29 17:57:25.000000000 +0200 +@@ -49,7 +49,7 @@ + AC_MSG_ERROR([Your Gettext installation doesn't seem to support ngettext to handle translation of plural forms. Please install GNU Gettext]) + fi; + +-AC_PATH_XTRA ++AC_PATH_XTRA( [X11], [X11/Xlib.h], [XSync ()]) + x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + + AC_CHECK_FUNC(XScreenSaverQueryInfo, [ --- control-center-2.15.90.orig/debian/patches/09_locate_pointer.patch +++ control-center-2.15.90/debian/patches/09_locate_pointer.patch @@ -0,0 +1,17 @@ +--- gnome-settings-daemon/gnome-settings-mouse.c.orig 2004-10-09 20:26:54.000000000 +0200 ++++ gnome-settings-daemon/gnome-settings-mouse.c 2004-10-09 20:38:38.000000000 +0200 +@@ -144,11 +144,11 @@ + XAllowEvents (gdk_x11_get_default_xdisplay (), + ReplayKeyboard, + xev->xkey.time); +- XUngrabKeyboard (gdk_x11_get_default_xdisplay (), +- xev->xkey.time); ++ /* XUngrabKeyboard (gdk_x11_get_default_xdisplay (), ++ xev->xkey.time); */ + } + +- return GDK_FILTER_REMOVE; ++ /* return GDK_FILTER_REMOVE; */ + } + return GDK_FILTER_CONTINUE; + } --- control-center-2.15.90.orig/debian/patches/02_xrdb.patch +++ control-center-2.15.90/debian/patches/02_xrdb.patch @@ -0,0 +1,12 @@ +--- gnome-settings-daemon/gnome-settings-xrdb.c.orig 2003-10-27 15:36:50.000000000 +0100 ++++ gnome-settings-daemon/gnome-settings-xrdb.c 2003-10-27 15:37:52.000000000 +0100 +@@ -31,7 +31,7 @@ + #include "gnome-settings-daemon.h" + #include "gnome-settings-xrdb.h" + +-#define SYSTEM_AD_DIR DATADIR "/control-center-2.0/xrdb" ++#define SYSTEM_AD_DIR "/etc/gnome/config" + #define GENERAL_AD SYSTEM_AD_DIR "/General.ad" + #define USER_AD_DIR ".gnome2/xrdb" + #define USER_X_RESOURCES ".Xresources" + --- control-center-2.15.90.orig/debian/libgnome-window-settings-dev.install +++ control-center-2.15.90/debian/libgnome-window-settings-dev.install @@ -0,0 +1,4 @@ +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 + --- control-center-2.15.90.orig/debian/capplets-data.install +++ control-center-2.15.90/debian/capplets-data.install @@ -0,0 +1,17 @@ +debian/tmp/etc +debian/tmp/usr/share/control-center-2.0/xrdb/* etc/gnome/config/ +debian/tmp/usr/share/control-center-2.0/interfaces +debian/tmp/usr/share/control-center-2.0/icons +debian/tmp/usr/share/control-center-2.0/pixmaps/ +debian/tmp/usr/share/pixmaps/*.png +debian/tmp/usr/share/locale +debian/tmp/usr/share/gnome +debian/tmp/usr/share/idl +debian/tmp/etc/gnome-vfs-2.0/modules +debian/tmp/etc/gconf/schemas +debian/tmp/usr/share/applications/*.desktop +debian/tmp/usr/share/dbus-1 +debian/tmp/usr/share/gnome-default-applications/gnome-default-applications.xml +debian/tmp/usr/share/icons/hicolor +debian/tmp/usr/share/omf +debian/tmp/usr/share/desktop-directories --- control-center-2.15.90.orig/debian/gnome-control-center-dev.install +++ control-center-2.15.90/debian/gnome-control-center-dev.install @@ -0,0 +1,2 @@ +debian/tmp/usr/include/gnome-settings-daemon-2.0/gnome-settings-daemon +debian/tmp/usr/lib/pkgconfig/gnome-settings-daemon.pc --- control-center-2.15.90.orig/debian/gnome-control-center.links +++ control-center-2.15.90/debian/gnome-control-center.links @@ -0,0 +1 @@ +usr/lib/control-center/gnome-settings-daemon usr/bin/gnome-settings-daemon --- control-center-2.15.90.orig/debian/control-center2.xpm +++ control-center-2.15.90/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." +}; --- control-center-2.15.90.orig/debian/libgnome-window-settings1.install +++ control-center-2.15.90/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 --- control-center-2.15.90.orig/debian/watch +++ control-center-2.15.90/debian/watch @@ -0,0 +1,4 @@ +version=2 +ftp://ftp.gnome.org/pub/GNOME/sources/control-center/2.14/ \ + control-center-(.*)\.tar\.gz \ + debian uupdate --- control-center-2.15.90.orig/debian/gnome-control-center.dirs +++ control-center-2.15.90/debian/gnome-control-center.dirs @@ -0,0 +1 @@ +usr/share/themes/metacity-1 --- control-center-2.15.90.orig/debian/gnome-control-center.sgml +++ control-center-2.15.90/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. + + + + + + + + --- control-center-2.15.90.orig/debian/gnome-control-center.menu +++ control-center-2.15.90/debian/gnome-control-center.menu @@ -0,0 +1,4 @@ +?package(gnome-control-center):needs="X11" section="Apps/System/Gnome" \ + hints="Gnome" title="Gnome Control Center" \ + icon="/usr/share/pixmaps/control-center2.xpm" \ + command="/usr/bin/gnome-control-center" --- control-center-2.15.90.orig/debian/gnome-control-center.install +++ control-center-2.15.90/debian/gnome-control-center.install @@ -0,0 +1,25 @@ +debian/tmp/usr/bin/gnome-control-center +debian/control-center2.xpm usr/share/pixmaps +debian/tmp/usr/lib/gnome-vfs-2.0/modules/*.so +debian/tmp/usr/lib/control-center/gnome-settings-daemon +debian/tmp/usr/bin/gnome-about-me +debian/tmp/usr/bin/gnome-accessibility-keyboard-properties +debian/tmp/usr/bin/gnome-at-properties +debian/tmp/usr/bin/gnome-default-applications-properties +debian/tmp/usr/bin/gnome-font-properties +debian/tmp/usr/bin/gnome-background-properties +debian/tmp/usr/bin/gnome-keyboard-properties +debian/tmp/usr/bin/gnome-mouse-properties +debian/tmp/usr/bin/gnome-sound-properties +debian/tmp/usr/bin/gnome-theme-manager +debian/tmp/usr/bin/gnome-ui-properties +debian/tmp/usr/bin/gnome-keybinding-properties +debian/tmp/usr/bin/gnome-network-preferences +debian/tmp/usr/bin/gnome-window-properties +debian/tmp/usr/bin/gnome-display-properties +debian/tmp/usr/bin/gnome-theme-thumbnailer +debian/tmp/usr/bin/themus-theme-applier +debian/tmp/usr/bin/gnome-thumbnail-font +debian/tmp/usr/bin/gnome-font-viewer +debian/tmp/usr/bin/gnome-typing-monitor +debian/tmp/usr/lib/nautilus/extensions-1.0/*.so --- control-center-2.15.90.orig/debian/copyright +++ control-center-2.15.90/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Jim Pick jim@jimpick.com on +Sat, 14 Mar 1998 20:12:23 -0800. + +It was downloaded from ftp://ftp.gnome.org/pub/gnome/sources/control-center/2.10/ + +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'. + --- control-center-2.15.90.orig/debian/shlibs.local +++ control-center-2.15.90/debian/shlibs.local @@ -0,0 +1 @@ +libgnome-window-settings 1