[Libreoffice-commits] .: 5 commits - patches/dev300

Bjoern Michaelsen bmichaelsen at kemper.freedesktop.org
Fri Jul 22 07:50:55 PDT 2011 

 patches/dev300/apply |   76 ++++-----------------------------------------------
 1 file changed, 7 insertions(+), 69 deletions(-)

New commits:
commit 1005581c8951df382807611d88c7bdcbe665cdfa
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:47:15 2011 +0200

    Remove empty msaccess section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index dc6e2a9..a922002 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -44,7 +44,7 @@ SUSE-11.1 : NovellBase, DisableGCJ, ImpressFontSize, PostgreSQL
 SUSE-11.2 : NovellBase, DisableGCJ, ImpressFontSize, PostgreSQL, SUSE112
 SUSE      : NovellBase, DisableGCJ, ImpressFontSize, PostgreSQL, SUSE112
 # Slackware
-Slackware : LinuxCommon, Mono, msaccess
+Slackware : LinuxCommon, Mono
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, PostgreSQL
 Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
@@ -54,8 +54,8 @@ UbuntuBased : DebianBase
 Ubuntu : UbuntuBased
 UbuntuL10n : UbuntuBased
 # DroplineGNOME
-DroplineGNOME : LinuxCommon, Mono, msaccess
-DroplineGNOME64 : LinuxCommon, Mono, msaccess
+DroplineGNOME : LinuxCommon, Mono
+DroplineGNOME64 : LinuxCommon, Mono
 # Ark Linux
 Ark: LinuxCommon, ArkOnly
 # www.pld-linux.org
@@ -98,7 +98,7 @@ Pardus2008: PardusOnly, LinuxCommon
 Solaris: NovellBase, UnstableExtensions
 # OxygenOffice Professional
 OxygenOfficeLinuxCommon :	Common,  LinuxOnly, \
-				msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, \
+				OpenGLTransitions, CliMonoCommon, Mono, MonoComp, \
 				Netbook
 OxygenOfficeMacOSXCommon :	Common
 OxygenOfficeWin32Common :	Common, Win32Only, CliMonoCommon, CliComponent
@@ -1092,25 +1092,6 @@ cws-mav58.diff, bnc#651977, tml
 webdav-locking-after-mav58.diff, tml
 sfx2-pre-and-postprocess-during-save-load-after-mav58.diff, i#71939, flr
 
-
-[ msaccess ]
-SectionOwner => strba
-SectionIssue => i#33654
-
-#cws-mdbdriver01.diff
-
-#cws-mdbdriver02.diff
-
-#mdbtools.diff
-#mdbtools-makefile-mk.diff
-#mdbtools-prj-build-lst.diff
-#mdbtools-prj-d-lst.diff
-
-#connectivity-source-drivers-mdb-mdb-map.diff
-
-#hack to get the proper msaccess tabpage
-#msaccess-db-create-dialog-fix.diff
-
 [ OOXML ]
 win32-installer-register-moox-types.diff
 
commit c3d27a47c5cb96308ff038311566e5c0bf013bda
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:44:09 2011 +0200

    Remove empty CustomUserConfig section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index c90f752..dc6e2a9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -31,7 +31,7 @@ NLPSolver : NLPSolverBits
 Localize : LocalizeFixes
 
 # Novell
-NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, CustomUserConfig
+NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix
 SUSE-9.1  : NovellBase, DisableGCJ
 SUSE-9.2  : NovellBase, DisableGCJ
 SUSE-9.3  : NovellBase, DisableGCJ
@@ -85,7 +85,7 @@ Win32 : Win32Common
 translate-org-za-linux: translate-org-za-common, LinuxCommon, Common
 translate-org-za-win32: translate-org-za-common, Win32Common, Common
 NovellLikeWin32: Win32Common, NovellOnly, MultilanguageWin32Only, \
