[ooo-build-commit] patches/dev300

[Kohei Yoshida]

 patches/dev300/apply |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 26ed7c54320e44e0d31005c7db78194257ec80c8
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Sat Dec 19 09:50:24 2009 -0500

    Moved Lockdown section to Common.
    
    Some patches already depend on the Lockdown section being included,
    & the majority of distros already include it anyway.
    
    * patches/dev300/apply:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c3756a3..c99ddd7 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -16,7 +16,7 @@ Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
 	 GStreamer, CWSBackports, WPG, Cleanups, WMF, GnomeVFS, WebDAV, \
 	 Layout, VBABits, VBAObjects, CalcErrors, CJK, GCJ, Lwp, WPS, \
 	 OOXML, OOXMLExport, SVGImport, FrameworkFeature, UnitTesting, \
-	 PopupRemoval, LinkWarningDlg, InternalCairo, \
+	 PopupRemoval, LinkWarningDlg, InternalCairo, Lockdown, \
 	 FedoraCommonFixes, InternalMesaHeaders, LayoutDialogs, Fuzz, \
 	 CalcRowLimit, Gcc44, BuildFix, OptionalIconThemes
 
@@ -59,7 +59,7 @@ Gnome2-26 : GnomeSessionManagement
 
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
-	     NotDebian, Lockdown, Split, Shrink, \
+	     NotDebian, Split, Shrink, \
 	     CustomUserConfig
 SUSE-9.1  : NovellBase
 SUSE-9.2  : NovellBase
@@ -76,7 +76,7 @@ SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Slackware
 Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess, CairoFonts
 # Debian
-DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL, MySQL
+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PostgreSQL, MySQL
 Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, HPPA
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
@@ -96,7 +96,7 @@ PLDBase: LinuxCommon, NotDebian, CairoFonts, PLDOnly
 PLD: PLDBase
 PLD64: PLDBase
 # Mandriva Linux
-MandrivaBase: CairoFonts, MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, LockDown, Split, NotDebian
+MandrivaBase: CairoFonts, MandrivaOnly, LinuxCommon, MandrivaOnlyUnix, Split, NotDebian
 Mandriva: MandrivaBase
 Mandriva64: MandrivaBase
 # Frugalware Linux
@@ -104,12 +104,12 @@ Frugalware: LinuxCommon, GnomeVFS, GlobalDesktopFiles, NonArkCommon, NoRpath, No
 # openmamba
 openmamba: LinuxCommon, GlobalDesktopFiles
 #Gentoo
-GentooBase : LinuxCommon, GentooOnly, NotDebian, Lockdown, CairoFonts, BerkeleyDB43, IntegrateExtensions
+GentooBase : LinuxCommon, GentooOnly, NotDebian, CairoFonts, BerkeleyDB43, IntegrateExtensions
 GentooUnstable: GentooBase, GentooExperimental, MySQL
 Gentoo : GentooBase
 Gentoo64: GentooBase
 # rPath Linux
-rPathCommon: LinuxCommon, NotDebian, Lockdown, BerkeleyDB43, CairoFonts
+rPathCommon: LinuxCommon, NotDebian, BerkeleyDB43, CairoFonts
 rpl2: rPathCommon
 rpl2-64: rPathCommon
 # ArchLinux
@@ -117,9 +117,9 @@ ArchLinux: LinuxCommon
 # Win32
 Win32 : Win32Common
 # translate.org.za
-translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
+translate-org-za-linux: translate-org-za-common, LinuxCommon, Common
 translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, Lockdown, Fpickers, \
+NovellLikeWin32: Win32Common, NovellOnly, NovellLikeOnlyWin32, MultilanguageWin32Only, Fpickers, \
 	CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
 # Novell
 NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only
@@ -148,7 +148,7 @@ OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions, Lib
 OxygenOfficeLinux:	OxygenOfficeLinuxCommon, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras
 OxygenOfficeWindows:	OxygenOfficeWin32Common, OxygenOfficePalettes, OxygenOfficeDefaultSettings, OxygenOfficeExtras, OxygenOfficeWin32Only
 # FSFhu
-FSFhuWindows : Win32Common, NovellOnly, Lockdown, Fpickers, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
+FSFhuWindows : Win32Common, NovellOnly, Fpickers, CustomUserConfig, LiberationFontsOnWindows, IntegrateExtensions
 FSFhuLinux : NovellBase, EMFPlus, CairoFonts, LiberationFontsOnWindows, IntegrateExtensions
 FSFhuMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, IntegrateExtensions
 # Plain build; just with base build fixes