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

[Petr Mladek]

 bin/package-ooo |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 47f35ec3867ad76581fc3a4d0d18c0f571fe439f
Author: Petr Mladek <pmladek at suse.cz>
Date:   Sat Dec 18 20:06:12 2010 +0100

    s/gid_Module_Langpack_Help/gid_Module_Helppack_Help/g
    
    the string was twice on some lines

diff --git a/bin/package-ooo b/bin/package-ooo
index a2e4e8f..90799fe 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -335,8 +335,8 @@ remove_help_localization()
     # 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_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
+	grep -v "$OOINSTBASE/help/$lang" $OODESTDIR/gid_Module_Helppack_Help.$lang >$OODESTDIR/gid_Module_Helppack_Help.$lang.new
+	mv -f $OODESTDIR/gid_Module_Helppack_Help.$lang.new $OODESTDIR/gid_Module_Helppack_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_Helppack_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_Helppack_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_Helppack_Help_$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help_$lang" || :
+			test -f gid_Module_Helppack_Help_$lang  	&& lang_lists="$lang_lists gid_Module_Helppack_Help_$lang" || :
 		fi
 		if test -n "$lang_lists" ; then
 		    # all files are installed below $OOINSTBASE/basis; we want to own also $OOINSTBASE