[ooo-build-commit] .: bin/package-ooo

[René Engelhard]

 bin/package-ooo |    3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 524a0830b46ec0272f7ea920fd9335d50bf898a6
Author: Rene Engelhard <rene at debian.org>
Date:   Thu May 27 02:04:05 2010 +0200

    don't try to install Writer-javamail.xcu
    
    * bin/package-ooo: Writer-javamail.xcu seems to be obsolete, don't install

diff --git a/bin/package-ooo b/bin/package-ooo
index aaaab36..6407af5 100755
--- a/bin/package-ooo
+++ b/bin/package-ooo
@@ -673,7 +673,6 @@ if test "z$VENDORNAME" != "zDebian" ; then
 			rm -f $flist
 		fi
 		mv_file_between_flists $flist common_list.txt $OOINSTBASE/basis$VERSION/program/mailmerge.py
-		mv_file_between_flists $flist common_list.txt $OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
 		add_used_directories $flist common_list.txt
 	fi
 
@@ -865,8 +864,6 @@ else
 		mv pkg/openoffice.org-common/$OOINSTBASE/basis$VERSION/program/mailmerge.py \
 			pkg/openoffice.org-emailmerge/$OOINSTBASE/basis$VERSION/program/mailmerge.py
 		mkdir -p pkg/openoffice.org-emailmerge/$OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer
-		mv pkg/openoffice.org-common/$OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu \
-			pkg/openoffice.org-emailmerge/$OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
 	fi
 	create_package_directory gid_Module_Optional_OGLTrans		pkg/openoffice.org-ogltrans