ooo-build r13426 - in trunk: . bin patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Tue Jul 29 11:23:52 2008
New Revision: 13426
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13426&view=rev

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

        * patches/dev300/apply: apply linkwarn-svtools-miscopts-bits-m26.diff
          for >= dev300-m28 again
        * bin/package-ooo: move help stuff from l10n to help
        * bin/install-mono: check for cli_oootypes.dll instead of
          cli_basetypes.dll


Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/bin/package-ooo
   trunk/patches/dev300/apply

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Tue Jul 29 11:23:52 2008
@@ -11,7 +11,7 @@
 test -n "$1" && OOINSTDIR="$1"
 
 # continue only when mono has been built
-test -f $OOINSTDIR/basis$VERSION/program/cli_basetypes.dll || exit 0;
+test -f $OOINSTDIR/basis$VERSION/program/cli_oootypes.dll || exit 0;
 
 
 echo "Finishing the mono installation..."

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Tue Jul 29 11:23:52 2008
@@ -909,6 +909,11 @@
 				create_package_directory gid_Module_Langpack_Binfilter_`echo $l | sed -e s/-/_/g`    pkg/openoffice.org-l10n-$l
 			fi
 		fi
+		# some help files are in _Langpack_{Writer,Impress,...}_<lang>
+		# move them from -l10n to -help
+		mv pkg/openoffice.org-l10n-$l/$OOINSTBASE/basis$VERSION/help/$l/*
+			pkg/openoffice.org-help-$l/$OOINSTBASE/basis$VERSION/help/$l && \
+		rmdir pkg/openoffice.org-l10n-$l/$OOINSTBASE/basis$VERSION/help/$l
 	done
 
 	# move_wrappers <directory_name> <name> [...]

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Jul 29 11:23:52 2008
@@ -2445,10 +2445,10 @@
 linkwarn-dlg-in-apps.diff, n#348149, thorsten
 linkwarn-sfx2-disable-cb-persistency.diff, n#348149, thorsten
 
-[ LinkWarningDlg <= dev300-m26]
+[ LinkWarningDlg <= dev300-m26 >= dev300-m28 ]
 linkwarn-svtools-miscopts-bits-m26.diff
 
-[ LinkWarningDlg > dev300-m26]
+[ LinkWarningDlg > dev300-m26 < dev300-m28 ]
 linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
 
 [ LinkWarningDlg ]