-	CustomUserConfig, LiberationFontsOnWindows
+	LiberationFontsOnWindows
 # Novell
 NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, Win32Packaging
 NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
@@ -379,17 +379,6 @@ novell-palette.diff, michael
 # Also fix OOo/GW deadlock
 win32-gw-send-mail.diff, i#34264, n#418407, tml
 
-[ CustomUserConfig ]
-
-# This section includes patches that deal with custom user configuration items
-# that are not present upstream.
-
-SectionOwner => kohei
-
-# migrate keyboard shortcuts & reset character set for CSV import dialog.
-# FIXME dev300-m83 desktop-config-migration.diff n#367160, n#376473, n#421070, n#466064, kohei/jholesov
-
-
 [ DebianBaseOnly ]
 SectionOwner => rengelha
 
commit 641767a51901f007a6815070d0b659efa33e45da
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:42:45 2011 +0200

    Remove empty CJKTemporaryHacks section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 6a0ee19..c90f752 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -162,17 +162,6 @@ buildfix-instsetoo_native-archive.diff, i#111617
 
 buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
 
-#[ CJKTemporaryHacks ]
-# the following patch is disabled temporary.
-# default value of tab stop for Chinese version
-#default-tabstop-Chinese.diff, Fong Lin
-
-# default value of automatic text indent for Chinese version
-#sw-auto-text-indent-zh.diff, Fong Lin
-
-# for mixed font set
-#FIXME src680: font_list_box_cjk.diff, i#73003, Fong Lin
-
 [ Fixes ]
 # use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
 sd-toolbar-advanced-shapes.diff, n#171052, rodo
commit 175d3cb7bd763565ac00726e3d4b7b6275aeff64
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:42:03 2011 +0200

    Remove empty OOXMLExportDevel section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1e79e89..6a0ee19 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1432,24 +1432,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
 # link dynamically with liblpsolve55.so
 system-lpsolve-rpath.diff, rengelha
 
-
-
-[ OOXMLExportDevel ]
-# this s shared binary/ooxml filter
-# mostly merged into git by now, except for
-# xlsx-export-row-limit-fix.diff, n#504623, kohei
-
-# this used to be xlsx-shared-oox-chart-export-part1.diff, Fong
-# it is now merged into git, except for the hunk patching pptx
-# which follows:
-
-# Except that this diff file does not exist, huh?
-
-# There has been some mixups and reverts back and forth of commits
-# to this apply file, so I will just comment this out for now --tml
-
-# xlsx-shared-oox-chart-export-part1-pptx-part.diff
-
 [ CrossWin32Patches ]
 # Experimental patches to crosscompile OOo for Win32
 crosswin32-connectivity-mingw.diff
commit d1684b242a97478d27983c00e9e9a800f564208a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Fri Jul 22 16:40:35 2011 +0200

    Remove empty OSXOnly section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index ed057fd..1e79e89 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -90,7 +90,7 @@ NovellLikeWin32: Win32Common, NovellOnly, MultilanguageWin32Only, \
 NovellWin32: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids, Win32Packaging
 NovellWin32ISO: NovellLikeWin32, NovellOnlyWin32, MultilanguageWin32Only, NovellWin32WritingAids
 # Mac OS X
-MacOSX : MacOSXCommon, MacOSXOnly
+MacOSX : MacOSXCommon
 # Pardus
 Pardus2007: PardusOnly, LinuxCommon
 Pardus2008: PardusOnly, LinuxCommon
@@ -1510,9 +1510,6 @@ netbook-window-decoration-update.diff, n#621116, rodo
 pdf-export-dialog-reduce-height.diff, bnc#623352, rodo
 recovery-dialog-reduce-height.diff, bnc#623352, rodo
 
-[ MacOSXOnly ]
-SectionOwner => thorsten
-
 [ Toolbars ]
 SectionOwner => jholesov
 # experimental now

More information about the Libreoffice-commits mailing list