[Pkg-xfce-commits] r2767 - in desktop/branches/svn-snapshots/xfce4-session/debian: . patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Fri Feb 27 00:34:33 UTC 2009
Author: corsac
Date: 2009-02-27 00:34:33 +0000 (Fri, 27 Feb 2009)
New Revision: 2767
Added:
desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_fix-fortune-path.patch
Removed:
desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml
Modified:
desktop/branches/svn-snapshots/xfce4-session/debian/changelog
desktop/branches/svn-snapshots/xfce4-session/debian/control
desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
desktop/branches/svn-snapshots/xfce4-session/debian/rules
Log:
* new upstream release.
* debian/control:
- update build-deps for 4.6.
* debian/patches:
- 02_fix-fortune-path added, fix fortune call path. closes: #497199
* debian/xfce4-session.xml removed, will be shipped in desktop-base.
* debian/rules: don't install xfce4-session.xml
Modified: desktop/branches/svn-snapshots/xfce4-session/debian/changelog
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/changelog 2009-02-27 00:34:26 UTC (rev 2766)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/changelog 2009-02-27 00:34:33 UTC (rev 2767)
@@ -1,4 +1,4 @@
-xfce4-session (4.5.99.1-1) UNRELEASED; urgency=low
+xfce4-session (4.6.0-1) UNRELEASED; urgency=low
[ Xfce 4.6 Alpha “Pinkie”]
* new upstream alpha release.
@@ -58,9 +58,18 @@
* new upstream release candidate.
* debian/control:
- update build-deps for “Capybara”.
+
+ [ Xfce 4.6 ]
+ * new upstream release.
+ * debian/control:
+ - update build-deps for 4.6.
* debian/README.Debian: add precisions about choices in GDM.
+ * debian/patches:
+ - 02_fix-fortune-path added, fix fortune call path. closes: #497199
+ * debian/xfce4-session.xml removed, will be shipped in desktop-base.
+ * debian/rules: don't install xfce4-session.xml
- -- Yves-Alexis Perez <corsac at debian.org> Sat, 21 Feb 2009 13:59:11 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Thu, 26 Feb 2009 14:57:01 +0100
xfce4-session (4.4.2-6) unstable; urgency=low
Modified: desktop/branches/svn-snapshots/xfce4-session/debian/control
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/control 2009-02-27 00:34:26 UTC (rev 2766)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/control 2009-02-27 00:34:33 UTC (rev 2767)
@@ -5,8 +5,8 @@
Uploaders: Emanuele Rocca <ema at debian.org>, Simon Huggins <huggie at earth.li>, Yves-Alexis Perez <corsac at debian.org>
Build-Depends: debhelper (>= 6.0.7), libx11-dev, libxml-parser-perl, chrpath,
quilt, fortune-mod, libdbus-1-dev, libdbus-glib-1-dev,
- libxfce4util-dev (>= 4.5.99.1), libxfcegui4-dev (>= 4.5.99.1), libwnck-dev,
- x11-xserver-utils, libxfconf-0-dev (>= 4.5.99.1), libglade2-dev,
+ libxfce4util-dev (>= 4.6.0), libxfcegui4-dev (>= 4.6.0), libwnck-dev,
+ x11-xserver-utils, libxfconf-0-dev (>= 4.6.0), libglade2-dev,
intltool (>= 0.31)
Standards-Version: 3.8.0
Homepage: http://www.xfce.org/
Added: desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_fix-fortune-path.patch
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_fix-fortune-path.patch (rev 0)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/02_fix-fortune-path.patch 2009-02-27 00:34:33 UTC (rev 2767)
@@ -0,0 +1,18 @@
+diff --git a/xfce4-tips/main.c b/xfce4-tips/main.c
+index 0961879..4f88935 100644
+--- a/xfce4-tips/main.c
++++ b/xfce4-tips/main.c
+@@ -115,11 +115,11 @@ next_cb(GtkWidget *btn, GtkTextBuffer *textbuf)
+
+ switch (option) {
+ case OPTION_TIPS:
+- strcpy(buffer, "fortune " TIPSDIR "/tips");
++ strcpy(buffer, "/usr/games/fortune " TIPSDIR "/tips");
+ break;
+
+ case OPTION_FORTUNES:
+- strcpy(buffer, "fortune");
++ strcpy(buffer, "/usr/games/fortune");
+ break;
+ }
+
Modified: desktop/branches/svn-snapshots/xfce4-session/debian/patches/series
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/patches/series 2009-02-27 00:34:26 UTC (rev 2766)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/patches/series 2009-02-27 00:34:33 UTC (rev 2767)
@@ -1 +1,2 @@
01_correct_shadows.patch
+02_fix-fortune-path.patch
Modified: desktop/branches/svn-snapshots/xfce4-session/debian/rules
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/rules 2009-02-27 00:34:26 UTC (rev 2766)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/rules 2009-02-27 00:34:33 UTC (rev 2767)
@@ -82,7 +82,7 @@
`pwd`/debian/xfce4-session/usr/share/xfce4/tips/tips.dat
# Ship an xfconf config file selecting the simple engine for desktop-base
- install -D -p -o root -g root -m 644 debian/xfce4-session.xml $(CURDIR)/debian/xfce4-session/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
+ # install -D -p -o root -g root -m 644 debian/xfce4-session.xml $(CURDIR)/debian/xfce4-session/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
# Build architecture-independent files here.
Deleted: desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml
===================================================================
--- desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml 2009-02-27 00:34:26 UTC (rev 2766)
+++ desktop/branches/svn-snapshots/xfce4-session/debian/xfce4-session.xml 2009-02-27 00:34:33 UTC (rev 2767)
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-session" version="1.0">
- <property name="splash" type="empty">
- <property name="Engine" type="string" value="simple"/>
- <property name="engines" type="empty">
- <property name="simple" type="empty">
- <property name="Font" type="string" value="Sans 8"/>
- <property name="BgColor" type="string" value="#004f79"/>
- <property name="FgColor" type="string" value="#639fc0"/>
- <property name="Image" type="string" value="/usr/share/images/desktop-base/desktop-splash"/>
- </property>
- </property>
- </property>
-</channel>
More information about the Pkg-xfce-commits
mailing list