The following commit has been merged in the master branch:
commit 2550d0ebfc91acc0e39f95ebb2cb09c0074b2664
Author: Rene Engelhard <[email protected]>
Date: Fri Mar 11 19:08:55 2011 +0100
update to 3.3.2 rc1
diff --git a/changelog b/changelog
index 867f6fa..e30db00 100644
--- a/changelog
+++ b/changelog
@@ -1,4 +1,6 @@
-libreoffice (1:3.3.1-2) UNRELEASED; urgency=low
+libreoffice (1:3.3.2~rc1-1) UNRELEASED; urgency=low
+
+ * new upstream release candidate
* debian/control.mediawiki.in:
- make -wiki-publisher depend on -java-common
@@ -8,7 +10,7 @@ libreoffice (1:3.3.1-2) UNRELEASED; urgency=low
* merge from Ubuntu:
- added ppc fixes (LP: #727118)
- -- Rene Engelhard <[email protected]> Mon, 07 Mar 2011 01:35:40 +0000
+ -- Rene Engelhard <[email protected]> Fri, 11 Mar 2011 17:22:42 +0000
libreoffice (1:3.3.1-1) unstable; urgency=low
diff --git a/patches/bridges-mkstemp-error-better-message.diff
b/patches/bridges-mkstemp-error-better-message.diff
index 3ffba33..327836c 100644
--- a/patches/bridges-mkstemp-error-better-message.diff
+++ b/patches/bridges-mkstemp-error-better-message.diff
@@ -126,12 +126,12 @@
+cgit v0.8.3-6-g21f6
--- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply-old
2011-01-21 22:23:35.000000000 +0100
+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply 2011-01-21
22:24:03.000000000 +0100
-@@ -390,6 +390,8 @@
+@@ -386,6 +386,8 @@
# make OOo work under SELinux
ooo80816.selinux.bridges.diff, i#80816
+[ Fixes ]
+bridges-mkstemp-error-better-message.diff
- [ WebDAVUpstream ]
+ [ UnUsedButNotYetRemovedFromGit ]
SectionOwner => jholesov
diff --git a/patches/buildfix-patches.diff b/patches/buildfix-patches.diff
index 0c1fa11..2cb6628 100644
--- a/patches/buildfix-patches.diff
+++ b/patches/buildfix-patches.diff
@@ -12,19 +12,19 @@
---
libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff-old
2011-02-09 17:44:39.000000000 +0100
+++
libreoffice-3.3.0/libreoffice-build/patches/dev300/reportdesign-mention-package-l10n.diff
2011-02-09 17:47:38.000000000 +0100
-@@ -86,14 +86,14 @@ diff --git l10n/source/br/localize.sdf
l10n/source/br/localize.sdf
- index 3e9018e..8fa1966 100644
+@@ -87,13 +87,13 @@
--- l10n/source/br/localize.sdf
+++ l10n/source/br/localize.sdf
-@@ -3309,7 +3309,6 @@ dbaccess source\ui\dlg\queryfilter.src 0
fixedline DLG_FILTERCRIT FL_FIELDS 23
- dbaccess source\ui\dlg\queryfilter.src 0 string DLG_FILTERCRIT
STR_NOENTRY 50 br - tra ebet -
2002-02-02 02:02:02
- dbaccess source\ui\dlg\queryfilter.src 0 string DLG_FILTERCRIT
STR_COMPARE_OPERATORS 0 br
=;<>;<;<=;>;>=;evel;disheñvel diouzh;goullo;dic'houllo
2002-02-02 02:02:02
- dbaccess source\ui\dlg\queryfilter.src 0 modaldialog
DLG_FILTERCRIT HID_DLG_FILTERCRIT 303 br Sil
skoueriek 2002-02-02 02:02:02
-+@@ -453,7 +453,6 @@ dbaccess source\ui\dlg\dbadmin.src 0
fixedtext PAGE_LDAP FT_LDAPROWCOUNT 0 br
+--dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 br Evit
digeriñ ur marilh ho po ezhomm eus an askouezhad %RPT_EXTENSION_NAME.\n\nKlikañ
war 'Pellgargañ...' evit pellgargañ ha staliañ an askouezhad.
2002-02-02 02:02:02
++@@ -488,7 +488,6 @@
+ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_HOSTNAME 0 br ~Anv an ostiz
2002-02-02 02:02:02
+ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_PORTNUMBER 0 br ~Niverenn borzh
2002-02-02 02:02:02
+ dbaccess source\ui\dlg\dbadmin.src 0 fixedtext
PAGE_USERDRIVER FT_OPTIONS 0 br ~Arventennoù ar
stur 2002-02-02 02:02:02
- -dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 br Evit
digeriñ ur marilh ho po ezhomm eus an askouezhad %RPT_EXTENSION_NAME.\n\nKlikañ
war 'Pellgargañ...' evit pellgargañ ha staliañ an askouezhad.
2002-02-02 02:02:02
++-dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 br Evit
digeriñ un danevell ho po ezhomm an askouezh Sun™ Report Builder.\n\nKlikañ war
'Pellgargañ...' a-benn pellgargañ ha staliañ an askouezh.
2002-02-02 02:02:02
dbaccess source\ui\dlg\ExtensionNotPresent.src 0 pushbutton
RID_EXTENSION_NOT_PRESENT_DLG PB_DOWNLOAD 0 br
~Pellgargañ... 2002-02-02 02:02:02
dbaccess source\ui\dlg\ExtensionNotPresent.src 0 modaldialog
RID_EXTENSION_NOT_PRESENT_DLG HID_EXTENSION_NOT_PRESENT_DLG
0 br %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 br Kantreal
2002-02-02 02:02:02
@@ -32,7 +32,26 @@
diff --git l10n/source/bs/localize.sdf l10n/source/bs/localize.sdf
index 4439ce4..637c0f8 100644
--- l10n/source/bs/localize.sdf
-@@ -491,7 +491,7 @@ index e2ea682..d18c4fc 100644
+@@ -282,15 +283,15 @@
+ index 2fbd4b6..a5a76c8 100644
+ --- l10n/source/fr/localize.sdf
+ +++ l10n/source/fr/localize.sdf
+-@@ -3721,7 +3721,7 @@ dbaccess source\ui\dlg\ConnectionPage.src
0 string STR_JDBCDRIVER_SUCCESS 0 f
++@@ -3721,7 +3721,7 @@
+ dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_JDBCDRIVER_NO_SUCCESS 0 fr
Impossible de charger le pilote JDBC. 2002-02-02
02:02:02
+ dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_MSACCESS_FILTERNAME 0 fr Fichier MS
Access 2002-02-02 02:02:02
+ dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_MSACCESS_2007_FILTERNAME 0 fr Fichier
MS Access 2007 2002-02-02 02:02:02
+ -dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 fr
L'ouverture d'un rapport requiert l'extension Sun™ Report Builder.\n\nCliquez
sur 'Télécharger...' pour télécharger et installer l'extension.
2002-02-02 02:02:02
+-+dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 fr
L'ouverture d'un rapport requiert l'extension Sun™ Report Builder.\n\nPour
cela, installez le package 'libreoffice-report-builder'.
2002-02-02 02:02:02
+++dbaccess source\ui\dlg\ExtensionNotPresent.src 0 string
RID_STR_EXTENSION_NOT_PRESENT 0 fr
L'ouverture d'un rapport requiert l'extension Sun™ Report Builder.\n\nPour
cela, installez le package 'libreoffice-report-builder'.
2002-02-02 02:02:02
+ dbaccess source\ui\dlg\ExtensionNotPresent.src 0 pushbutton
RID_EXTENSION_NOT_PRESENT_DLG PB_DOWNLOAD 0 fr
~Télécharger... 2002-02-02 02:02:02
+ dbaccess source\ui\dlg\ExtensionNotPresent.src 0 modaldialog
RID_EXTENSION_NOT_PRESENT_DLG HID_EXTENSION_NOT_PRESENT_DLG
0 fr %PRODUCTNAME %PRODUCTVERSION
2002-02-02 02:02:02
+- dbaccess source\ui\dlg\CollectionView.src 0 imagebutton
DLG_COLLECTION_VIEW BTN_EXPLORERFILE_NEWFOLDER 0
fr - Créer un répertoire 2002-02-02 02:02:02
++ dbaccess source\ui\dlg\CollectionView.src 0 imagebutton
DLG_COLLECTION_VIEW BTN_EXPLORERFILE_NEWFOLDER 0
fr - Créer un nouveau répertoire 2002-02-02
02:02:02
+ diff --git l10n/source/ga/localize.sdf l10n/source/ga/localize.sdf
+ index 42fa8b7..0b11666 100644
+ --- l10n/source/ga/localize.sdf
+@@ -491,7 +492,7 @@
dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_JDBCDRIVER_NO_SUCCESS 0 lt JDBC
tvarkyklės nepavyko įkelti. 2002-02-02 02:02:02
dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_MSACCESS_FILTERNAME 0 lt „MS Access“
failas 2002-02-02 02:02:02
dbaccess source\ui\dlg\ConnectionPage.src 0 string
STR_MSACCESS_2007_FILTERNAME 0 lt „MS
Access 2007“ failas 2002-02-02 02:02:02
@@ -41,7 +60,7 @@
dbaccess source\ui\dlg\ExtensionNotPresent.src 0 pushbutton
RID_EXTENSION_NOT_PRESENT_DLG PB_DOWNLOAD 0 lt
~Atsisiųsti... 2002-02-02 02:02:02
dbaccess source\ui\dlg\ExtensionNotPresent.src 0 modaldialog
RID_EXTENSION_NOT_PRESENT_DLG HID_EXTENSION_NOT_PRESENT_DLG
0 lt %PRODUCTNAME %PRODUCTVERSION
2002-02-02 02:02:02
dbaccess source\ui\dlg\CollectionView.src 0 imagebutton
DLG_COLLECTION_VIEW BTN_EXPLORERFILE_NEWFOLDER 0
lt - Kurti naują katalogą 2002-02-02 02:02:02
-@@ -571,14 +571,14 @@ diff --git l10n/source/nb/localize.sdf
l10n/source/nb/localize.sdf
+@@ -571,14 +572,14 @@
index 7934400..060502b 100644
--- l10n/source/nb/localize.sdf
+++ l10n/source/nb/localize.sdf
diff --git a/patches/disable-impress-media-embedding.diff
b/patches/disable-impress-media-embedding.diff
deleted file mode 100644
index 6449fe1..0000000
--- a/patches/disable-impress-media-embedding.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From 99f78609e2b81169e1ed4aa9ffa31aeadeb4ca52 Mon Sep 17 00:00:00 2001
-From: Thorsten Behrens <[email protected]>
-Date: Wed, 23 Feb 2011 07:44:17 +0100
-Subject: [PATCH] Temp fix for slideshow media playback bug.
-
-Fixes deb#612940 and n#651250 by disabling the impress media
-embedding patches. Those don't pass on proper temporary file system
-urls to avmedia, during slideshow.
----
- patches/dev300/apply | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index c60565e..4df4ea2 100644
---- libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
-+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/apply
-@@ -2279,8 +2279,8 @@ 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
--slideshow-sound.diff, n#515553, rodo
-+#impressmedia-features.diff, i#83753, n#515553, thorsten
-+#slideshow-sound.diff, n#515553, rodo
-
- [ Fixes ]
- vcl-gtk-process-events-on-exit.diff, rodo
---
-1.6.4.2
diff --git a/patches/javaldx-LibreOffice.diff b/patches/javaldx-LibreOffice.diff
deleted file mode 100644
index 4285373..0000000
--- a/patches/javaldx-LibreOffice.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- libreoffice-3.3.1/libreoffice-build/patches/dev300/ubuntu-javaldx.diff-old
2011-02-19 18:24:07.000000000 +0000
-+++ libreoffice-3.3.1/libreoffice-build/patches/dev300/ubuntu-javaldx.diff
2011-02-19 18:24:29.000000000 +0000
-@@ -4,9 +4,9 @@
- if (errcode == JFW_E_NO_JAVA_FOUND)
- {
- fprintf(stderr,"javaldx: Could not find a Java Runtime
Environment! \n");
--+ fprintf(stderr,"Please ensure that a JVM and the package
openoffice.org-java-common\n");
-++ fprintf(stderr,"Please ensure that a JVM and the package
libreoffice-java-common\n");
- + fprintf(stderr,"is installed.\n");
--+ fprintf(stderr,"If it is already installed then try removing
~/.openoffice.org/3/user/config/javasettings_Linux_*.xml\n");
-++ fprintf(stderr,"If it is already installed then try removing
~/.libreoffice/3/user/config/javasettings_Linux_*.xml\n");
- return false;
- }
- else if (errcode != JFW_E_NONE && errcode != JFW_E_DIRECT_MODE)
diff --git a/patches/pyuno-demo-fix-PYTHONPATH.diff
b/patches/pyuno-demo-fix-PYTHONPATH.diff
deleted file mode 100644
index ca2e929..0000000
--- a/patches/pyuno-demo-fix-PYTHONPATH.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/patches/dev300/apply b/patches/dev300/apply
-index 6d6f28f..3661292 100755
---- libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
-+++ libreoffice-3.3.0/libreoffice-build/patches/dev300/apply
-@@ -837,6 +837,8 @@ system-python-ure-bootstrap.diff, deb#501028, i#90701
- pyuno-ooodir.diff, i#90701
- system-python-uno-path.diff, i#97629
-
-+pyuno-demo-fix-PYTHONPATH.diff
-+
- [ LiberationFontsOnWindows ]
-
- # Use Liberation fonts on Windows, too
---- /dev/null 2011-01-09 13:55:42.933962422 +0100
-+++
libreoffice-3.3.0/libreoffice-build/patches/dev300/pyuno-demo-fix-PYTHONPATH.diff
2011-01-09 18:00:27.000000000 +0100
-@@ -0,0 +1,18 @@
-+diff --git a/pyuno/demo/pyunoenv.tcsh b/pyuno/demo/pyunoenv.tcsh
-+index 1a83199..1c86ca7 100644
-+--- pyuno/demo/pyunoenv.tcsh
-++++ pyuno/demo/pyunoenv.tcsh
-+@@ -17,7 +17,12 @@ if( ! $?LD_LIBRARY_PATH ) then
-+ setenv LD_LIBRARY_PATH
-+ endif
-+
-+-setenv PYTHONPATH
.:$OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
-++if ( $?PYTHOHOME )
-++ setenv PYTHONPATH
$OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib:$PYTHONPATH
-++else
-++ setenv PYTHONPATH
$OOOHOME/program:$OOOHOME/program/pydemo:$OOOHOME/program/python/lib
-++endif
-++
-+ setenv LD_LIBRARY_PATH $OOOHOME/program:$LD_LIBRARY_PATH
-+
-+ if( $?PYTHONHOME ) then
diff --git a/patches/series b/patches/series
index bd42196..b205ec4 100644
--- a/patches/series
+++ b/patches/series
@@ -4,10 +4,7 @@ buildfix-patches.diff
hack-no-rm-fr-of-smoketest-userconfig.diff
do-not-switch-workspaces-of-wm.diff
bridges-mkstemp-error-better-message.diff
-pyuno-demo-fix-PYTHONPATH.diff
arm-optimization.diff
-javaldx-LibreOffice.diff
alpha-no-relax.diff
-disable-impress-media-embedding.diff
ppc-openjdk.diff
no-minimaltoc.diff
diff --git a/rules b/rules
index 8943e74..76cea39 100755
--- a/rules
+++ b/rules
@@ -81,8 +81,8 @@ MWS=OOO330
MILESTONE=m19
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
GIT_TAG=$(MWS)_$(MILESTONE)
-OOO_BUILD_BRANCH=libreoffice-3-3-1
-OOO_BUILD_VERSION=3.3.1.2
+OOO_BUILD_BRANCH=libreoffice-3-3-2
+OOO_BUILD_VERSION=3.3.2.1
# in ooo-build releases the same as OOO_BUILD_VERSION
OOO_BUILD_TARBALL_VERSION=$(OOO_BUILD_VERSION)
OOO_BUILD_TAG=libreoffice-$(OOO_BUILD_TARBALL_VERSION)
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
