r44670 - /packages/unstable/gtranslator/debian/patches/fix-help-links.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon May 25 22:31:40 2015
New Revision: 44670

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44670
Log:
Add note that we should use gtk_show_uri instead of calling gnome-help

Modified:
    packages/unstable/gtranslator/debian/patches/fix-help-links.patch

Modified: packages/unstable/gtranslator/debian/patches/fix-help-links.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/patches/fix-help-links.patch?rev=44670&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/patches/fix-help-links.patch	[utf-8] (original)
+++ packages/unstable/gtranslator/debian/patches/fix-help-links.patch	[utf-8] Mon May 25 22:31:40 2015
@@ -4,8 +4,8 @@
 
 Index: gtranslator-2.91.7/src/gtr-actions-app.c
 ===================================================================
---- gtranslator-2.91.7.orig/src/gtr-actions-app.c	2015-05-26 00:09:21.803521458 +0200
-+++ gtranslator-2.91.7/src/gtr-actions-app.c	2015-05-26 00:09:21.803521458 +0200
+--- gtranslator-2.91.7.orig/src/gtr-actions-app.c	2015-03-15 13:09:29.000000000 +0100
++++ gtranslator-2.91.7/src/gtr-actions-app.c	2015-05-26 00:29:04.000000000 +0200
 @@ -37,7 +37,7 @@
  void
  gtr_show_help (GtrWindow *window)
@@ -17,8 +17,8 @@
  /* Creates and shows the about box for gtranslator */
 Index: gtranslator-2.91.7/src/gtr-utils.c
 ===================================================================
---- gtranslator-2.91.7.orig/src/gtr-utils.c	2015-05-26 00:09:21.803521458 +0200
-+++ gtranslator-2.91.7/src/gtr-utils.c	2015-05-26 00:19:22.321368516 +0200
+--- gtranslator-2.91.7.orig/src/gtr-utils.c	2015-03-15 13:09:29.000000000 +0100
++++ gtranslator-2.91.7/src/gtr-utils.c	2015-05-26 00:30:33.058740231 +0200
 @@ -494,8 +494,8 @@
          continue;
  
@@ -30,11 +30,13 @@
  
        if (g_file_test (uri, G_FILE_TEST_EXISTS))
          {
-@@ -522,7 +522,7 @@
+@@ -522,7 +522,9 @@
        return;
      }
  
 -  command = g_strconcat ("gnome-help help://", uri, NULL);
++  /* Should be updated to use gtk_show_uri instead, see
++   * https://wiki.gnome.org/Initiatives/GnomeGoals/RemoveGnomeOpenGnomeHelp */
 +  command = g_strconcat ("gnome-help ghelp://", uri, NULL);
    g_free (uri);
  
@@ -42,7 +44,7 @@
 Index: gtranslator-2.91.7/help/C/legal.xml
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtranslator-2.91.7/help/C/legal.xml	2015-05-26 00:10:12.499767555 +0200
++++ gtranslator-2.91.7/help/C/legal.xml	2015-05-26 00:29:04.000000000 +0200
 @@ -0,0 +1,5 @@
 +<license xmlns="http://projectmallard.org/1.0/"
 +         href="http://creativecommons.org/licenses/by-sa/3.0/">
@@ -51,8 +53,8 @@
 +</license>
 Index: gtranslator-2.91.7/help/Makefile.am
 ===================================================================
---- gtranslator-2.91.7.orig/help/Makefile.am	2015-05-26 00:09:05.000000000 +0200
-+++ gtranslator-2.91.7/help/Makefile.am	2015-05-26 00:10:36.454188040 +0200
+--- gtranslator-2.91.7.orig/help/Makefile.am	2015-03-15 13:09:29.000000000 +0100
++++ gtranslator-2.91.7/help/Makefile.am	2015-05-26 00:29:04.000000000 +0200
 @@ -23,7 +23,8 @@
  	gtr-use-delete-entry.page	\
  	gtr-wizzard.page		\
@@ -63,20 +65,10 @@
  
  HELP_MEDIA = \
  	figures/add-profile.png			\
-Index: gtranslator-2.91.7/help/de/legal.xml
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gtranslator-2.91.7/help/de/legal.xml	2015-05-26 00:19:49.073486084 +0200
-@@ -0,0 +1,5 @@
-+<?xml version="1.0" encoding="utf-8"?>
-+<license xmlns="http://projectmallard.org/1.0/" href="http://creativecommons.org/licenses/by-sa/3.0/">
-+  <p>This work is licensed under a <link href="http://creativecommons.org/licenses/by-sa/3.0/">Creative
-+  Commons Attribution-ShareAlike 3.0 Unported License</link>.</p>
-+</license>
 Index: gtranslator-2.91.7/src/gtr-dirs.c
 ===================================================================
 --- gtranslator-2.91.7.orig/src/gtr-dirs.c	2015-03-15 13:09:29.000000000 +0100
-+++ gtranslator-2.91.7/src/gtr-dirs.c	2015-05-26 00:15:42.310657287 +0200
++++ gtranslator-2.91.7/src/gtr-dirs.c	2015-05-26 00:29:04.000000000 +0200
 @@ -76,7 +76,7 @@
    if (gtr_data_dir == NULL)
      {