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

[kyoshida svn gnome org]

Author: kyoshida
Date: Wed Mar 12 22:35:43 2008
New Revision: 11886
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11886&view=rev

Log:
2008-03-12  Kohei Yoshida  <kyoshida novell com>

	* patches/src680/apply: moved the custom key binding patches to their
	own section so that they would get applied to NovellBase (and its win32
	cousin) only.  Also removed NotMacOSX section since that section is now
	empty.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Wed Mar 12 22:35:43 2008
@@ -17,12 +17,12 @@
 	 OOXML, SVGImport, AutoCorrectCapsLock, UnitTesting
 
 LinuxCommon : Common, EMFPlus, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
-	      FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
+	      FedoraFixes, LinuxOnly, SystemBits, \
 	      cairocanvas, msaccess, OpenGLTransitions, \
 	      Fpickers, Mono, AddressBooks, QuickStarter
 MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
 Win32Common : Common, EMFPlus, Defaults, TangoIcons, \
-	      Win32Only, NotDebian, NotMacOSX
+	      Win32Only, NotDebian
 # Experimental sections
 Experimental: DebianBaseNoHelpContent, \
               VBAUntested, ArkOnlyExperimental, SharedWorksheets, \
@@ -40,7 +40,7 @@
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, CalcSolver, Split, Shrink, \
-	     CalcDataPilotDrillDown
+	     CalcDataPilotDrillDown, CustomKeyBinding
 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
+NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, CalcSolver, cairocanvas, Fpickers, CustomKeyBinding
 # Novell
 NovellWin32: NovellLikeWin32
 NovellWin32ISO: NovellLikeWin32
@@ -118,11 +118,11 @@
 GoOoLinux: NovellBase, Glib2
 # OxygenOffice Professional
 OxygenOfficeLinuxCommon :	Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
-	      			FedoraFixes, LinuxOnly, NotMacOSX, SystemBits, \
+	      			FedoraFixes, LinuxOnly, SystemBits, \
 	      			cairocanvas, msaccess, OpenGLTransitions, \
 	      			Fpickers, Mono, AddressBooks, QuickStarter
 OxygenOfficeMacOSXCommon :	Common, SystemBits
-OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, NotMacOSX
+OxygenOfficeWin32Common :	Common, Win32Only, NotDebian
 
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon,  CalcSolver, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 OxygenOfficeWindows:	OxygenOfficeWin32Common,  CalcSolver, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
@@ -840,12 +840,6 @@
 # fix: this breaks win32
 fpicker-kde-gcc4-visibility.diff, pmladek
 
-[ NotMacOSX ]
-
-# Make the delete key happy again in starcalc  - wontfix [!]
-#gui-sc-delete.diff, i#17965, michael
-# Swap the delete and backspace key bindings but leave the menus alone.
-sc-default-delete-backspace-key.diff, i#17965, kohei
 
 [ Misc ]
 # Insert symbol defaults to the Symbol font - not a random one
@@ -920,6 +914,17 @@
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions.diff
 
+
+[ CustomKeyBinding ]
+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
+
+
 [ DebianBaseOnly < ooh680-m4 ]
 sdk-remove-non-free.diff
 
@@ -1079,9 +1084,6 @@
 # => Tango should be preferred over Industrial.
 tango-prefer-over-industrial.diff, n#304615, pmladek
 
-# migrate keyboard shortcuts while forcing the new default Delete and Backspace
-# key bindings.
-desktop-keyconfig-migration.diff n#367160, kohei
 
 [ DefaultSettings ]