ooo-build r12175 - in trunk: . patches/src680

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Apr 15 20:11:05 2008
New Revision: 12175
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12175&view=rev

Log:
2008-04-15  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/desktop-keyconfig-migration.diff,	
	* patches/src680/desktop-config-migration.diff: renamed since the patch
	does a little more than just migrating the key configurations.

	* patches/src680/apply: moved sc-preserve-imp-opts.diff from 
	[ CalcFixes ] to [ CustomUserConfig ] section since this patch makes 
	use of go-oo's own custom configuration values.


Added:
   trunk/patches/src680/desktop-config-migration.diff
      - copied unchanged from r12174, /trunk/patches/src680/desktop-keyconfig-migration.diff
Removed:
   trunk/patches/src680/desktop-keyconfig-migration.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Tue Apr 15 20:11:05 2008
@@ -40,7 +40,7 @@
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, CalcSolver, Split, Shrink, \
-	     CalcDataPilotDrillDown, CustomKeyBinding
+	     CalcDataPilotDrillDown, CustomUserConfig
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
@@ -101,7 +101,7 @@
 # translate.org.za
 translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
 translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas, Fpickers, CustomKeyBinding
+NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas, Fpickers, CustomUserConfig
 # Novell
 NovellWin32: NovellLikeWin32
 NovellWin32ISO: NovellLikeWin32
@@ -647,9 +647,6 @@
 # Excel compatibility for handling of "string numbers".
 sc-string-arg.diff, i#5658, kohei
 
-# To make CSV Text Import settings persistent
-sc-preserve-imp-opts.diff, i#3687, muthusub
-
 # Print_Area/Print_Titles are only relevant for sheet local names, n#191005
 sc-xls-builtin-name-scope.diff, n#191005, n#257422, jonp
 
@@ -842,14 +839,21 @@
 redirect-extensions.diff
 
 
-[ CustomKeyBinding ]
+[ CustomUserConfig ]
+
+# This section includes patches that deal with custom user configuration items
+# that are not present upstream.
+
 SectionOwner => kohei
 
 # Swap the delete and backspace key bindings but leave the menus alone.
 sc-default-delete-backspace-key.diff, i#17965, kohei
 
-# migrate keyboard shortcuts properly.
-desktop-keyconfig-migration.diff n#367160, kohei
+# migrate keyboard shortcuts & reset character set for CSV import dialog.
+desktop-config-migration.diff n#367160, n#376473, kohei
+
+# To make CSV Text Import settings persistent.
+sc-preserve-imp-opts.diff, i#3687, muthusub
 
 
 [ DebianBaseOnly ]