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

[rengelhard svn gnome org]

Author: rengelhard
Date: Thu Mar 27 11:31:40 2008
New Revision: 12018
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12018&view=rev

Log:
2008-03-27  Rene Engelhard  <rene debian org>

        * bin/package-ooo: fix langpack/help install for Debian
        * patches/dev300/debian-splash.diff,
          patches/dev300/sensible-browser.diff: dev300 versions


Added:
   trunk/patches/dev300/debian-splash.diff
      - copied, changed from r12016, /trunk/patches/src680/debian-splash.diff
   trunk/patches/dev300/sensible-browser.diff
      - copied, changed from r12016, /trunk/patches/src680/sensible-browser.diff
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/patches/dev300/apply

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Mar 27 11:31:40 2008
@@ -803,11 +803,22 @@
 
 	create_package_directory gid_Module_Root_SDK                    pkg/openoffice.org-dev
 
-	for l in `echo $OOO_LANGS_LIST | sed -e s/en-US//`; do \
-		create_package_directory gid_Module_Root.$l		pkg/openoffice.org-l10n-$l; \
-		create_package_directory gid_Module_Langpack_Resource.$l	pkg/openoffice.org-l10n-$l; \
-		create_package_directory gid_Module_Langpack_Help.$l	pkg/openoffice.org-help-$l; \
-	done
+	if echo $CVSTAG | grep -q -i dev300; then
+		create_package_directory gid_Module_Root_$l             pkg/openoffice.org-l10n-$l
+		for l in `echo $OOO_LANGS_LIST`; do \
+			for p in Root Impress Draw Math Calc Base Writer; do \
+				create_package_directory  gid_Module_Langpack_${p}_`echo $l | sed -e s/-/_/g`   pkg/openoffice.org-l10n-$l
+			done
+		done
+		create_package_directory gid_Module_Langpack_Resource_`echo $l | sed -e s/-/_/g`        pkg/openoffice.org-l10n-$l
+		create_package_directory gid_Module_Langpack_Help_`echo $l | sed -e s/-/_/g`    pkg/openoffice.org-help-$l
+	else
+		for l in `echo $OOO_LANGS_LIST | sed -e s/en-US//`; do \
+			create_package_directory gid_Module_Root.$l		pkg/openoffice.org-l10n-$l; \
+			create_package_directory gid_Module_Langpack_Resource.$l	pkg/openoffice.org-l10n-$l; \
+			create_package_directory gid_Module_Langpack_Help.$l	pkg/openoffice.org-help-$l; \
+		done
+	fi
 
 	# move_wrappers <directory_name> <name> [...]
 	move_wrappers()
@@ -820,14 +831,14 @@
 			shift
 		done
 	}
-	move_wrappers pkg/openoffice.org-common ooffice oofromtemplate soffice
+	move_wrappers pkg/openoffice.org-common ooffice oofromtemplate soffice unopkg
 	move_wrappers pkg/openoffice.org-base oobase
 	move_wrappers pkg/openoffice.org-writer oowriter ooweb
 	move_wrappers pkg/openoffice.org-calc oocalc
 	move_wrappers pkg/openoffice.org-impress ooimpress
 	move_wrappers pkg/openoffice.org-math oomath
 	move_wrappers pkg/openoffice.org-draw oodraw
-
+	
 	# Core package contains arch dependent files
 	#mkdir -m755 -p pkg/openoffice.org-core/$OOINSTBASE/program/filter
 	#mv pkg/openoffice.org-common/$OOINSTBASE/program/filter/* pkg/openoffice.org-core/$OOINSTBASE/program/filter

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Mar 27 11:31:40 2008
@@ -268,7 +268,6 @@
 
 cws-hsqldb16.diff, i#85087
 
-
 [ WPG ]
 # libwpg-based import filter for WordPerfect Graphics
 libwpg.diff

Copied: trunk/patches/dev300/debian-splash.diff (from r12016, /trunk/patches/src680/debian-splash.diff)
==============================================================================
--- /trunk/patches/src680/debian-splash.diff	(original)
+++ trunk/patches/dev300/debian-splash.diff	Thu Mar 27 11:31:40 2008
@@ -1,6 +1,6 @@
---- scp2/source/ooo/profileitem_ooo.scp-old	2005-09-14 23:48:03.232375952 +0200
-+++ scp2/source/ooo/profileitem_ooo.scp	2005-09-14 23:48:32.327952752 +0200
-@@ -523,7 +523,7 @@
+--- scp2/source/ooo/ooo_brand-old	2005-09-14 23:48:03.232375952 +0200
++++ scp2/source/ooo/ooo_brand.scp	2005-09-14 23:48:32.327952752 +0200
+@@ -66,7 +66,7 @@
      Section = "Bootstrap";
      Order = 2;
      Key = "ProgressBarColor";
@@ -8,4 +8,4 @@
 +    Value = "215,7,81";
  End
  
- ProfileItem gid_Profileitem_Soffice_ProgressSize
+ ProfileItem gid_Brand_Profileitem_Soffice_ProgressSize

Copied: trunk/patches/dev300/sensible-browser.diff (from r12016, /trunk/patches/src680/sensible-browser.diff)
==============================================================================
--- /trunk/patches/src680/sensible-browser.diff	(original)
+++ trunk/patches/dev300/sensible-browser.diff	Thu Mar 27 11:31:40 2008
@@ -5,15 +5,14 @@
 diff -u -u -r1.3 gnome-open-url.sh
 --- shell/source/unix/misc/gnome-open-url.sh	13 May 2005 07:31:07 -0000	1.3
 +++ shell/source/unix/misc/gnome-open-url.sh	6 Jun 2005 09:43:06 -0000
-@@ -49,7 +49,11 @@
-     ;;
- esac
+@@ -1,6 +1,10 @@
+ #!/bin/sh
  
 -# use gnome-open utility coming with libgnome if available
 -gnome-open "$1" 2>/dev/null || "$0.bin" $1
 +if which gnome-open; then
 +	# use gnome-open utility coming with libgnome if available
-+	gnome-open "$1" 2>/dev/null
++	gnome-open "$1" 2>/dev/null || "$0.bin" $1
 +else
 +	sensible-browser "$1"
 +fi