[Libreoffice-commits] .: Branch 'libreoffice-3-3' - bin/package-ooo

[René Engelhard]

 bin/package-ooo |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 207c4ee01bd35356315a8342e698c4fb59463a79
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Dec 16 13:23:19 2010 +0100

    s/gid_Module_Langpack_Help/gid_Module_Helppack_Help/

diff --git a/bin/package-ooo b/bin/package-ooo
index e4ae2b2..a2e4e8f 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -328,15 +328,15 @@ remove_help_localization()
     mv -f $OODESTDIR/gid_Module_Root.$lang.new $OODESTDIR/gid_Module_Root.$lang
     # FIXME: the following code could be used without the condition
     #        and should replace the lines above after only the milestones
-    #	     providing gid_Module_Langpack_Help and fixed gid_Module_Root.$lang
+    #	     providing gid_Module_Helppack_Help and fixed gid_Module_Root.$lang
     #        are supported
     # Note: The problem with gid_Module_Root.$lang is that it still includes
     #       %dir */help/* entries.
     # Note: It was still necessary on ppc with gcj (OOo-2.0.2). Strange. Have to
     # investigate it later.
-    if test -f $OODESTDIR/gid_Module_Langpack_Help.$lang ; then
-	grep -v "$OOINSTBASE/help/$lang" $OODESTDIR/gid_Module_Langpack_Help.$lang >$OODESTDIR/gid_Module_Langpack_Help.$lang.new
-	mv -f $OODESTDIR/gid_Module_Langpack_Help.$lang.new $OODESTDIR/gid_Module_Langpack_Help.$lang
+    if test -f $OODESTDIR/gid_Module_Helppack_Help.$lang ; then
+	grep -v "$OOINSTBASE/help/$lang" $OODESTDIR/gid_Module_Helppack_Help.$lang >$OODESTDIR/gid_Module_Langpack_Help.$lang.new
+	mv -f $OODESTDIR/gid_Module_Helppack_Help.$lang.new $OODESTDIR/gid_Module_Langpack_Help.$lang
     fi
 
     # Note: We created a compat symlink in the past. It is no longer necessary.
@@ -580,7 +580,7 @@ if test "z$VENDORNAME" != "zDebian" ; then
 			test -f gid_Module_Langpack_Writer_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Writer_$lang" || :
 			test -f gid_Module_Langpack_Binfilter_$lang  && lang_lists="$lang_lists  gid_Module_Langpack_Binfilter_$lang" || :
 			# Place helps on dedicated packages.
-			test -f gid_Module_Langpack_Help_$lang  	&& sort -u gid_Module_Langpack_Help_$lang > $BUILDDIR/help_${lang}_list.txt || :
+			test -f gid_Module_Helppack_Help_$lang  	&& sort -u gid_Module_Langpack_Help_$lang > $BUILDDIR/help_${lang}_list.txt || :
 		else
 			test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Basis_$lang" || :
 			test -f gid_Module_Langpack_Brand_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Brand_$lang" || :
@@ -592,7 +592,7 @@ if test "z$VENDORNAME" != "zDebian" ; then
 			test -f gid_Module_Langpack_Base_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Base_$lang" || :
 			test -f gid_Module_Langpack_Writer_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Writer_$lang" || :
 			test -f gid_Module_Langpack_Binfilter_$lang  && lang_lists="$lang_lists  gid_Module_Langpack_Binfilter_$lang" || :
-			test -f gid_Module_Langpack_Help_$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help_$lang" || :
+			test -f gid_Module_Helppack_Help_$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help_$lang" || :
 		fi
 		if test -n "$lang_lists" ; then
 		    # all files are installed below $OOINSTBASE/basis; we want to own also $OOINSTBASE
@@ -876,7 +876,7 @@ else
 		create_package_directory gid_Module_Langpack_Basis_`echo $l | sed -e s/-/_/g`	pkg/libreoffice-l10n-$l
 		create_package_directory gid_Module_Langpack_Brand_`echo $l | sed -e s/-/_/g`	pkg/libreoffice-l10n-$l
 		create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`        pkg/libreoffice-l10n-$l
-		create_package_directory gid_Module_Langpack_Help_`echo $l | sed -e s/-/_/g`    pkg/libreoffice-help-$l
+		create_package_directory gid_Module_Helppack_Help_`echo $l | sed -e s/-/_/g`    pkg/libreoffice-help-$l
 		if [ -f gid_Module_Optional_Binfilter ]; then
 			if [ "$l" = "en-US" ]; then
 				create_package_directory gid_Module_Langpack_Binfilter_en_US    pkg/libreoffice-filter-binfilter