[Pkg-xfce-commits] r4226 - in desktop/branches/lenny-backports/xfce4-settings/debian: . patches
Yves-Alexis Perez
corsac at alioth.debian.org
Sun Aug 15 05:16:08 UTC 2010
Author: corsac
Date: 2010-08-15 17:16:02 +0000 (Sun, 15 Aug 2010)
New Revision: 4226
Added:
desktop/branches/lenny-backports/xfce4-settings/debian/README.source
desktop/branches/lenny-backports/xfce4-settings/debian/patches/
desktop/branches/lenny-backports/xfce4-settings/debian/patches/series
desktop/branches/lenny-backports/xfce4-settings/debian/source/
Removed:
desktop/branches/lenny-backports/xfce4-settings/debian/patches/
desktop/branches/lenny-backports/xfce4-settings/debian/patches/series
Modified:
desktop/branches/lenny-backports/xfce4-settings/debian/changelog
desktop/branches/lenny-backports/xfce4-settings/debian/control
desktop/branches/lenny-backports/xfce4-settings/debian/rules
desktop/branches/lenny-backports/xfce4-settings/debian/watch
Log:
merge changes from latest version in squeeze to backports
Copied: desktop/branches/lenny-backports/xfce4-settings/debian/README.source (from rev 4132, desktop/trunk/xfce4-settings/debian/README.source)
===================================================================
--- desktop/branches/lenny-backports/xfce4-settings/debian/README.source (rev 0)
+++ desktop/branches/lenny-backports/xfce4-settings/debian/README.source 2010-08-15 17:16:02 UTC (rev 4226)
@@ -0,0 +1,2 @@
+This package uses quilt patch system to apply patch at build-time. More
+information can be found in /usr/share/doc/quilt/README.source.
Modified: desktop/branches/lenny-backports/xfce4-settings/debian/changelog
===================================================================
--- desktop/branches/lenny-backports/xfce4-settings/debian/changelog 2010-08-15 16:47:12 UTC (rev 4225)
+++ desktop/branches/lenny-backports/xfce4-settings/debian/changelog 2010-08-15 17:16:02 UTC (rev 4226)
@@ -1,13 +1,98 @@
-xfce4-settings (4.6.1-2~bpo50+1) lenny-backports; urgency=low
+xfce4-settings (4.6.5-2~bpo50+1) lenny-backports; urgency=low
* Rebuild for lenny-backports.
* debian/rules:
- - lenny quilt doesn't have dh_quilt_{patch,unpatch}, so do it the old
- way.
- disable pluggable dialogs, it requires GTK+ 2.14.
+ * debian/control:
+ - drop build-dep on xklavier, not in lenny.
- -- Yves-Alexis Perez <corsac at debian.org> Fri, 03 Jul 2009 08:57:36 +0200
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 15 Aug 2010 19:07:04 +0200
+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.
+ * 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:
+ - update libklavier build-dep to libxklavier-dev to end the transition.
+ * debian/README.source added.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sat, 24 Oct 2009 20:47:02 +0200
+
+xfce4-settings (4.6.3-2) unstable; urgency=low
+
+ * debian/patches:
+ - 01_xi2-support added, add support for Xi2 extension for mouse settings.
+ * debian/control:
+ - add build-dep on quilt.
+ * debian/rules:
+ - add --with quilt argument to dh.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Sun, 11 Oct 2009 14:19:44 +0200
+
+xfce4-settings (4.6.3-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ * debian/control:
+ - update standards version to 3.8.3.
+ - drop quilt, now useless.
+ * debian/patches/
+ - 01_fix-timeout-startup dropped, included upstream.
+ - 02_fix-keyrepeat-typo as well.
+ - 10_pc too, useless now.
+ * debian/rules:
+ - drop --with-quilt addon.
+
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 29 Sep 2009 08:53:46 +0200
+
xfce4-settings (4.6.1-2) unstable; urgency=low
* debian/patches:
Modified: desktop/branches/lenny-backports/xfce4-settings/debian/control
===================================================================
--- desktop/branches/lenny-backports/xfce4-settings/debian/control 2010-08-15 16:47:12 UTC (rev 4225)
+++ desktop/branches/lenny-backports/xfce4-settings/debian/control 2010-08-15 17:16:02 UTC (rev 4226)
@@ -2,21 +2,22 @@
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),
libxfcegui4-dev (>= 4.6.0), libexo-0.3-dev (>= 0.3.100), libglade2-dev,
- libxfconf-0-dev, libwnck-dev, libxklavier12-dev, libnotify-dev,
- intltool (>= 0.31), quilt
-Standards-Version: 3.8.1
+ libxfconf-0-dev, libwnck-dev, 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
Architecture: any
Depends: ${shlibs:Depends}, xfconf, ${misc:Depends}
-Recommends: aumix, x11-utils
+Recommends: aumix, x11-utils, tango-icon-theme
Conflicts: xfce4-mcs-plugins
Replaces: xfce4-mcs-manager, xfce4-mcs-plugins
Description: graphical application for managing Xfce settings
Deleted: desktop/branches/lenny-backports/xfce4-settings/debian/patches/series
===================================================================
--- desktop/tags/xfce4-settings/4.6.5-2/debian/patches/series 2010-08-15 16:47:12 UTC (rev 4225)
+++ desktop/branches/lenny-backports/xfce4-settings/debian/patches/series 2010-08-15 17:16:02 UTC (rev 4226)
@@ -1 +0,0 @@
-01_use-tango-as-default-theme.patch
Copied: desktop/branches/lenny-backports/xfce4-settings/debian/patches/series (from rev 4225, desktop/tags/xfce4-settings/4.6.5-2/debian/patches/series)
===================================================================
--- desktop/branches/lenny-backports/xfce4-settings/debian/patches/series (rev 0)
+++ desktop/branches/lenny-backports/xfce4-settings/debian/patches/series 2010-08-15 17:16:02 UTC (rev 4226)
@@ -0,0 +1 @@
+01_use-tango-as-default-theme.patch
Modified: desktop/branches/lenny-backports/xfce4-settings/debian/rules
===================================================================
--- desktop/branches/lenny-backports/xfce4-settings/debian/rules 2010-08-15 16:47:12 UTC (rev 4225)
+++ desktop/branches/lenny-backports/xfce4-settings/debian/rules 2010-08-15 17:16:02 UTC (rev 4226)
@@ -1,17 +1,12 @@
#!/usr/bin/make -f
-include /usr/share/quilt/quilt.make
-
override_dh_auto_configure:
dh_auto_configure -- --enable-libnotify --enable-xcursor \
- --enable-libxklavier --enable-xsettings-daemon --enable-sound-settings
+ --enable-libxklavier --enable-xsettings-daemon --enable-sound-settings \
+ --disable-pluggable-dialogs
override_dh_installman:
dh_installman debian/*.1
-build: patch
-
-clean: unpatch
-
%:
dh $@
Modified: desktop/branches/lenny-backports/xfce4-settings/debian/watch
===================================================================
--- desktop/branches/lenny-backports/xfce4-settings/debian/watch 2010-08-15 16:47:12 UTC (rev 4225)
+++ desktop/branches/lenny-backports/xfce4-settings/debian/watch 2010-08-15 17:16:02 UTC (rev 4226)
@@ -1,3 +1,3 @@
version=3
-http://www.xfce.org/archive/xfce-(.*)/src/ \
- xfce4-settings-(.*)\.tar\.bz2
+http://archive.xfce.org/src/xfce/xfce4-settings/([\d\.]+)/ \
+ xfce4-settings-([\d\.]+)\.tar\.(?:gz|bz2)
More information about the Pkg-xfce-commits
mailing list