[Pkg-xfce-commits] r2954 - in desktop/trunk/xfce4-settings/debian: . patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Sun Mar 15 13:23:11 UTC 2009
Author: corsac
Date: 2009-03-15 13:23:10 +0000 (Sun, 15 Mar 2009)
New Revision: 2954
Added:
desktop/trunk/xfce4-settings/debian/patches/02_fix-display-rate.patch
desktop/trunk/xfce4-settings/debian/patches/series
desktop/trunk/xfce4-settings/debian/xfce4-accessibility-settings.1
desktop/trunk/xfce4-settings/debian/xfce4-appearance-settings.1
desktop/trunk/xfce4-settings/debian/xfce4-display-settings.1
desktop/trunk/xfce4-settings/debian/xfce4-keyboard-settings.1
desktop/trunk/xfce4-settings/debian/xfce4-mouse-settings.1
desktop/trunk/xfce4-settings/debian/xfce4-settings-editor.1
desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1
desktop/trunk/xfce4-settings/debian/xfce4-settings-manager.1
desktop/trunk/xfce4-settings/debian/xfsettingsd.1
Modified:
desktop/trunk/xfce4-settings/debian/changelog
desktop/trunk/xfce4-settings/debian/control
desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch
desktop/trunk/xfce4-settings/debian/rules
Log:
* Upload to unstable!
- update standards version to 3.8.1.
- bump build-dep on debhelper 7.0.50 now we use overrides.
- 02_fix-display-rate added, select the correct display rate.
* Add manpages for all binaries.
Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog 2009-03-15 12:29:52 UTC (rev 2953)
+++ desktop/trunk/xfce4-settings/debian/changelog 2009-03-15 13:23:10 UTC (rev 2954)
@@ -1,16 +1,21 @@
xfce4-settings (4.6.0-2) UNRELEASED; 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.
* 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 <corsac at debian.org> Wed, 11 Mar 2009 23:38:34 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Mar 2009 13:57:22 +0100
xfce4-settings (4.6.0-1) experimental; urgency=low
Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control 2009-03-15 12:29:52 UTC (rev 2953)
+++ desktop/trunk/xfce4-settings/debian/control 2009-03-15 13:23:10 UTC (rev 2954)
@@ -3,11 +3,11 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel at lists.alioth.debian.org>
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
-Build-Depends: debhelper (>= 7.0.13), libxfce4util-dev (>= 4.6.0),
+Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0),
libxfcegui4-dev, libexo-0.3-dev (>= 0.3.100), libglade2-dev,
libxfconf-0-dev, libwnck-dev, libxklavier12-dev, libnotify-dev,
intltool (>= 0.31), libcanberra-dev, quilt
-Standards-Version: 3.8.0
+Standards-Version: 3.8.1
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfconf
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfconf/
Modified: desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch 2009-03-15 12:29:52 UTC (rev 2953)
+++ desktop/trunk/xfce4-settings/debian/patches/01_fix-display-settings.patch 2009-03-15 13:23:10 UTC (rev 2954)
@@ -1,11 +1,13 @@
-commit 2c0e40bfbb3ead26353861e3566c653085e977a3
-Author: nick <nick at a0aa69c2-05f4-0310-b83c-d5d913b14636>
-Date: Wed Mar 11 18:00:30 2009 +0000
+From 2c0e40bfbb3ead26353861e3566c653085e977a3 Mon Sep 17 00:00:00 2001
+From: nick <nick at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date: Wed, 11 Mar 2009 18:00:30 +0000
+Subject: [PATCH 1/3] Remove unsigned clamp macro that broke applying the display settings (bug #4966).
- Remove unsigned clamp macro that broke applying the display settings (bug #4966).
-
-
- git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29650 a0aa69c2-05f4-0310-b83c-d5d913b14636
+git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29650 a0aa69c2-05f4-0310-b83c-d5d913b14636
+---
+ NEWS | 2 ++
+ dialogs/display-settings/xfce-randr-legacy.c | 7 +------
+ 2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/dialogs/display-settings/xfce-randr-legacy.c b/dialogs/display-settings/xfce-randr-legacy.c
index 53b272e..95bc823 100644
@@ -32,3 +34,6 @@
resolution = g_strdup_printf ("%dx%d", sizes[size].width, sizes[size].height);
g_snprintf (property, sizeof (property), "/%s/Screen_%d/Resolution", scheme, n);
xfconf_channel_set_string (channel, property, resolution);
+--
+1.6.2
+
Added: desktop/trunk/xfce4-settings/debian/patches/02_fix-display-rate.patch
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/02_fix-display-rate.patch (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/02_fix-display-rate.patch 2009-03-15 13:23:10 UTC (rev 2954)
@@ -0,0 +1,32 @@
+From 8af8c9763d4acde859c1c565a87a2812a6bf4408 Mon Sep 17 00:00:00 2001
+From: nick <nick at a0aa69c2-05f4-0310-b83c-d5d913b14636>
+Date: Sun, 15 Mar 2009 11:55:41 +0000
+Subject: [PATCH 3/3] Select the correct refresh rate in the display dialog
+ on startup (bug #4966).
+
+git-svn-id: http://svn.xfce.org/svn/xfce/xfce4-settings/trunk@29667 a0aa69c2-05f4-0310-b83c-d5d913b14636
+---
+ NEWS | 2 +-
+ dialogs/display-settings/main.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dialogs/display-settings/main.c b/dialogs/display-settings/main.c
+index 908f255..f30cd37 100644
+--- a/dialogs/display-settings/main.c
++++ b/dialogs/display-settings/main.c
+@@ -296,10 +296,10 @@ display_setting_refresh_rates_populate (GladeXML *gxml)
+ /* get the active rate closest to the current diff */
+ diff = ABS (rates[n] - XFCE_RANDR_LEGACY_RATE (xfce_randr_legacy));
+
+- /* store active*/
++ /* store active */
+ if (active_diff > diff)
+ {
+- active = n;
++ active = nrates - n - 1;
+ active_diff = diff;
+ }
+ }
+--
+1.6.2
+
Added: desktop/trunk/xfce4-settings/debian/patches/series
===================================================================
--- desktop/trunk/xfce4-settings/debian/patches/series (rev 0)
+++ desktop/trunk/xfce4-settings/debian/patches/series 2009-03-15 13:23:10 UTC (rev 2954)
@@ -0,0 +1,2 @@
+01_fix-display-settings.patch
+02_fix-display-rate.patch
Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules 2009-03-15 12:29:52 UTC (rev 2953)
+++ desktop/trunk/xfce4-settings/debian/rules 2009-03-15 13:23:10 UTC (rev 2954)
@@ -1,19 +1,19 @@
#!/usr/bin/make -f
include /usr/share/quilt/quilt.make
-build: build-stamp patch
+build: patch
+ echo .pc >> po/POTFILES.skip
clean: unpatch
dh clean
-build-stamp:
- dh build --before configure
+override_dh_auto_configure:
dh_auto_configure -- --enable-libnotify --enable-xcursor \
--enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\
--enable-pluggable-dialogs
- dh build --after configure
- touch build-stamp
+override_dh_installman:
+ dh_installman debian/*.1
%:
dh $@
Added: desktop/trunk/xfce4-settings/debian/xfce4-accessibility-settings.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-accessibility-settings.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-accessibility-settings.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfce4-appearance-settings.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-appearance-settings.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-appearance-settings.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfce4-display-settings.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-display-settings.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-display-settings.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfce4-keyboard-settings.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-keyboard-settings.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-keyboard-settings.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfce4-mouse-settings.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-mouse-settings.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-mouse-settings.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfce4-settings-editor.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-settings-editor.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-settings-editor.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfce4-settings-manager.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-settings-manager.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-settings-manager.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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 <http://bugzilla.xfce.org/>.
Added: desktop/trunk/xfce4-settings/debian/xfsettingsd.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfsettingsd.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfsettingsd.1 2009-03-15 13:23:10 UTC (rev 2954)
@@ -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
More information about the Pkg-xfce-commits
mailing list