[Pkg-xfce-commits] r5935 - in desktop/branches/experimental/xfce4-settings/debian: . patches

Lionel Le Folgoc mrpouit-guest at alioth.debian.org
Thu Aug 18 11:09:42 UTC 2011


Author: mrpouit-guest
Date: 2011-08-18 11:09:41 +0000 (Thu, 18 Aug 2011)
New Revision: 5935

Added:
   desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch
   desktop/branches/experimental/xfce4-settings/debian/patches/series
Removed:
   desktop/branches/experimental/xfce4-settings/debian/xfce4-settings-helper.1
Modified:
   desktop/branches/experimental/xfce4-settings/debian/changelog
   desktop/branches/experimental/xfce4-settings/debian/control
   desktop/branches/experimental/xfce4-settings/debian/rules
Log:
* New upstream development release, including:
  - Merge xfce4-settings-helper into xfsettingsd.
  - Add support to xfsettingsd for pointing device properties.
  - Rework the mouse dialog and add support for basic synaptics
    and wacom settings.
  - Add option to enable assistive technologies during login.
  - Add fontconfig monitoring.
* debian/control: 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.
* debian/patches:
  - 01_use-tango-icon-theme added, uses Tango theme.          closes: #629877
* New upstream release.
* debian/patches:
  - 01_fix-sticky-slow-bounce-mouse-keys-expiration dropped, included
    upstream.
  - 02_fix-path_max-undefined-hurd as well. 
* debian/patches:
  - 02_fix-path_max-undefined-hurd added, tentative patch to fix FTBFS on
    GNU/hurd.
* Upload to unstable.
* debian/control:
  - drop Emanuele and Simon from uploaders, thanks to them.
  - update standards version to 3.9.2.
* debian/patches:
  - 01_fix-sticky-slow-bounce-mouse-keys-expiration cherry-picked from 
    upstream.                                                 closes: #614939
* debian/rules:
  - add quilt files to POTFILES.skip and remove them at clean time.
* debian/patches:
  - 01_use-tango-as-default-theme added. switch default theme from Rodent to
    Tango, thanks Jordan Metzmeier.                           closes: #586032
* debian/control:
  - add recommends on tango-icon-theme for that.
* New upstream release:
  - fix FTBFS with binutils-gold.                             closes: #556701
* Switch to 3.0 (quilt) format.
* debian/control:
  - drop quilt build-dep.
* debian/rules:
  - drop quilt addon.
