[Pkg-xfce-commits] r4095 - desktop/branches/experimental/xfce4-settings/debian

[Lionel Le Folgoc]

Author: mrpouit-guest
Date: 2010-05-23 16:57:51 +0000 (Sun, 23 May 2010)
New Revision: 4095

Modified:
   desktop/branches/experimental/xfce4-settings/debian/changelog
   desktop/branches/experimental/xfce4-settings/debian/control
Log:
Partially resync with trunk

Modified: desktop/branches/experimental/xfce4-settings/debian/changelog
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/changelog	2010-05-23 16:50:33 UTC (rev 4094)
+++ desktop/branches/experimental/xfce4-settings/debian/changelog	2010-05-23 16:57:51 UTC (rev 4095)
@@ -2,20 +2,40 @@
 
   * New upstream development release.
   * debian/patches:
-    - 01_xi2-support dropped.
     - 01_fix-pluggable-dialogs added, fix pluggable dialogs.
-    - 02-Port-to-libxklavier-5.0-API added, fix build against new
-      libxklavier.
-  * drop quilt support.
   * debian/control:
     - bump exo build-dep to exo-1 0.5.1.
-    - switch libxfcegui4 build-dep to libxfce4ui. 
-    - update standards version to 3.8.4.
-  * source/format added, switch to 3.0 (quilt).
-  * 
+    - switch libxfcegui4 build-dep to libxfce4ui.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Thu, 29 Apr 2010 22:26:34 +0200
 
+xfce4-settings (4.6.4-2) unstable; urgency=low
+
+  * debian/patches/0001-Port-to-libxklavier-5.0-API.patch added.
+  * debian/patches/series: enable this patch.
+  * debian/control: b-dep on quilt (>= 0.46-7), bump libxklavier-dev b-dep
+    to >= 5.0, add myself to Uploaders.
+  * debian/rules: pass --with quilt.
+  * bump Standards-Version to 3.8.4, no changes.
+
+ -- Lionel Le Folgoc <mrpouit at gmail.com>  Sat, 10 Apr 2010 17:39:38 +0100
+
+xfce4-settings (4.6.4-1) unstable; urgency=low
+
+  [ Lionel Le Folgoc ]
+  * debian/control: fix typo in Vcs-* fields.
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+  * debian/patches:
+    - 01_xi2-support dropped, included upstream.
+  * debian/control:
+    - dump quilt build-dep.
+  * debian/rules:
+    - dump quilt addon.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Jan 2010 16:20:25 +0100
+
 xfce4-settings (4.6.3-3) unstable; urgency=low
 
   * debian/control:

Modified: desktop/branches/experimental/xfce4-settings/debian/control
===================================================================
--- desktop/branches/experimental/xfce4-settings/debian/control	2010-05-23 16:50:33 UTC (rev 4094)
+++ desktop/branches/experimental/xfce4-settings/debian/control	2010-05-23 16:57:51 UTC (rev 4095)
@@ -2,15 +2,16 @@
 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>
+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>
 Build-Depends: debhelper (>= 7.0.50), libxfce4util-dev (>= 4.6.0),
  libxfce4ui-1-dev (>= 4.7.0), libexo-1-dev (>= 0.5.0), 
  libxfconf-0-dev, libwnck-dev, libxklavier-dev (>= 5.0), libnotify-dev, 
  intltool (>= 0.31)
 Standards-Version: 3.8.4
 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/
+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/
 
 Package: xfce4-settings
 Section: xfce