[Pkg-xfce-commits] r7416 - in desktop/trunk/xfce4-settings: . debian
Yves-Alexis Perez
corsac at alioth.debian.org
Tue May 21 08:19:57 UTC 2013
Author: corsac
Date: 2013-05-21 20:19:56 +0000 (Tue, 21 May 2013)
New Revision: 7416
Added:
desktop/trunk/xfce4-settings/debian/patches/
desktop/trunk/xfce4-settings/debian/postinst
desktop/trunk/xfce4-settings/debian/postrm
desktop/trunk/xfce4-settings/debian/preinst
desktop/trunk/xfce4-settings/debian/xfce4-mime-settings.1
Removed:
desktop/trunk/xfce4-settings/debian/patches/
desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1
Modified:
desktop/trunk/xfce4-settings/
desktop/trunk/xfce4-settings/debian/changelog
desktop/trunk/xfce4-settings/debian/control
desktop/trunk/xfce4-settings/debian/rules
desktop/trunk/xfce4-settings/debian/xfsettingsd.1
Log:
merge changes from experimental
Property changes on: desktop/trunk/xfce4-settings
___________________________________________________________________
Added: svn:mergeinfo
+ /desktop/branches/experimental/xfce4-settings:3768-7388
/desktop/tags/xfce4-settings/4.6.3-3:3626-3720
Modified: desktop/trunk/xfce4-settings/debian/changelog
===================================================================
--- desktop/trunk/xfce4-settings/debian/changelog 2013-05-21 20:15:18 UTC (rev 7415)
+++ desktop/trunk/xfce4-settings/debian/changelog 2013-05-21 20:19:56 UTC (rev 7416)
@@ -1,3 +1,48 @@
+xfce4-settings (4.10.0-1) experimental; urgency=low
+
+ * New upstream stable release.
+ * debian/control: revert to unversioned libxfce4util-dev, bump required
+ versions for Xfce 4.10.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sat, 05 May 2012 09:48:01 +0200
+
+xfce4-settings (4.9.5-1) experimental; urgency=low
+
+ * New upstream development release.
+ * debian/rules: drop po/POTFILES.skip handling, unneeded.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 15 Apr 2012 15:40:11 +0200
+
+xfce4-settings (4.9.4-1) experimental; urgency=low
+
+ [ Lionel Le Folgoc ]
+ * New upstream development release.
+ * debian/control:
+ - bump libxfce4ui-1-dev b-dep to >= 4.9.0 and libexo-1-dev to >= 0.7.1.
+ - switch to libxfce4util6-dev for the new api.
+ - depends on libgarcon-common >= 0.1.10 for the new categories.
+ - remove xfce4-settings-helper from the long desc.
+ * debian/xfce4-settings-helper.1: dropped.
+ * debian/patches:
+ - 01_use-tango-icon-theme.patch: update to apply cleanly.
+ - 02_fix-error-in-italian-translation.patch: dropped, included upstream.
+ * debian/postinst,debian/preinst,debian/postrm: handle removal of
+ xfce4-settings-helper's autostart desktop file.
+ * debian/xfsettingsd.1: refreshed for the new options.
+ * debian/rules:
+ - drop obsolete --enable-xsettings-daemon configure option.
+ * debian/xfce4-mime-settings.1: added, for the new binary.
+
+ [ Yves-Alexis Perez ]
+ * debian/watch updated to track all releases.
+ * debian/control:
+ - update standards version to 3.9.3.
+ - add build-dep on garcon.
+ * debian/rules:
+ - build with --parallel.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com> Sun, 08 Apr 2012 16:30:17 +0200
+
xfce4-settings (4.8.3-3) UNRELEASED; urgency=low
* debian/patches: add missing DEP3 headers.
Modified: desktop/trunk/xfce4-settings/debian/control
===================================================================
--- desktop/trunk/xfce4-settings/debian/control 2013-05-21 20:15:18 UTC (rev 7415)
+++ desktop/trunk/xfce4-settings/debian/control 2013-05-21 20:19:56 UTC (rev 7416)
@@ -5,12 +5,12 @@
Uploaders: Yves-Alexis Perez <corsac at debian.org>,
Lionel Le Folgoc <mrpouit at gmail.com>
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1),
- libxfce4util-dev (>= 4.8.0),
- libxfce4ui-1-dev (>= 4.8.0), libexo-1-dev (>= 0.6.0),
- libxfconf-0-dev (>= 4.8.0), libwnck-dev, libxklavier-dev (>= 5.0),
- libnotify-dev, intltool (>= 0.31)
+ libxfce4util-dev (>= 4.10.0), libxfce4ui-1-dev (>= 4.10.0),
+ libexo-1-dev (>= 0.8.0), libxfconf-0-dev (>= 4.10.0), libwnck-dev,
+ libxklavier-dev (>= 5.0), libnotify-dev, intltool (>= 0.31),
+ libgarcon-1-0-dev (>= 0.2.0)
Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
Homepage: http://www.xfce.org
Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/xfce4-settings
Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/xfce4-settings/
@@ -18,7 +18,7 @@
Package: xfce4-settings
Section: xfce
Architecture: any
-Depends: ${shlibs:Depends}, xfconf, ${misc:Depends}
+Depends: ${shlibs:Depends}, xfconf, libgarcon-common (>= 0.2.0), ${misc:Depends}
Recommends: xfce4-volumed, x11-utils
Conflicts: xfce4-mcs-plugins
Replaces: xfce4-mcs-manager, xfce4-mcs-plugins
@@ -29,9 +29,8 @@
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.
+ - xfsettingsd, a daemon for exporting XSettings to applications, and
+ providing special features like keyboard shortcuts, AccessX notification
+ and update of keyboard and mouse-pointer data.
Copied: desktop/trunk/xfce4-settings/debian/postinst (from rev 7388, desktop/branches/experimental/xfce4-settings/debian/postinst)
===================================================================
--- desktop/trunk/xfce4-settings/debian/postinst (rev 0)
+++ desktop/trunk/xfce4-settings/debian/postinst 2013-05-21 20:19:56 UTC (rev 7416)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+LASTVER="4.9.0"
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper rm_conffile \
+ /etc/xdg/autostart/xfce4-settings-helper-autostart.desktop "$LASTVER" -- "$@"
+fi
+
+#DEBHELPER#
Copied: desktop/trunk/xfce4-settings/debian/postrm (from rev 7388, desktop/branches/experimental/xfce4-settings/debian/postrm)
===================================================================
--- desktop/trunk/xfce4-settings/debian/postrm (rev 0)
+++ desktop/trunk/xfce4-settings/debian/postrm 2013-05-21 20:19:56 UTC (rev 7416)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+LASTVER="4.9.0"
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper rm_conffile \
+ /etc/xdg/autostart/xfce4-settings-helper-autostart.desktop "$LASTVER" -- "$@"
+fi
+
+#DEBHELPER#
Copied: desktop/trunk/xfce4-settings/debian/preinst (from rev 7388, desktop/branches/experimental/xfce4-settings/debian/preinst)
===================================================================
--- desktop/trunk/xfce4-settings/debian/preinst (rev 0)
+++ desktop/trunk/xfce4-settings/debian/preinst 2013-05-21 20:19:56 UTC (rev 7416)
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+LASTVER="4.9.0"
+
+if dpkg-maintscript-helper supports rm_conffile; then
+ dpkg-maintscript-helper rm_conffile \
+ /etc/xdg/autostart/xfce4-settings-helper-autostart.desktop "$LASTVER" -- "$@"
+fi
+
+#DEBHELPER#
Modified: desktop/trunk/xfce4-settings/debian/rules
===================================================================
--- desktop/trunk/xfce4-settings/debian/rules 2013-05-21 20:15:18 UTC (rev 7415)
+++ desktop/trunk/xfce4-settings/debian/rules 2013-05-21 20:19:56 UTC (rev 7416)
@@ -6,8 +6,7 @@
override_dh_auto_configure:
find .pc -type f -name '*.c' -exec echo '{}' >> po/POTFILES.skip \;
dh_auto_configure -- --enable-libnotify --enable-xcursor \
- --enable-libxklavier --enable-xsettings-daemon --enable-sound-settings\
- --enable-pluggable-dialogs
+ --enable-libxklavier --enable-sound-settings --enable-pluggable-dialogs
override_dh_auto_clean:
rm -f po/POTFILES.skip
@@ -17,4 +16,4 @@
dh_installman debian/*.1
%:
- dh $@
+ dh $@ --parallel
Copied: desktop/trunk/xfce4-settings/debian/xfce4-mime-settings.1 (from rev 7388, desktop/branches/experimental/xfce4-settings/debian/xfce4-mime-settings.1)
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-mime-settings.1 (rev 0)
+++ desktop/trunk/xfce4-settings/debian/xfce4-mime-settings.1 2013-05-21 20:19:56 UTC (rev 7416)
@@ -0,0 +1,31 @@
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.7.
+.TH XFCE4-MIME-SETTINGS "1" "April 2012" "xfce4-mime-settings 4.9.3 (Xfce 4.10)" "User Commands"
+.SH NAME
+xfce4-mime-settings \- MIME settings for Xfce
+.SH DESCRIPTION
+.SS "Usage:"
+.IP
+xfce4\-mime\-settings [OPTION...]
+.SS "Help Options:"
+.TP
+\fB\-h\fR, \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 2008\-2012
+.IP
+The Xfce development team. All rights reserved.
+.PP
+Please report bugs to <http://bugzilla.xfce.org/>.
Deleted: desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1 2013-05-21 20:15:18 UTC (rev 7415)
+++ desktop/trunk/xfce4-settings/debian/xfce4-settings-helper.1 2013-05-21 20:19:56 UTC (rev 7416)
@@ -1,36 +0,0 @@
-.\" 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/>.
Modified: desktop/trunk/xfce4-settings/debian/xfsettingsd.1
===================================================================
--- desktop/trunk/xfce4-settings/debian/xfsettingsd.1 2013-05-21 20:15:18 UTC (rev 7415)
+++ desktop/trunk/xfce4-settings/debian/xfsettingsd.1 2013-05-21 20:19:56 UTC (rev 7416)
@@ -1,5 +1,5 @@
-.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.36.
-.TH XFSETTINGSD "1" "March 2009" "xfsettingsd 4.6.0" "User Commands"
+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.4.
+.TH XFSETTINGSD "1" "August 2011" "xfsettingsd 4.9.0" "User Commands"
.SH NAME
xfsettingsd \- XSettings daemon for Xfce
.SH DESCRIPTION
@@ -8,7 +8,7 @@
xfsettingsd [OPTION...]
.SS "Help Options:"
.TP
-\-?, \fB\-\-help\fR
+\fB\-h\fR, \fB\-\-help\fR
Show help options
.TP
\fB\-\-help\-all\fR
@@ -16,19 +16,19 @@
.TP
\fB\-\-help\-gtk\fR
Show GTK+ Options
+.TP
+\fB\-\-help\-sm\-client\fR
+Show session management options
.SS "Application Options:"
.TP
\fB\-V\fR, \fB\-\-version\fR
Version information
.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Verbose output
+\fB\-\-no\-daemon\fR
+Do not fork to the background
.TP
-\fB\-f\fR, \fB\-\-force\fR
+\fB\-\-replace\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