------------------------------------------------------------
revno: 2176
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Sun 2010-11-07 12:10:11 +0100
message:
update from git and close #572535
modified:
changelog
patches/buildfix-patches.diff
=== modified file 'changelog'
--- a/changelog 2010-11-04 01:53:52 +0000
+++ b/changelog 2010-11-07 11:10:11 +0000
@@ -1,6 +1,8 @@
-libreoffice (1:3.3.0~beta3~20101102-1) UNRELEASED; urgency=low
+libreoffice (1:3.3.0~beta3~20101106-1) UNRELEASED; urgency=low
* update to 3.2.99.3 git (libreoffice-3-3 branch)
+ - Set correct default formula syntax value in case it's not
+ explicitly set (closes: #572535)
* debian/patches/buildfix-patches.diff:
openoffice.org-report-builder -> libreoffice-report-builder
@@ -35,7 +37,7 @@
* debian/rules, debian/control.in: hi-IN -> hi
* debian/watch: update to look for libreoffice-build
- -- Rene Engelhard <r...@debian.org> Thu, 04 Nov 2010 02:49:02 +0100
+ -- Rene Engelhard <r...@debian.org> Sat, 06 Nov 2010 16:36:32 +0100
libreoffice (1:3.3.0~beta2-2) experimental; urgency=low
=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff 2010-11-03 18:47:51 +0000
+++ b/patches/buildfix-patches.diff 2010-11-07 11:10:11 +0000
@@ -1329,42 +1329,3 @@
dbaccess source\ui\dlg\ExtensionNotPresent.src 0 modaldialog
RID_EXTENSION_NOT_PRESENT_DLG HID_EXTENSION_NOT_PRESENT_DLG
0 zh-TW %PRODUCTNAME %PRODUCTVERSION
2002-02-02 02:02:02
- dbaccess source\ui\dlg\AutoControls_tmpl.hrc 0 pushbutton
AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID)
PB_AUTOBROWSEURL (AUTO_HID + 1) 0 zh-TW 瀏覽
2002-02-02 02:02:02
+ dbaccess source\ui\dlg\CollectionView.src 0 imagebutton
DLG_COLLECTION_VIEW BTN_EXPLORERFILE_NEWFOLDER 0
zh-TW - 建立新的目錄 2002-02-02 02:02:02
---- libreoffice-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/apply-old
2010-10-18 09:11:18.000000000 +0200
-+++ libreoffice-3.3.0/libreoffice-build-3-2-99-2/patches/dev300/apply
2010-10-18 09:11:30.000000000 +0200
-@@ -15,7 +15,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
- Icons, CalcFixes, WriterFixes, EasterEgg, \
- CWSBackports, Cleanups, WMF, GnomeVFS, WebDAV, \
- Layout, VBABits, VBAObjects, CalcErrors, GCJ, \
-- OOXML, OOXMLExportDevel, OOXMLExport, UnitTesting, \
-+ OOXML, UnitTesting, \
- FedoraCommonFixes, LayoutDialogs, Fuzz, \
- BuildFix, WriterDocComparison, \
- MySQL, BorderTypes, WriterNavigation
-@@ -32,7 +32,7 @@ Experimental: VBAUntested, ArkOnlyExperimental, \
- PostgreSQL, SELinux, \
- UnitBootstrap, RadioButtons, UnstableLibwpd, WWInProgress, \
- KDE4Experimental, MinGW, CalcExperimental, \
-- OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
-+ OOXMLExportDevel, OOXMLExport, OOXMLExportExperimental,
CrossWin32Patches, AutoLayout, \
- WriterNavigation \
- HPPA, AXP, Speed, GSoC2010, Toolbars
- DebianLooseSections: DebianBaseNoHelpContent
-@@ -1946,7 +1946,7 @@
- [ Fixes ]
- fix-ppt-linespacing-import-export.diff, n#355302, rodo
-
--fields-table-formula.diff, n#631912, cbosdo
-+#fields-table-formula.diff, n#631912, cbosdo
-
- # Backport from cbosdo06 CWS
- sw-table-frame-uno-fix.diff, i#112564, cbosdo
-@@ -2338,7 +2347,7 @@ transogl-crossplatform.diff, ericb
- [ Features ]
- # embed generic media files inside odf docs, plus various related
- # sound fixes from rodo
--impressmedia-features.diff, i#83753, n#515553, thorsten
-+#impressmedia-features.diff, i#83753, n#515553, thorsten
- slideshow-sound.diff, n#515553, rodo
-
- [ Fixes ]
-
