[meego-commits] 8453: Changes to MeeGo:1.1:Netbook:Testing/tasks

[Ross Burton]

Hi,
I have made the following changes to tasks in project MeeGo:1.1:Netbook:Testing. Please review and accept ASAP.

Thank You,
Ross Burton

[This message was auto-generated]

---

Request #8453:

  submit:   home:ross:branches:MeeGo:1.1:Netbook:Testing/tasks(r3)(cleanup) -> MeeGo:1.1:Netbook:Testing/tasks


Message:
    None

State:   new          2010-10-14T07:28:08 ross
Comment: None



changes files:
--------------
--- tasks.changes
+++ tasks.changes
@@ -0,0 +1,3 @@
+* Thu Oct 14 2010 Ross Burton <ross at linux.intel.com> 0.18
+- Don't translate the license (BMC#8336)
+

new:
----
  license-i18n.patch

spec files:
-----------
--- tasks.spec
+++ tasks.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.18
+# Generated by: spectacle version 0.20
 # 
 # >> macros
 # << macros
@@ -17,6 +17,7 @@
 Source100:  tasks.yaml
 Patch0:     tasks-window-size-moblin.patch
 Patch1:     tasks-i18n-name.patch
+Patch2:     license-i18n.patch
 Requires:   evolution-data-server
 Requires(post): /bin/touch
 Requires(post): gtk2
@@ -41,6 +42,8 @@
 %patch0 -p1
 # tasks-i18n-name.patch
 %patch1 -p1
+# license-i18n.patch
+%patch2 -p1
 # >> setup
 # << setup
 

other changes:
--------------

++++++ Makefile
--- Makefile
+++ Makefile
@@ -2,5 +2,5 @@
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
 
-include /usr/share/packaging-tools/Makefile.common
+include /usr/share/meego-packaging-tools/Makefile.common
 

++++++ license-i18n.patch (new)
--- license-i18n.patch
+++ license-i18n.patch
+diff --git a/src/gtk/main.c b/src/gtk/main.c
+index 74b4126..5806c94 100644
+--- a/src/gtk/main.c
++++ b/src/gtk/main.c
+@@ -442,26 +442,15 @@ on_about_action (GtkAction *action, gpointer user_data)
+     "Jakub Steiner <jimmac at ximian.com>",
+     NULL,
+   };
+-  const char *license = {
+-    _(
+-       "Tasks is free software; you can redistribute it and/or modify "
+-       "it under the terms of the GNU General Public License as published by "
+-       "the Free Software Foundation; either version 2 of the License, or "
+-       "(at your option) any later version.\n\n"
+-       "Tasks is distributed in the hope that it will be useful, "
+-       "but WITHOUT ANY WARRANTY; without even the implied warranty of "
+-       "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the "
+-       "GNU General Public License for more details.\n\n"
+-       "You should have received a copy of the GNU General Public License "
+-       "along with Tasks; if not, write to the Free Software Foundation, Inc., "
+-       "51 Franklin St, Fifth Floor, Boston, MA 0110-1301, USA"
+-       )
+-  };
++  char *license = g_strdup_printf ("%s\n\n%s\n\n%s",
++                                   g_get_application_name (),
++                                   "Copyright \302\251 2007-2010 Intel Corp",
++                                   _("This program comes with ABSOLUTELY NO WARRANTY; for details, visit http://www.gnu.org/licenses/old-licenses/gpl-2.0.html"));
+ 
+   gtk_show_about_dialog (GTK_WINDOW (window),
+                          "version", VERSION,
+                          "logo-icon-name", "tasks",
+-                         "copyright", "Copyright \302\251 2007-2008 OpenedHand Ltd",
++                         "copyright", "Copyright \302\251 2007-2010 Intel Corp",
+                          "authors", authors,
+                          "artists", artists,
+                          "translator-credits", _("translator-credits"),
+@@ -471,6 +459,8 @@ on_about_action (GtkAction *action, gpointer user_data)
+                          "website", "http://pimlico-project.org",
+                          "website-label", _("The Pimlico Project"),
+                          NULL);
++
++  g_free (license);
+ }
+ 
+ static const GtkActionEntry actions[] =

++++++ tasks.yaml
--- tasks.yaml
+++ tasks.yaml
@@ -11,6 +11,7 @@
 Patches:
     - tasks-window-size-moblin.patch
     - tasks-i18n-name.patch
+    - license-i18n.patch
 Description: |
     Tasks is a simple to do list application that uses libecal, part of Embedded
     Evolution Data Server.