--- xfce4-settings-4.6.1.orig/debian/control +++ xfce4-settings-4.6.1/debian/control @@ -0,0 +1,35 @@ +Source: xfce4-settings +Section: xfce +Priority: optional +Maintainer: Xubuntu Developers +XSBC-Original-Maintainer: Debian Xfce Maintainers +Uploaders: Emanuele Rocca , Simon Huggins , Yves-Alexis Perez +Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0), + libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libglade2-dev, + libxfconf-0-dev, libwnck-dev, libxklavier-dev, libnotify-dev, + intltool (>= 0.31), quilt +Standards-Version: 3.8.1 +Homepage: http://www.xfce.org +Vcs-Bzr: lp:~xubuntu-dev/xfce4-settings/karmic +Vcs-Browser: http://bazaar.launchpad.net/~xubuntu-dev/xfce4-settings/karmic/files + +Package: xfce4-settings +Section: xfce +Architecture: any +Depends: ${shlibs:Depends}, xfconf, ${misc:Depends} +Recommends: xfce4-volumed, x11-utils +Conflicts: xfce4-mcs-plugins +Replaces: xfce4-mcs-manager, xfce4-mcs-plugins +Description: graphical application for managing Xfce settings + xfce4-settings is the Xfce settings manager front-end. It comes + with several different components for configuring application-independent + settings inside xfconf. + It contains multiple tools: + - xfce4-settings-manager (which replaces the old mcs settings manager), + which executes the various (provided) settings dialogs + - xfce4-settings-helper: a daemon which provides special features, like + keyboard shortcuts, AccessX notification and update of keyboard and + mouse-pointer data + - xfce4-settings-editor, a tool for editing ALL settings within xfconf, the + graphical counterpart of xfconf-query. + - xfsettingsd, a daemon for exporting XSettings to applications. --- xfce4-settings-4.6.1.orig/debian/xfce4-keyboard-settings.1 +++ xfce4-settings-4.6.1/debian/xfce4-keyboard-settings.1 @@ -0,0 +1,33 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-KEYBOARD-SETTINGS "1" "March 2009" "xfce4-keyboard-settings 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-keyboard-settings \- Keyboard settings for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-keyboard\-settings [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-s\fR, \fB\-\-socket\-id\fR=\fISOCKET\fR ID +Settings manager socket +.TP +\fB\-v\fR, \fB\-\-version\fR +Version information +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/rules +++ xfce4-settings-4.6.1/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +override_dh_auto_configure: + dh_auto_configure -- --enable-libnotify --enable-xcursor \ + --enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\ + --enable-pluggable-dialogs + +override_dh_installman: + dh_installman debian/*.1 + +%: + dh --with quilt $@ --- xfce4-settings-4.6.1.orig/debian/xfce4-mouse-settings.1 +++ xfce4-settings-4.6.1/debian/xfce4-mouse-settings.1 @@ -0,0 +1,36 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-MOUSE-SETTINGS "1" "March 2009" "xfce4-mouse-settings 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-mouse-settings \- Mouse settings for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-mouse\-settings [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-d\fR, \fB\-\-device\fR=\fIDEVICE\fR NAME +Active device in the dialog +.TP +\fB\-s\fR, \fB\-\-socket\-id\fR=\fISOCKET\fR ID +Settings manager socket +.TP +\fB\-v\fR, \fB\-\-version\fR +Version information +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2004-2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/xfce4-settings-helper.1 +++ xfce4-settings-4.6.1/debian/xfce4-settings-helper.1 @@ -0,0 +1,36 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-SETTINGS-HELPER "1" "March 2009" "xfce4-settings-helper 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-settings-helper \- Settings daemon for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-settings\-helper [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-V\fR, \fB\-\-version\fR +Version information +.TP +\fB\-d\fR, \fB\-\-debug\fR +Start in debug mode (don't fork to the background) +.TP +\fB\-\-sm\-client\-id\fR +Client id used when resuming session +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/xfce4-display-settings.1 +++ xfce4-settings-4.6.1/debian/xfce4-display-settings.1 @@ -0,0 +1,30 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-DISPLAY-SETTINGS "1" "March 2009" "xfce4-display-settings 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-display-settings \- Display settings for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-display\-settings [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-v\fR, \fB\-\-version\fR +Version information +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2004-2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/xfsettingsd.1 +++ xfce4-settings-4.6.1/debian/xfsettingsd.1 @@ -0,0 +1,34 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFSETTINGSD "1" "March 2009" "xfsettingsd 4.6.0" "User Commands" +.SH NAME +xfsettingsd \- XSettings daemon for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfsettingsd [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-V\fR, \fB\-\-version\fR +Version information +.TP +\fB\-v\fR, \fB\-\-verbose\fR +Verbose output +.TP +\fB\-f\fR, \fB\-\-force\fR +Replace running xsettings daemon (if any) +.TP +\fB\-d\fR, \fB\-\-debug\fR +Start in debug mode (don't fork to the background) +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use --- xfce4-settings-4.6.1.orig/debian/xfce4-accessibility-settings.1 +++ xfce4-settings-4.6.1/debian/xfce4-accessibility-settings.1 @@ -0,0 +1,33 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-ACCESSIBILITY-SETTINGS "1" "March 2009" "xfce4-accessibility-settings 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-accessibility-settings \- Accessibility settings for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-accessibility\-settings [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-s\fR, \fB\-\-socket\-id\fR=\fISOCKET\fR ID +Settings manager socket +.TP +\fB\-v\fR, \fB\-\-version\fR +Version information +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/changelog +++ xfce4-settings-4.6.1/debian/changelog @@ -0,0 +1,266 @@ +xfce4-settings (4.6.1-2ubuntu3) karmic; urgency=low + + * debian/patches/10_pc.patch + - also add previous patch to the POTFILES.skip + + -- Andreas Moog Fri, 14 Aug 2009 20:39:36 +0200 + +xfce4-settings (4.6.1-2ubuntu2) karmic; urgency=low + + * debian/control: + - Build depend on libxklavier-dev rather than on libxklavier12-dev + * debian/patches/20_fix-libxklavier4.patch + - Fix build with libxklavier4 + + -- Andreas Moog Fri, 14 Aug 2009 20:26:13 +0200 + +xfce4-settings (4.6.1-2ubuntu1) karmic; urgency=low + + [ Mario Limonciello ] + * debian/control: + - Drop unnecessary Recommends on aumix. (LP: #386589) + + [ Lionel Le Folgoc ] + * debian/control: recommends xfce4-volumed instead. + + -- Lionel Le Folgoc Fri, 17 Jul 2009 20:29:09 +0200 + +xfce4-settings (4.6.1-2) unstable; urgency=low + + * debian/patches: + - 01_fix-timeout-startup: avoid timeouting at startup. (Xfce Bug #5040, + Xfce Svn r29991) + - 02_fix-keyrepeat-typo: fix typo in KeyRepeart property name so the + settings is correctly applied. Thanks Sven Marnach! closes: #527238 + + -- Yves-Alexis Perez Tue, 16 Jun 2009 22:13:49 +0200 + +xfce4-settings (4.6.1-1ubuntu2) karmic; urgency=low + + * Re-sync packaging with Debian unstable (so we'll be able to sync the next + revision): + - debian/rules: use dh_overrides, and pass --enable-sound-settings + --enable-pluggable-dialogs to configure script + - debian/manpages: dropped, unneeded + - debian/control: do not build depend on libcanberra-dev, this is not + needed to enable sound settings. + + -- Lionel Le Folgoc Mon, 18 May 2009 20:19:05 +0200 + +xfce4-settings (4.6.1-1ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: + + add build-dep on libcanberra-dev. + - debian/rules: + + enable sound settings. + + enable pluggable dialogs. + * Dropped all patches, merged upstream + + -- Michael Casadevall Tue, 05 May 2009 17:23:13 -0400 + +xfce4-settings (4.6.1-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - remove build-dep on libcanberra as it's useless anyway + - add xfsettings to long description. + - drop build-dep on quilt. + * debian/rules: + - remove quilt rules. + * debian/patches: + - 01_fix-display-settings dropped, included upstream. + - 02_fix-display-rate as well. + + -- Yves-Alexis Perez Sun, 19 Apr 2009 14:24:57 +0200 + +xfce4-settings (4.6.0-2) unstable; urgency=low + + * Upload to unstable! + * debian/control: + - add build-dep on libcanberra-dev. + - add build-dep on quilt. + - update standards version to 3.8.1. + - bump build-dep on debhelper 7.0.50 now we use overrides. + - move to xfce section. + - version the build-dep on libxfcegui4 to 4.6. closes: #522020 + * debian/rules: + - enable sound settings. + - enable pluggable dialogs. + - include quilt rule, add patch/unpatch targets. + * debian/patches/ + - 01_fix-display-settings added, fix display settings application. + - 02_fix-display-rate added, select the correct display rate. + * Add manpages for all binaries. + + -- Yves-Alexis Perez Sat, 04 Apr 2009 01:09:17 +0200 + +xfce4-settings (4.6.0-1ubuntu2) jaunty; urgency=low + + * No-change rebuild to fix lpia shared library dependencies. + + -- Matthias Klose Sun, 22 Mar 2009 16:52:54 +0100 + +xfce4-settings (4.6.0-1ubuntu1) jaunty; urgency=low + + * Cherry-pick from pkg-xfce svn: + - debian/control: + + add build-dep on libcanberra-dev. + + add build-dep on quilt. + - debian/rules: + + enable sound settings. + + enable pluggable dialogs. + + include quilt rule, add patch/unpatch targets. + - debian/patches/ + + 01_fix-display-settings added, fix display settings application. + + 02_fix-display-rate added, select the correct display rate. + - Add manpages for all binaries. + * The two patches listed above fix LP: #331751. + + -- Lionel Le Folgoc Sun, 15 Mar 2009 15:18:31 +0100 + +xfce4-settings (4.6.0-1) experimental; urgency=low + + [ Xfce 4.6 Alpha “Pinkie”] + * Initial release. closes: #516878 + + [ Xfce 4.6 Beta 1 “Fuzzy”] + * New upstream beta release. + * debian/control: + - update build-deps for Fuzzy. + - add build-dep on libwnck-dev, libxklavier12-dev, libnotify-dev. + - add dep on xfconf, or the settings can segfault when run. + * debian/rules: + - explicit enable flags for libnotify, xcursor, xklavier. + - disabled sound settings (canberra) support for now. + + [ Xfce 4.6 Beta 2 “Hopper”] + * New upstream beta release. + * debian/control: + - bump build-deps for “Hopper”. + + [ Xfce 4.6 Beta 3 “Tuco-tuco”] + * new upstream beta release. + * debian/control: + - update build-deps for “Tuco-Tuco”. + - add build-dep on intltool. + - add ${misc:Depends} to Depends: line. + + [ Xfce 4.6 RC1 “Capybara” ] + * new upstream release candidate. + * debian/control: + - update build-deps for “Capybara”. + - add build-dep on libxfcegui4. + + [ Xfce 4.6 ] + * new upstream release. + * debian/control: + - update build-deps for 4.6. + + [ Michael Casadevall ] + * debian/watch: + - Added to track new releases + * debian/copyright: + - Applied patch from Lionel Le Folgoc filling it out + + -- Yves-Alexis Perez Sat, 28 Feb 2009 12:30:43 +0100 + +xfce4-settings (4.6.0-1~ubuntu1) jaunty; urgency=low + + * (Fake-)Sync with Xfce 4.6.0 final with pkg-xfce xfce4-settings/4.6.0-1 + (stuck in Debian NEW). + + -- Lionel Le Folgoc Sun, 01 Mar 2009 15:42:43 +0100 + +xfce4-settings (4.6.0-1) experimental; urgency=low + + [ Xfce 4.6 Alpha “Pinkie”] + * Initial release. closes: #516878 + + [ Xfce 4.6 Beta 1 “Fuzzy”] + * New upstream beta release. + * debian/control: + - update build-deps for Fuzzy. + - add build-dep on libwnck-dev, libxklavier12-dev, libnotify-dev. + - add dep on xfconf, or the settings can segfault when run. + * debian/rules: + - explicit enable flags for libnotify, xcursor, xklavier. + - disabled sound settings (canberra) support for now. + + [ Xfce 4.6 Beta 2 “Hopper”] + * New upstream beta release. + * debian/control: + - bump build-deps for “Hopper”. + + [ Xfce 4.6 Beta 3 “Tuco-tuco”] + * new upstream beta release. + * debian/control: + - update build-deps for “Tuco-Tuco”. + - add build-dep on intltool. + - add ${misc:Depends} to Depends: line. + + [ Xfce 4.6 RC1 “Capybara” ] + * new upstream release candidate. + * debian/control: + - update build-deps for “Capybara”. + - add build-dep on libxfcegui4. + + [ Xfce 4.6 ] + * new upstream release. + * debian/control: + - update build-deps for 4.6. + + [ Michael Casadevall ] + * debian/watch: + - Added to track new releases + * debian/copyright: + - Applied patch from Lionel Le Folgoc filling it out + + -- Yves-Alexis Perez Sat, 28 Feb 2009 12:30:43 +0100 + +xfce4-settings (4.5.99.1-0ubuntu1) jaunty; urgency=low + + * Merged new upstream from pkg-xfce UNRELEASED, remaining Ubuntu changes: + - debian/control: set VCS to point at LP vs. pkg-xfce + * This package can be safely synced across once Debian uploads this package + + -- Lionel Le Folgoc Fri, 06 Feb 2009 12:47:53 +0100 + +xfce4-settings (4.5.99.1-1) UNRELEASED; urgency=low + + [ Xfce 4.6 Alpha “Pinkie”] + * Initial release. closes: #000000 + + [ Xfce 4.6 Beta 1 “Fuzzy”] + * New upstream beta release. + * debian/control: + - update build-deps for Fuzzy. + - add build-dep on libwnck-dev, libxklavier12-dev, libnotify-dev. + - add dep on xfconf, or the settings can segfault when run. + * debian/rules: + - explicit enable flags for libnotify, xcursor, xklavier. + - disabled sound settings (canberra) support for now. + + [ Xfce 4.6 Beta 2 “Hopper”] + * New upstream beta release. + * debian/control: + - bump build-deps for “Hopper”. + + [ Xfce 4.6 Beta 3 “Tuco-tuco”] + * new upstream beta release. + * debian/control: + - update build-deps for “Tuco-Tuco”. + - add build-dep on intltool. + - add ${misc:Depends} to Depends: line. + + [ Xfce 4.6 RC1 “Capybara” ] + * new upstream release candidate. + * debian/control: + - update build-deps for “Capybara”. + - add build-dep on libxfcegui4. + + [ Michael Casadevall ] + * debian/watch: + - Added to track new releases + + -- Michael Casadevall Wed, 04 Feb 2009 11:28:22 -0500 --- xfce4-settings-4.6.1.orig/debian/xfce4-settings-manager.1 +++ xfce4-settings-4.6.1/debian/xfce4-settings-manager.1 @@ -0,0 +1,33 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-SETTINGS-MANAGER "1" "March 2009" "xfce4-settings-manager 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-settings-manager \- Settings manager for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-settings\-manager [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-V\fR, \fB\-\-version\fR +Version information +.TP +\fB\-d\fR, \fB\-\-dialog\fR +Settings dialog to show +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/compat +++ xfce4-settings-4.6.1/debian/compat @@ -0,0 +1 @@ +7 --- xfce4-settings-4.6.1.orig/debian/watch +++ xfce4-settings-4.6.1/debian/watch @@ -0,0 +1,3 @@ +version=3 +http://www.xfce.org/archive/xfce-(.*)/src/ \ + xfce4-settings-(.*)\.tar\.bz2 --- xfce4-settings-4.6.1.orig/debian/copyright +++ xfce4-settings-4.6.1/debian/copyright @@ -0,0 +1,69 @@ +This package was debianized by Yves-Alexis Perez on +Sat, 23 Aug 2008 17:51:19 +0200 + +It was downloaded from http://www.xfce.org + +Upstream Author are: + +Stephan Arts +Brian J. Tarricone +Jannis Pohlmann + + +dialogs/*: + License: GPL-2+ +dialogs/accessibility-settings/*: + © 2008 Stephan Arts +dialogs/appearance-settings/*: + © 2008 Stephan Arts + © 2008 Jannis Pohlmann +dialogs/appearance-settings/images.h: +dialogs/display-settings/*: +dialogs/mouse-settings/*: + © 2008 Nick Schermer +dialogs/keyboard-settings/*: + © 2008 Jannis Pohlmann +dialogs/keyboard-settings/xfce-keyboard-settings.c: + © 2008 Jannis Pohlmann + © 2007 Gauvain Pocentek + +xfce4-settings-editor/*: + © 2008 Stephan Arts + License: GPL-2+ + +xfce4-settings-helper/*: + License: GPL-2+ +xfce4-settings-helper/keyboard-shortcuts.[ch]: + © 2008 Jannis Pohlmann +xfce4-settings-helper/{displays,pointers}.[ch]: + © 2008 Nick Schermer +xfce4-settings-helper/{accessbility,keyboards}.[ch]: + © 2008 Stephan Arts +xfce4-settings-helper/keyboard-layout.[ch]: + © 2008 Olivier Fourdan +xfce4-settings-helper/main.c: + © 2008 Stephan Arts + © 2008 Nick Schermer + © 2008 Jannis Pohlmann +xfce4-settings-helper/workspaces.[ch]: + © 2008 Brian Tarricone + License: GPL-2 + +xfce4-settings-manager/*: + License: GPL-2 +xfce4-settings-manager/main.c: +xfce4-settings-manager/xfce-settings-manager-dialog.[ch]: + © 2008 Brian Tarricone +xfce4-settings-manager/xfce-text-renderer.[ch]: + © 2005-2006 Benedikt Meurer + © 2008 Jannis Pohlmann + License: GPL-2+ + +xfsettingsd/*: + © 2008 Stephan Arts + License: GPL-2+ +xfsettingsd/registry.c: + © 2001 Red Hat, Inc. + +On Debian systems, the complete text of the GNU General Public License (version +2) can be found in the file `/usr/share/common-licenses/GPL-2'. --- xfce4-settings-4.6.1.orig/debian/xfce4-settings-editor.1 +++ xfce4-settings-4.6.1/debian/xfce4-settings-editor.1 @@ -0,0 +1,30 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-SETTINGS-EDITOR "1" "March 2009" "xfce4-settings-editor 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-settings-editor \- Settings editor for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-settings\-editor [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-V\fR, \fB\-\-version\fR +Version information +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2004-2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/xfce4-appearance-settings.1 +++ xfce4-settings-4.6.1/debian/xfce4-appearance-settings.1 @@ -0,0 +1,33 @@ +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36. +.TH XFCE4-APPEARANCE-SETTINGS "1" "March 2009" "xfce4-appearance-settings 4.6.0 (Xfce 4.6.0)" "User Commands" +.SH NAME +xfce4-appearance-settings \- Appearance settings for Xfce +.SH DESCRIPTION +.SS "Usage:" +.IP +xfce4\-appearance\-settings [OPTION...] +.SS "Help Options:" +.TP +\-?, \fB\-\-help\fR +Show help options +.TP +\fB\-\-help\-all\fR +Show all help options +.TP +\fB\-\-help\-gtk\fR +Show GTK+ Options +.SS "Application Options:" +.TP +\fB\-s\fR, \fB\-\-socket\-id\fR=\fISOCKET\fR ID +Settings manager socket +.TP +\fB\-v\fR, \fB\-\-version\fR +Version information +.TP +\fB\-\-display\fR=\fIDISPLAY\fR +X display to use +.SH COPYRIGHT +Copyright \(co 2004-2008 + The Xfce development team. All rights reserved. +.PP +Please report bugs to . --- xfce4-settings-4.6.1.orig/debian/patches/series +++ xfce4-settings-4.6.1/debian/patches/series @@ -0,0 +1,4 @@ +01_fix-timeout-startup.patch +02_fix-keyrepeat-typo.patch +10_pc.patch +20_fix-libxklavier4.patch --- xfce4-settings-4.6.1.orig/debian/patches/20_fix-libxklavier4.patch +++ xfce4-settings-4.6.1/debian/patches/20_fix-libxklavier4.patch @@ -0,0 +1,16 @@ +Description: Fix build with libxklavier4 +Origin: http://bugs.gentoo.org/278379 + +Index: xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c +=================================================================== +--- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-08-14 20:25:02.566226776 +0200 ++++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c 2009-08-14 20:25:36.658221863 +0200 +@@ -378,7 +378,7 @@ + xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine); + + settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine); +- xkl_config_registry_load (settings->priv->xkl_registry); ++ xkl_config_registry_load (settings->priv->xkl_registry,FALSE); + + /* Tab */ + xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox"); --- xfce4-settings-4.6.1.orig/debian/patches/02_fix-keyrepeat-typo.patch +++ xfce4-settings-4.6.1/debian/patches/02_fix-keyrepeat-typo.patch @@ -0,0 +1,13 @@ +diff --git a/dialogs/keyboard-settings/xfce-keyboard-settings.c b/dialogs/keyboard-settings/xfce-keyboard-settings.c +index d372ee9..d1cb69c 100644 +--- a/dialogs/keyboard-settings/xfce-keyboard-settings.c ++++ b/dialogs/keyboard-settings/xfce-keyboard-settings.c +@@ -322,7 +322,7 @@ xfce_keyboard_settings_constructed (GObject *object) + xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Rate", G_TYPE_INT, G_OBJECT (xkb_key_repeat_rate_scale), "value"); + + xkb_key_repeat_delay_scale = gtk_range_get_adjustment (GTK_RANGE (glade_xml_get_widget (settings->priv->glade_xml, "xkb_key_repeat_delay_scale"))); +- xfconf_g_property_bind (settings->priv->keyboards_channel, "/DefaultKeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value"); ++ xfconf_g_property_bind (settings->priv->keyboards_channel, "/Default/KeyRepeat/Delay", G_TYPE_INT, G_OBJECT (xkb_key_repeat_delay_scale), "value"); + + /* XSETTINGS */ + net_cursor_blink_check = glade_xml_get_widget (settings->priv->glade_xml, "net_cursor_blink_check"); --- xfce4-settings-4.6.1.orig/debian/patches/10_pc.patch +++ xfce4-settings-4.6.1/debian/patches/10_pc.patch @@ -0,0 +1,9 @@ +diff --git a/po/POTFILES.skip b/po/POTFILES.skip +new file mode 100644 +index 0000000..7d4b0ca +--- /dev/null ++++ b/po/POTFILES.skip +@@ -0,0 +1,3 @@ ++.pc/01_fix-timeout-startup.patch/xfce4-settings-helper/main.c ++.pc/02_fix-keyrepeat-typo.patch/dialogs/keyboard-settings/xfce-keyboard-settings.c ++.pc/20_fix-libxklavier4.patch/dialogs/keyboard-settings/xfce-keyboard-settings.c --- xfce4-settings-4.6.1.orig/debian/patches/01_fix-timeout-startup.patch +++ xfce4-settings-4.6.1/debian/patches/01_fix-timeout-startup.patch @@ -0,0 +1,213 @@ +commit fa550da4a52172b4074922a2962c44613e96e3f0 +Author: kelnos +Date: Thu Jun 4 09:19:51 2009 +0000 + + avoid timing out xfce4-session on startup (bug 5040) + + xfce4-settings-helper was trying to be clever to migrate itself from + autostart to the actual session. it was doing a poor job. this should + keep the cleverness, but make sure it always connects to the session + manager and makes sure the SM can continue. it also allows the copy of + x-s-h that was started via the session (and not autostart) to force + itself to start, even if it's already running. the other instance will + lose its hold on the selection, notice, and quit. + + git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29991 a0aa69c2-05f4-0310-b83c-d5d913b14636 + +diff --git a/xfce4-settings-helper/main.c b/xfce4-settings-helper/main.c +index c0e7712..1553c58 100644 +--- a/xfce4-settings-helper/main.c ++++ b/xfce4-settings-helper/main.c +@@ -60,7 +60,14 @@ + #include "displays.h" + #endif + ++#define SELECTION_NAME "_XFCE_SETTINGS_HELPER" + ++static GdkFilterReturn xfce_settings_helper_selection_watcher (GdkXEvent *xevt, ++ GdkEvent *evt, ++ gpointer user_data); ++ ++ ++static SessionClient *sm_client = NULL; + + static gboolean opt_version = FALSE; + static gboolean opt_debug = FALSE; +@@ -124,15 +131,14 @@ xfce_settings_helper_set_autostart_enabled (gboolean enabled) + } + + +-/* returns TRUE if we're now connected to the SM, FALSE otherwise */ ++/* returns TRUE if we got started by the SM and our client ID was ++ * valid, FALSE otherwise */ + static gboolean + xfce_settings_helper_connect_session (int argc, + char **argv, + const gchar *sm_client_id, + gboolean debug_mode) + { +- SessionClient *sm_client; +- + /* we can't be sure that the SM will save the session later, so we only + * disable the autostart item if we're launching because we got *resumed* + * from a previous session. */ +@@ -148,69 +154,96 @@ xfce_settings_helper_connect_session (int argc, + { + g_warning ("Failed to connect to session manager"); + client_session_free (sm_client); +- xfce_settings_helper_set_autostart_enabled (TRUE); ++ sm_client = NULL; + return FALSE; + } + + if (sm_client_id && !g_ascii_strcasecmp (sm_client_id, sm_client->given_client_id)) + { + /* we passed a client id, and got the same one back, which means +- * we were definitely restarted as a part of the session. so +- * it's safe to disable the autostart item. */ +- xfce_settings_helper_set_autostart_enabled (FALSE); ++ * we were definitely restarted as a part of the session. */ + return TRUE; + } + +- /* otherwise, let's just ensure the autostart item is enabled. */ +- xfce_settings_helper_set_autostart_enabled (TRUE); +- +- return TRUE; ++ return FALSE; + } + + ++#ifdef GDK_WINDOWING_X11 ++static GdkFilterReturn ++xfce_settings_helper_selection_watcher (GdkXEvent *xevt, ++ GdkEvent *evt, ++ gpointer user_data) ++{ ++ Window xwin = GPOINTER_TO_UINT(user_data); ++ XEvent *xe = (XEvent *)xevt; ++ ++ if (xe->type == SelectionClear && xe->xclient.window == xwin) ++ { ++ if (sm_client) ++ client_session_set_restart_style (sm_client, SESSION_RESTART_IF_RUNNING); ++ signal_handler (SIGINT, NULL); ++ } ++ ++ return GDK_FILTER_CONTINUE; ++} ++#endif ++ + static gboolean +-xfce_settings_helper_acquire_selection () ++xfce_settings_helper_acquire_selection (gboolean force) + { + #ifdef GDK_WINDOWING_X11 + GdkDisplay *gdpy = gdk_display_get_default (); ++ GtkWidget *invisible; + Display *dpy = GDK_DISPLAY_XDISPLAY (gdpy); + GdkWindow *rootwin = gdk_screen_get_root_window (gdk_display_get_screen (gdpy, 0)); + Window xroot = GDK_WINDOW_XID (rootwin); +- Window xwin; +- Atom selection_atom, manager_atom; ++ GdkAtom selection_atom; ++ Atom selection_atom_x11; + XClientMessageEvent xev; + +- xwin = XCreateSimpleWindow (dpy, xroot, -100, -100, 1, 1, 0, 0, +- XBlackPixel (GDK_DISPLAY (), 0)); +- XSelectInput (dpy, xwin, PropertyChangeMask | StructureNotifyMask); ++ selection_atom = gdk_atom_intern (SELECTION_NAME, FALSE); ++ selection_atom_x11 = gdk_x11_atom_to_xatom_for_display (gdpy, selection_atom); ++ ++ /* can't use gdk for the selection owner here because it returns NULL ++ * if the selection owner is in another process */ ++ if (!force && XGetSelectionOwner (dpy, selection_atom_x11) != None) ++ return FALSE; + +- selection_atom = XInternAtom (dpy, "_XFCE_SETTINGS_HELPER", False); +- manager_atom = XInternAtom (dpy, "MANAGER", False); ++ invisible = gtk_invisible_new (); ++ gtk_widget_realize (invisible); ++ gtk_widget_add_events (invisible, GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK); + +- if (XGetSelectionOwner (dpy, selection_atom) != None) ++ if (!gdk_selection_owner_set_for_display (gdpy, invisible->window, ++ selection_atom, GDK_CURRENT_TIME, ++ TRUE)) + { +- XDestroyWindow (dpy, xwin); ++ g_critical ("Unable to get selection " SELECTION_NAME); ++ gtk_widget_destroy (invisible); + return FALSE; + } + +- XSetSelectionOwner (dpy, selection_atom, xwin, CurrentTime); +- +- if (XGetSelectionOwner (dpy, selection_atom) != xwin) ++ /* but we can use gdk here since we only care if it's our window */ ++ if (gdk_selection_owner_get_for_display (gdpy, selection_atom) != invisible->window) + { +- XDestroyWindow (dpy, xwin); ++ gtk_widget_destroy (invisible); + return FALSE; + } + + xev.type = ClientMessage; + xev.window = xroot; +- xev.message_type = manager_atom; ++ xev.message_type = gdk_x11_get_xatom_by_name_for_display (gdpy, "MANAGER"); + xev.format = 32; + xev.data.l[0] = CurrentTime; +- xev.data.l[1] = selection_atom; +- xev.data.l[2] = xwin; ++ xev.data.l[1] = selection_atom_x11; ++ xev.data.l[2] = GDK_WINDOW_XID (invisible->window); + xev.data.l[3] = xev.data.l[4] = 0; + + XSendEvent (dpy, xroot, False, StructureNotifyMask, (XEvent *)&xev); ++ ++ gdk_window_add_filter (invisible->window, ++ xfce_settings_helper_selection_watcher, ++ GUINT_TO_POINTER (GDK_WINDOW_XID (invisible->window))); + #endif + + return TRUE; +@@ -221,6 +254,7 @@ gint + main (gint argc, gchar **argv) + { + GError *error = NULL; ++ gboolean in_session; + GObject *pointer_helper; + GObject *keyboards_helper; + GObject *accessibility_helper; +@@ -284,12 +318,19 @@ main (gint argc, gchar **argv) + return EXIT_FAILURE; + } + +- if (!xfce_settings_helper_acquire_selection ()) ++ /* connect to session always, even if we quit below. this way the ++ * session manager won't wait for us to time out. */ ++ in_session = xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug); ++ ++ if (!xfce_settings_helper_acquire_selection (in_session)) + { + g_printerr ("%s is already running\n", G_LOG_DOMAIN); + return EXIT_FAILURE; + } + ++ /* if we were restarted as part of the session, remove us from autostart */ ++ xfce_settings_helper_set_autostart_enabled (!in_session); ++ + /* daemonize the process when not running in debug mode */ + if (!opt_debug) + { +@@ -308,8 +349,6 @@ main (gint argc, gchar **argv) + } + } + +- xfce_settings_helper_connect_session (argc, argv, opt_sm_client_id, opt_debug); +- + /* create the sub daemons */ + pointer_helper = g_object_new (XFCE_TYPE_POINTERS_HELPER, NULL); + keyboards_helper = g_object_new (XFCE_TYPE_KEYBOARDS_HELPER, NULL);