Hello community,
here is the log from the commit of package gnome-agenda for openSUSE:Factory checked in at 2012-02-16 12:21:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-agenda (Old)
and /work/SRC/openSUSE:Factory/.gnome-agenda.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-agenda", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnome-agenda/gnome-agenda.changes 2012-01-17 16:05:50.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gnome-agenda.new/gnome-agenda.changes 2012-02-16 12:21:08.000000000 +0100
@@ -1,0 +2,13 @@
+Tue Feb 14 02:48:00 UTC 2012 - malcolmlewis@opensuse.org
+
+- Add x-office-calendar.png source file and install it in
+ /usr/share/pixmaps as the icon for the desktop file. This is a
+ temporary issue until bnc#746063 is fixed.
+- Add gnome-agenda-fix-desktop-file.patch: fix categories in
+ desktop file.
+- Add gnome-agenda-fix-non-executable-script.patch: fix
+ non-executable-script warnings.
+- Add gnome-agenda-fix-incorrect-fsf-address.patch: fix
+ incorrect-fsf-address warnings.
+
+-------------------------------------------------------------------
New:
----
gnome-agenda-fix-desktop-file.patch
gnome-agenda-fix-incorrect-fsf-address.patch
gnome-agenda-fix-non-executable-script.patch
x-office-calendar.png
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-agenda.spec ++++++
--- /var/tmp/diff_new_pack.oPZGT0/_old 2012-02-16 12:21:08.000000000 +0100
+++ /var/tmp/diff_new_pack.oPZGT0/_new 2012-02-16 12:21:08.000000000 +0100
@@ -1,6 +1,7 @@
#
# spec file for package gnome-agenda
#
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 Malcolm J Lewis
#
# All modifications and additions to the file contributed by third parties
@@ -18,11 +19,20 @@
Name: gnome-agenda
Version: 0.3.1.6
Release: 0
-License: GPL-2.0
+# FIXME: stop installing icon ourselves once bnc#746063 is fixed
Summary: Calendar application for the GNOME Desktop
-Url: http://code.google.com/p/gnome-agenda/
+License: GPL-2.0
Group: Productivity/Office/Other
+Url: http://code.google.com/p/gnome-agenda/
Source0: http://gnome-agenda.googlecode.com/svn/tags/agenda-0.3.1.6.tar.gz
+# We need this until bnc#746063 is fixed.
+Source1: x-office-calendar.png
+# PATCH-FIX-UPSTREAM gnome-agenda-fix-desktop-file.patch malcolmlewis@opensuse.org -- Fix categories string http://code.google.com/p/gnome-agenda/issues/detail?id=14
+Patch0: gnome-agenda-fix-desktop-file.patch
+# PATCH-FIX-UPSTREAM gnome-agenda-fix-non-executable-script.patch malcolmlewis@opensuse.org -- Fix non-executable-script warnings http://code.google.com/p/gnome-agenda/issues/detail?id=15
+Patch1: gnome-agenda-fix-non-executable-script.patch
+# PATCH-FIX-UPSTREAM gnome-agenda-fix-incorrect-fsf-address.patch malcolmlewis@opensuse.org -- Fix incorrect-fsf-address warnings http://code.google.com/p/gnome-agenda/issues/detail?id=16
+Patch2: gnome-agenda-fix-incorrect-fsf-address.patch
BuildRequires: fdupes
BuildRequires: python-devel
BuildRequires: update-desktop-files
@@ -46,12 +56,18 @@
%prep
%setup -q -n agenda-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
python setup.py build
%install
python setup.py install -O1 --skip-build --prefix=%{_prefix} --root=%{buildroot}
+# Unfortunate that we have to do this manually, see bnc#746063
+mkdir %{buildroot}%{_datadir}/pixmaps/
+install -m 0644 %{S:1} %{buildroot}%{_datadir}/pixmaps/
%suse_update_desktop_file agenda
%fdupes %{buildroot}
@@ -70,5 +86,6 @@
%{python_sitelib}/agenda
%{python_sitelib}/agenda-%{version}-py%{py_ver}.egg-info
%{_datadir}/applications/agenda.desktop
+%{_datadir}/pixmaps/x-office-calendar.png
%changelog
++++++ gnome-agenda-fix-desktop-file.patch ++++++
diff -Naur a/data/agenda.desktop b/data/agenda.desktop
--- a/data/agenda.desktop 2011-02-23 13:52:51.000000000 -0600
+++ b/data/agenda.desktop 2012-02-13 20:08:56.086134391 -0600
@@ -7,6 +7,6 @@
Terminal=false
Exec=agenda-gtk
Icon=x-office-calendar
-Categories=Office;
+Categories=Office;Calendar;
Name[de]=Terminübersicht
Comment[de]=Eine Übersicht ihrer Terminplanung
++++++ gnome-agenda-fix-incorrect-fsf-address.patch ++++++
diff -Naur a/agenda-gtk b/agenda-gtk
--- a/agenda-gtk 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda-gtk 2012-02-13 20:30:41.420533396 -0600
@@ -16,7 +16,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
import sys
import copy
diff -Naur a/COPYING b/COPYING
--- a/COPYING 2011-02-23 13:52:51.000000000 -0600
+++ b/COPYING 2012-02-13 20:29:09.895162221 -0600
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
++++++ gnome-agenda-fix-non-executable-script.patch ++++++
diff -Naur a/agenda/appointment.py b/agenda/appointment.py
--- a/agenda/appointment.py 2011-05-11 18:05:22.000000000 -0500
+++ b/agenda/appointment.py 2012-02-13 20:19:14.530725541 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
diff -Naur a/agenda/CalendarProviderBase.py b/agenda/CalendarProviderBase.py
--- a/agenda/CalendarProviderBase.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/CalendarProviderBase.py 2012-02-13 20:19:14.522725433 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
from agenda.pluginsystem import *
diff -Naur a/agenda/__init__.py b/agenda/__init__.py
--- a/agenda/__init__.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/__init__.py 2012-02-13 20:19:14.582726249 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
from gettext import gettext as _
diff -Naur a/agenda/plugins/Evolution/__init__.py b/agenda/plugins/Evolution/__init__.py
--- a/agenda/plugins/Evolution/__init__.py 2011-05-11 18:04:47.000000000 -0500
+++ b/agenda/plugins/Evolution/__init__.py 2012-02-13 20:19:14.542725705 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
import evolution
diff -Naur a/agenda/plugins/GoogleCalendar/__init__.py b/agenda/plugins/GoogleCalendar/__init__.py
--- a/agenda/plugins/GoogleCalendar/__init__.py 2011-05-11 18:01:19.000000000 -0500
+++ b/agenda/plugins/GoogleCalendar/__init__.py 2012-02-13 20:19:14.546725759 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
try:
from xml.etree import ElementTree
diff -Naur a/agenda/plugins/Groupwise/__init__.py b/agenda/plugins/Groupwise/__init__.py
--- a/agenda/plugins/Groupwise/__init__.py 2011-05-11 18:04:55.000000000 -0500
+++ b/agenda/plugins/Groupwise/__init__.py 2012-02-13 20:19:14.542725705 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
gw_libs_detected = False
from gettext import gettext as _
diff -Naur a/agenda/plugins/ical/__init__.py b/agenda/plugins/ical/__init__.py
--- a/agenda/plugins/ical/__init__.py 2011-05-11 18:05:00.000000000 -0500
+++ b/agenda/plugins/ical/__init__.py 2012-02-13 20:19:14.550725813 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
import urllib
diff -Naur a/agenda/pluginsystem.py b/agenda/pluginsystem.py
--- a/agenda/pluginsystem.py 2011-05-11 18:04:05.000000000 -0500
+++ b/agenda/pluginsystem.py 2012-02-13 20:19:14.590726358 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
try:
import sys
diff -Naur a/agenda/ui/AccelEntry.py b/agenda/ui/AccelEntry.py
--- a/agenda/ui/AccelEntry.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/ui/AccelEntry.py 2012-02-13 20:19:14.574726140 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
try:
diff -Naur a/agenda/ui/AgendaListView.py b/agenda/ui/AgendaListView.py
--- a/agenda/ui/AgendaListView.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/ui/AgendaListView.py 2012-02-13 20:19:14.570726085 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
import gtk
import gobject
diff -Naur a/agenda/ui/AgendaWindow.py b/agenda/ui/AgendaWindow.py
--- a/agenda/ui/AgendaWindow.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/ui/AgendaWindow.py 2012-02-13 20:19:14.554725868 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
import gtk
import gobject
diff -Naur a/agenda/ui/EditEventWindow.py b/agenda/ui/EditEventWindow.py
--- a/agenda/ui/EditEventWindow.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/ui/EditEventWindow.py 2012-02-13 20:19:14.566726031 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
import gtk
#import gnomeapplet
diff -Naur a/agenda/ui/EventWidget.py b/agenda/ui/EventWidget.py
--- a/agenda/ui/EventWidget.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/ui/EventWidget.py 2012-02-13 20:19:14.566726031 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
import gtk
diff -Naur a/agenda/ui/__init__.py b/agenda/ui/__init__.py
--- a/agenda/ui/__init__.py 2011-02-23 13:52:51.000000000 -0600
+++ b/agenda/ui/__init__.py 2012-02-13 20:19:14.574726140 -0600
@@ -1,3 +1,2 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
diff -Naur a/agenda/ui/PrefDialog.py b/agenda/ui/PrefDialog.py
--- a/agenda/ui/PrefDialog.py 2011-05-24 16:36:28.000000000 -0500
+++ b/agenda/ui/PrefDialog.py 2012-02-13 20:19:14.570726085 -0600
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
import gtk
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
