From 7838152cdfea71a3676e40593ab4cb4a30484ffe Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sun, 28 Feb 2010 19:13:00 -0500
Subject: [PATCH] Additional changes to support parallel installation

Changed GETTEXT_PACKAGE to glabels-3.0 and renamed help files to support
parallel installation with other versions of glabels.
---
 .gitignore                                  | 6 +++---
 configure.ac                                | 2 +-
 help/C/{glabels.xml => glabels-3.0.xml}     | 0
 help/Makefile.am                            | 2 +-
 help/{glabels.omf.in => glabels-3.0.omf.in} | 0
 po/POTFILES.in                              | 5 ++---
 src/ui-commands.c                           | 2 +-
 7 files changed, 8 insertions(+), 9 deletions(-)
 rename help/C/{glabels.xml => glabels-3.0.xml} (100%)
 rename help/{glabels.omf.in => glabels-3.0.omf.in} (100%)

diff --git a/.gitignore b/.gitignore
index b9f9a4f9..ea213aec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,12 +59,12 @@ glabels-*.tar.gz
 /po/*.gmo
 /po/POTFILES
 /po/stamp-it
-/po/glabels.pot
+/po/glabels*.pot
 
 /help/glabels-*.omf
 /help/*/.xml2po.mo
-/help/*/glabels.xml
-!/help/C/glabels.xml
+/help/*/glabels*.xml
+!/help/C/glabels*.xml
 
 /docs/libglabels/*.stamp
 /docs/libglabels/xml/
diff --git a/configure.ac b/configure.ac
index 86c7b723..ec3665b4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -232,7 +232,7 @@ AM_CONDITIONAL(ENABLE_UPDATE_DESKTOPDB, test x$enable_update_desktopdb = xyes)
 dnl ---------------------------------------------------------------------------
 dnl - i18n support
 dnl ---------------------------------------------------------------------------
-GETTEXT_PACKAGE=glabels
+GETTEXT_PACKAGE=${GLABELS_BRANCH}
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package])
 
diff --git a/help/C/glabels.xml b/help/C/glabels-3.0.xml
similarity index 100%
rename from help/C/glabels.xml
rename to help/C/glabels-3.0.xml
diff --git a/help/Makefile.am b/help/Makefile.am
index 561c402f..106ec0e6 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/gnome-doc-utils.make
 
 dist-hook: doc-dist-hook
 
-DOC_MODULE = glabels
+DOC_MODULE = $(GLABELS_BRANCH)
 DOC_ENTITIES = legal.xml 
 DOC_INCLUDES =
 DOC_FIGURES = figures/glabels-template-cd.png      	\
diff --git a/help/glabels.omf.in b/help/glabels-3.0.omf.in
similarity index 100%
rename from help/glabels.omf.in
rename to help/glabels-3.0.omf.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 272379e4..0a80e84e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -217,10 +217,9 @@ libglabels/xml-template.h
 [type: gettext/glade]data/builder/template-designer.builder
 [type: gettext/glade]data/builder/print-op-dialog-custom-widget.builder
 
-[type: gettext/ini]data/desktop/glabels.desktop.in
+[type: gettext/ini]data/desktop/glabels-3.0.desktop.in
 
-[type: gettext/keys]data/mime/glabels.keys.in
-[type: gettext/xml]data/mime/glabels.xml.in
+[type: gettext/xml]data/mime/glabels-3.0.xml.in
 
 [type: gettext/xml]templates/paper-sizes.xml
 [type: gettext/xml]templates/categories.xml
diff --git a/src/ui-commands.c b/src/ui-commands.c
index f31f87cc..89203b91 100644
--- a/src/ui-commands.c
+++ b/src/ui-commands.c
@@ -1102,7 +1102,7 @@ gl_ui_cmd_help_contents (GtkAction *action,
         g_return_if_fail (window && GL_IS_WINDOW(window));
 
         gtk_show_uri (gtk_widget_get_screen (GTK_WIDGET (window)),
-                      "ghelp:glabels",
+                      "ghelp:glabels-3.0",
                       GDK_CURRENT_TIME, 
                       &error);
         
-- 
2.39.5