------------------------------------------------------------
revno: 2146
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Mon 2010-10-18 09:18:26 +0200
message:
* debian/patches/buildfix-patches.diff: don't apply fields-table-formula.diff
modified:
changelog
patches/buildfix-patches.diff
=== modified file 'changelog'
--- a/changelog 2010-10-17 20:30:32 +0000
+++ b/changelog 2010-10-18 07:18:26 +0000
@@ -1,5 +1,7 @@
-libreoffice (1:3.3.0~beta2-2) experimental; urgency=low
+libreoffice (1:3.3.0~beta2-2) UNRELEASED; urgency=low
+ * debian/patches/buildfix-patches.diff: don't apply
fields-table-formula.diff
+
* debian/control.in:
- add missing build-depends on automake
* debian/rules, control.lenny_squeeze_transitional.in:
@@ -11,7 +13,7 @@
make this work
* debian/copyright: update
- -- Rene Engelhard <[email protected]> Sun, 17 Oct 2010 22:06:13 +0200
+ -- Rene Engelhard <[email protected]> Mon, 18 Oct 2010 09:13:18 +0200
libreoffice (1:3.3.0~beta2-1) experimental; urgency=low
=== modified file 'patches/buildfix-patches.diff'
--- a/patches/buildfix-patches.diff 2010-10-12 20:33:00 +0000
+++ b/patches/buildfix-patches.diff 2010-10-18 07:18:26 +0000
@@ -1261,3 +1261,14 @@
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
+@@ -2117,7 +2117,7 @@
+ fields-nested-set.diff, n#634478, cbosdo
+ fields-double-click.diff, n#639288, cbosdo
+
+-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
