From d1f2dcda6bb85cfe8e4b23495fa81643d229aea70a9178d3c9678cb57899e333 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 19 Jul 2010 19:28:41 +0000 Subject: [PATCH] Accepting request 43423 from X11:xfce checked in (request 43423) OBS-URL: https://build.opensuse.org/request/show/43423 OBS-URL: https://build.opensuse.org/package/show/X11:xfce/xfce4-session?expand=0&rev=33 --- xfce4-session-4.6.1.tar.bz2 | 3 +++ xfce4-session-4.6.2.tar.bz2 | 3 --- xfce4-session-logout-de.diff | 42 ++++++++++++++++++++++++++++++++++++ xfce4-session.changes | 11 ---------- xfce4-session.spec | 4 +++- 5 files changed, 48 insertions(+), 15 deletions(-) create mode 100644 xfce4-session-4.6.1.tar.bz2 delete mode 100644 xfce4-session-4.6.2.tar.bz2 create mode 100644 xfce4-session-logout-de.diff diff --git a/xfce4-session-4.6.1.tar.bz2 b/xfce4-session-4.6.1.tar.bz2 new file mode 100644 index 0000000..fc0014e --- /dev/null +++ b/xfce4-session-4.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:feed3f9053b83233697223a20f95ca0ad6efe9fedffcc098e4935a425e8f9f0e +size 1365247 diff --git a/xfce4-session-4.6.2.tar.bz2 b/xfce4-session-4.6.2.tar.bz2 deleted file mode 100644 index d6874b0..0000000 --- a/xfce4-session-4.6.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:725e269254c34c530acb670f5ccd0fd69b57cbe9f2176abd8499fc5d6dcd30a8 -size 1385541 diff --git a/xfce4-session-logout-de.diff b/xfce4-session-logout-de.diff new file mode 100644 index 0000000..bfc89f1 --- /dev/null +++ b/xfce4-session-logout-de.diff @@ -0,0 +1,42 @@ +From d23fbb801f07a915c1e9b33555614fa93f30c469 Mon Sep 17 00:00:00 2001 +From: Mike Massonnet +Date: Tue, 12 May 2009 09:34:41 +0000 +Subject: [PATCH] it.po typo + +(Old svn revision: 29952) + +--- + po/ChangeLog | 4 ++++ + po/de.po | 4 ++-- + 2 files changed, 6 insertions(+), 2 deletions(-) + +--- a/po/ChangeLog ++++ b/po/ChangeLog +@@ -1,3 +1,7 @@ ++2009-05-12 Mike Massonnet ++ ++ * de.po: Fix typo (bug #5279) ++ + 2009-04-08 Jannis Pohlmann + + * de.po: Update German translations (Fabian Nowak). +--- a/po/de.po ++++ b/po/de.po +@@ -12,7 +12,7 @@ msgstr "" + "Project-Id-Version: xfce4-session 4.4.0\n" + "Report-Msgid-Bugs-To: \n" + "POT-Creation-Date: 2008-12-26 20:57-0800\n" +-"PO-Revision-Date: 2009-04-09 12:12+0200\n" ++"PO-Revision-Date: 2009-05-12 11:32+0200\n" + "Last-Translator: Fabian Nowak \n" + "Language-Team: German \n" + "MIME-Version: 1.0\n" +@@ -332,7 +332,7 @@ msgstr "Sitzungsverwaltung" + #: ../xfce4-session/shutdown.c:360 + #, c-format + msgid "Log out %s" +-msgstr "%s abmelden" ++msgstr "%s abmelden" + + #: ../xfce4-session/shutdown.c:401 + msgid "Log Out" diff --git a/xfce4-session.changes b/xfce4-session.changes index 3ff8c87..a56234d 100644 --- a/xfce4-session.changes +++ b/xfce4-session.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Sun Jul 18 13:46:55 CEST 2010 - bernhard@bwalle.de - -- updated to 4.6.2 - o Build fixes for GIT. - o Add timing information to verbose output. - o If it looks like the helper got killed, just return success (bug #4849). - o Translation updates (de, es, gl, hu, id, pl, pt, ru, tr, uk, ro, - lv, ur, ur_PK, ast, sk, nl, it, kk). -- Drop xfce4-session-logout-de.diff: Upstream. - ------------------------------------------------------------------- Thu May 13 11:54:26 UTC 2010 - bernhard@bwalle.de diff --git a/xfce4-session.spec b/xfce4-session.spec index 62a8fe8..771f82b 100644 --- a/xfce4-session.spec +++ b/xfce4-session.spec @@ -20,12 +20,13 @@ Name: xfce4-session Summary: Xfce Session manager -Version: 4.6.2 +Version: 4.6.1 Release: 4 License: GPLv2+ Url: http://www.xfce.org/ Source: %{name}-%{version}.tar.bz2 Patch0: %{name}-tips-no-fortune.patch +Patch1: %{name}-logout-de.diff Group: System/GUI/XFCE BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libwnck-devel libxfce4util-devel libxfcegui4-devel @@ -95,6 +96,7 @@ Authors: %prep %setup -q %patch0 +%patch1 -p1 %build %configure \