r29005 - in /packages/unstable/gtranslator/debian: changelog patches/help_display.patch patches/series rules
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Thu Jul 21 15:07:22 UTC 2011
Author: jordi
Date: Thu Jul 21 15:07:22 2011
New Revision: 29005
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29005
Log:
* Upload to unstable.
* Remove check-dist.mk rule.
* Add help_display.patch to fix the help search path for the gtranslator
manual (closes: #627514).
Added:
packages/unstable/gtranslator/debian/patches/help_display.patch
packages/unstable/gtranslator/debian/patches/series
Modified:
packages/unstable/gtranslator/debian/changelog
packages/unstable/gtranslator/debian/rules
Modified: packages/unstable/gtranslator/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/changelog?rev=29005&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/changelog [utf-8] (original)
+++ packages/unstable/gtranslator/debian/changelog [utf-8] Thu Jul 21 15:07:22 2011
@@ -1,3 +1,12 @@
+gtranslator (2.90.5-2) unstable; urgency=low
+
+ * Upload to unstable.
+ * Remove check-dist.mk rule.
+ * Add help_display.patch to fix the help search path for the gtranslator
+ manual (closes: #627514).
+
+ -- Jordi Mallach <jordi at debian.org> Thu, 21 Jul 2011 17:07:11 +0200
+
gtranslator (2.90.5-1) experimental; urgency=low
[ Josselin Mouette ]
Added: packages/unstable/gtranslator/debian/patches/help_display.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/patches/help_display.patch?rev=29005&op=file
==============================================================================
--- packages/unstable/gtranslator/debian/patches/help_display.patch (added)
+++ packages/unstable/gtranslator/debian/patches/help_display.patch [utf-8] Thu Jul 21 15:07:22 2011
@@ -1,0 +1,93 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: Fix search path for help dir.
+ Define a gtr_dirs_get_gtr_help_dir() method and use it to build the
+ correct path to the manual.
+Status: committed-upstream
+
+Index: gtranslator-2.90.5/src/gtr-utils.c
+===================================================================
+--- gtranslator-2.90.5.orig/src/gtr-utils.c 2011-03-28 22:43:28.000000000 +0200
++++ gtranslator-2.90.5/src/gtr-utils.c 2011-07-21 16:47:20.442813738 +0200
+@@ -731,8 +731,8 @@
+ if (strchr (lang, '.'))
+ continue;
+
+- path = gtr_dirs_get_gtr_data_dir ();
+- uri = g_build_filename (path, "gnome", "help", doc_id,
++ path = gtr_dirs_get_gtr_help_dir ();
++ uri = g_build_filename (path, doc_id,
+ lang, file_name, NULL);
+
+ if (g_file_test (uri, G_FILE_TEST_EXISTS))
+Index: gtranslator-2.90.5/src/gtr-dirs.c
+===================================================================
+--- gtranslator-2.90.5.orig/src/gtr-dirs.c 2011-07-21 16:45:34.598814298 +0200
++++ gtranslator-2.90.5/src/gtr-dirs.c 2011-07-21 16:46:42.534812441 +0200
+@@ -34,6 +34,7 @@
+ static gchar *user_cache_dir = NULL;
+ static gchar *user_plugins_dir = NULL;
+ static gchar *gtr_data_dir = NULL;
++static gchar *gtr_help_dir = NULL;
+ static gchar *gtr_locale_dir = NULL;
+ static gchar *gtr_lib_dir = NULL;
+ static gchar *gtr_plugins_dir = NULL;
+@@ -49,6 +50,8 @@
+ win32_dir = g_win32_get_package_installation_directory_of_module (NULL);
+
+ gtr_data_dir = g_build_filename (win32_dir, "share", "gtranslator", NULL);
++ gtr_help_dir = g_build_filename (win32_dir,
++ "share", "gtranslator", "help", NULL);
+ gtr_locale_dir = g_build_filename (win32_dir, "share", "locale", NULL);
+ gtr_lib_dir = g_build_filename (win32_dir, "lib", "gtranslator", NULL);
+
+@@ -64,6 +67,8 @@
+ ige_mac_bundle_get_resourcesdir (bundle);
+
+ gtr_data_dir = g_build_filename (bundle_data_dir, "gtranslator", NULL);
++ gtr_help_dir = g_build_filename (bundle_data_dir,
++ "gtranslator", "help" NULL);
+ gtr_locale_dir = g_strdup (ige_mac_bundle_get_localedir (bundle));
+ gtr_lib_dir = g_build_filename (bundle_resource_dir,
+ "lib", "gtranslator", NULL);
+@@ -72,6 +77,7 @@
+ if (gtr_data_dir == NULL)
+ {
+ gtr_data_dir = g_build_filename (DATADIR, "gtranslator", NULL);
++ gtr_help_dir = g_build_filename (DATADIR, "gnome", "help", NULL);
+ gtr_locale_dir = g_build_filename (DATADIR, "locale", NULL);
+ gtr_lib_dir = g_build_filename (LIBDIR, "gtranslator", NULL);
+ }
+@@ -95,6 +101,7 @@
+ g_free (user_cache_dir);
+ g_free (user_plugins_dir);
+ g_free (gtr_data_dir);
++ g_free (gtr_help_dir);
+ g_free (gtr_locale_dir);
+ g_free (gtr_lib_dir);
+ g_free (gtr_plugins_dir);
+@@ -127,6 +134,12 @@
+ }
+
+ const gchar *
++gtr_dirs_get_gtr_help_dir (void)
++{
++ return gtr_help_dir;
++}
++
++const gchar *
+ gtr_dirs_get_gtr_locale_dir (void)
+ {
+ return gtr_locale_dir;
+Index: gtranslator-2.90.5/src/gtr-dirs.h
+===================================================================
+--- gtranslator-2.90.5.orig/src/gtr-dirs.h 2011-07-21 16:46:23.398814322 +0200
++++ gtranslator-2.90.5/src/gtr-dirs.h 2011-07-21 16:46:42.550813363 +0200
+@@ -41,6 +41,8 @@
+
+ const gchar *gtr_dirs_get_gtr_data_dir (void);
+
++const gchar *gtr_dirs_get_gtr_help_dir (void);
++
+ const gchar *gtr_dirs_get_gtr_locale_dir (void);
+
+ const gchar *gtr_dirs_get_gtr_lib_dir (void);
Added: packages/unstable/gtranslator/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/patches/series?rev=29005&op=file
==============================================================================
--- packages/unstable/gtranslator/debian/patches/series (added)
+++ packages/unstable/gtranslator/debian/patches/series [utf-8] Thu Jul 21 15:07:22 2011
@@ -1,0 +1,1 @@
+help_display.patch
Modified: packages/unstable/gtranslator/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gtranslator/debian/rules?rev=29005&op=diff
==============================================================================
--- packages/unstable/gtranslator/debian/rules [utf-8] (original)
+++ packages/unstable/gtranslator/debian/rules [utf-8] Thu Jul 21 15:07:22 2011
@@ -4,7 +4,6 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
--include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
LDFLAGS += -Wl,-O1 -Wl,--as-needed
More information about the pkg-gnome-commits
mailing list