* debian/patches:
  - 0001-Port-to-libxklavier-5.0-API dropped, included upstream.

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	2011-08-17 17:28:51 UTC (rev 5934)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	2011-08-18 11:09:41 UTC (rev 5935)
@@ -1,3 +1,57 @@
+xfce4-settings (4.9.0-1) UNRELEASED; urgency=low
+
+  * New upstream development release, including:
+    - Merge xfce4-settings-helper into xfsettingsd.
+    - Add support to xfsettingsd for pointing device properties.
+    - Rework the mouse dialog and add support for basic synaptics
+      and wacom settings.
+    - Add option to enable assistive technologies during login.
+    - Add fontconfig monitoring.
+  * debian/control: 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.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Thu, 18 Aug 2011 12:53:37 +0200
+
+xfce4-settings (4.8.2-2) unstable; urgency=low
+
+  * debian/patches:
+    - 01_use-tango-icon-theme added, uses Tango theme.          closes: #629877
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 13 Jun 2011 19:32:06 +0200
+
+xfce4-settings (4.8.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 01_fix-sticky-slow-bounce-mouse-keys-expiration dropped, included
+      upstream.
+    - 02_fix-path_max-undefined-hurd as well. 
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Mon, 23 May 2011 23:18:56 +0200
+
+xfce4-settings (4.8.1-4) unstable; urgency=low
+
+  * debian/patches:
+    - 02_fix-path_max-undefined-hurd added, tentative patch to fix FTBFS on
+      GNU/hurd.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Fri, 22 Apr 2011 08:11:26 +0200
+
+xfce4-settings (4.8.1-3) unstable; urgency=low
+
+  * Upload to unstable.
+  * debian/control:
+    - drop Emanuele and Simon from uploaders, thanks to them.
+    - update standards version to 3.9.2.
+  * debian/patches:
+    - 01_fix-sticky-slow-bounce-mouse-keys-expiration cherry-picked from 
+      upstream.                                                 closes: #614939
+  * debian/rules:
+    - add quilt files to POTFILES.skip and remove them at clean time.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 19 Apr 2011 16:13:49 +0200
+
 xfce4-settings (4.8.1-2) experimental; urgency=low
 
   [ Lionel Le Folgoc ]
@@ -38,6 +92,30 @@
 
  -- Yves-Alexis Perez <corsac at debian.org>  Sun, 06 Feb 2011 17:06:23 +0100
 
+xfce4-settings (4.6.5-2) unstable; urgency=low
+
+  * debian/patches:
+    - 01_use-tango-as-default-theme added. switch default theme from Rodent to
+      Tango, thanks Jordan Metzmeier.                           closes: #586032
+  * debian/control:
+    - add recommends on tango-icon-theme for that.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 16 Jun 2010 07:18:56 +0200
+
+xfce4-settings (4.6.5-1) unstable; urgency=low
+
+  * New upstream release:
+    - fix FTBFS with binutils-gold.                             closes: #556701
+  * Switch to 3.0 (quilt) format.
+  * debian/control:
+    - drop quilt build-dep.
+  * debian/rules:
+    - drop quilt addon.
+  * debian/patches:
+    - 0001-Port-to-libxklavier-5.0-API dropped, included upstream.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 23 May 2010 13:33:54 +0200
+
 xfce4-settings (4.6.4-2) unstable; urgency=low
 
   * debian/patches/0001-Port-to-libxklavier-5.0-API.patch added.

Modified: desktop/branches/experimental/xfce4-settings/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	2011-08-17 17:28:51 UTC (rev 5934)
+++ desktop/branches/experimental/xfce4-settings/debian/control	2011-08-18 11:09:41 UTC (rev 5935)
@@ -2,14 +2,14 @@
 Section: xfce
 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>, Lionel Le Folgoc <mrpouit at gmail.com>
+Uploaders: Yves-Alexis Perez <corsac at debian.org>,
+ Lionel Le Folgoc <mrpouit at gmail.com>
 Build-Depends: debhelper (>= 7.0.50~), 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), hardening-includes
 Build-Conflicts: libxfcegui4-dev (<< 4.7.0)
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 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/
@@ -28,9 +28,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.

Added: desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch	                        (rev 0)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/01_use-tango-icon-theme.patch	2011-08-18 11:09:41 UTC (rev 5935)
@@ -0,0 +1,15 @@
+diff --git a/xfsettingsd/xsettings.xml b/xfsettingsd/xsettings.xml
+index 049b4ed..0b72294 100644
+--- a/xfsettingsd/xsettings.xml
++++ b/xfsettingsd/xsettings.xml
+@@ -6,8 +6,8 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <channel name="xsettings" version="1.0">
+   <property name="Net" type="empty">
+-    <property name="ThemeName" type="empty"/>
+-    <property name="IconThemeName" type="empty"/>
++    <property name="ThemeName" type="string" value="Xfce"/>
++    <property name="IconThemeName" type="string" value="Tango"/>
+     <property name="DoubleClickTime" type="int" value="250"/>
+     <property name="DoubleClickDistance" type="int" value="5"/>
+     <property name="DndDragThreshold" type="int" value="8"/>

Added: desktop/branches/experimental/xfce4-settings/debian/patches/series
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/patches/series	                        (rev 0)
+++ desktop/branches/experimental/xfce4-settings/debian/patches/series	2011-08-18 11:09:41 UTC (rev 5935)
@@ -0,0 +1 @@
+01_use-tango-icon-theme.patch

Modified: desktop/branches/experimental/xfce4-settings/debian/rules
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/rules	2011-08-17 17:28:51 UTC (rev 5934)
+++ desktop/branches/experimental/xfce4-settings/debian/rules	2011-08-18 11:09:41 UTC (rev 5935)
@@ -9,12 +9,16 @@
 
 export CFLAGS LDFLAGS
 
-
 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
 
+override_dh_auto_clean:
+	rm -f po/POTFILES.skip
+	dh_auto_clean
+
 override_dh_installman:
 	dh_installman debian/*.1
 

Deleted: desktop/branches/experimental/xfce4-settings/debian/xfce4-settings-helper.1
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/xfce4-settings-helper.1	2011-08-17 17:28:51 UTC (rev 5934)
+++ desktop/branches/experimental/xfce4-settings/debian/xfce4-settings-helper.1	2011-08-18 11:09:41 UTC (rev 5935)
@@ -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/>.




More information about the Pkg-xfce-commits mailing list