ooo-build r13336 - in trunk: . bin

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jul 21 22:05:15 2008
New Revision: 13336
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13336&view=rev

Log:
2008-07-22  Rene Engelhard  <rene debian org>

        * bin/package-ooo: split pymailmerge manually to -emailmerge since
          m26 removed the Headless and Pymailmerge modules completely
          making them end up in core04/06. So far Debian-only, no idea what
          the others want to do with those files.


Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon Jul 21 22:05:15 2008
@@ -871,10 +871,8 @@
         create_package_directory gid_Module_Brand_Prg_Impress           pkg/openoffice.org-impress
         create_package_directory gid_Module_Brand_Prg_Base              pkg/openoffice.org-base
         create_package_directory gid_Module_Optional_Pyuno		pkg/python-uno
-        create_package_directory gid_Module_Optional_Pymailmerge	pkg/openoffice.org-emailmerge
         create_package_directory gid_Module_Optional_Gnome		pkg/openoffice.org-gnome
         create_package_directory gid_Module_Optional_Kde                pkg/openoffice.org-kde
-	create_package_directory gid_Module_Optional_Headless		pkg/openoffice.org-headless
 
         create_package_directory gid_Module_Root_Files_2                pkg/openoffice.org-common
         create_package_directory gid_Module_Root_Files_3                pkg/openoffice.org-common
@@ -883,6 +881,16 @@
         create_package_directory gid_Module_Root_Files_6                pkg/openoffice.org-common
         create_package_directory gid_Module_Root_Files_7                pkg/openoffice.org-common
         create_package_directory gid_Module_Optional_Testtool           pkg/openoffice.org-common
+        if [ -e gid_Module_Optional_Pymailmerge ]; then
+		create_package_directory gid_Module_Optional_Pymailmerge	pkg/openoffice.org-emailmerge
+	else # post m26
+		mkdir -p pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/program
+		mv pkg/openoffice.org-common/usr/lib/openoffice/basis$VERSION/program/mailmerge.py \
+			pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/program/mailmerge.py
+		mkdir -p pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer
+		mv pkg/openoffice.org-common/usr/lib/openoffice/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu \
+			pkg/openoffice.org-emailmerge/usr/lib/openoffice/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+	fi
 
 	create_package_directory gid_Module_Root_SDK                    pkg/openoffice.org-dev