[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.3.3-3-91-g6245961
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 62459610ff7fae9e2957fb7da414c35b595d0919
Merge: b8ddfe5415093deed5bae71f85f7d6a5553cd4d6 ed84027f5ae763bcaf2c842df607902724b38c11
Author: Rene Engelhard <rene@debian.org>
Date: Fri Jul 1 09:18:22 2011 +0200
Merge remote branch 'origin/master' into debian-experimental-3.4.0
diff --combined changelog
index f755511,045b0ec..ac374ed
--- a/changelog
+++ b/changelog
@@@ -1,37 -1,12 +1,46 @@@
+libreoffice (1:3.4.0-1) UNRELEASED; urgency=low
+
+ * new upstream release
+ - handles various table columns differing in case correct
+ (closes: #617596)
+ - should fix embedding of (some) fonts in PDFs (closes: #616117)
+ - (still) use libreoffice-build for now; not tagged,
+ use 3fd2f1b1cbcab8ecd5a642d36cf071d391ad881f
+
+ * debian/rules:
+ - bump build-dep on libmdds-dev to >= 0.5.0
+ - build-depend on libgraphite2-dev instead of libgraphite-dev
+ - update for new extension and mingw configure switches
+ - temporarily build only for en-US
+ - temprarily don't install gengal, not built anymore since the switch to
+ GNU Make...
+ - install .component files to registered-components
+ * debian/control.sdk.in, debian/rules:
+ - stop building with STLport on i386, just create a symlink in ure.
+ Should suffice for compat with binary-only OOo extensions
+ * debian/control.in, debian/rules:
+ - the script providers are now extensions. split js and bsh out into
+ extra packages (also closes: #603595)
+ * debian/uno-libs3.symbols: update
+ * debian/rules, debian/patches/packcomponents-remove-split-components.diff:
+ remove evoab, binfilter and kdeab deregistering into patch patching
+ the new packcomponents
+ * debian/shell-lib-components.sh: add new update_services_rdb() merging
+ "default" services.rdb and the .component files from registered-components
+ * debian/libreoffice-common.triggers.in, libreoffice-*.p*.in:
+ new trigger running update_services_rdb, remove obsolete maintainer scripts
+
+ -- Rene Engelhard <rene@debian.org> Wed, 29 Jun 2011 10:03:21 +0200
+
+ libreoffice (1:3.3.3-3) unstable; urgency=low
+
+ * brown paper pag release.
+
+ * debian/patches/mips-openjdk-jre-paths.diff: oops, forgot JRELIBIR when
+ porting the patch from gabrielli..
+
+ -- Rene Engelhard <rene@debian.org> Thu, 30 Jun 2011 21:39:44 +0000
+
libreoffice (1:3.3.3-2) unstable; urgency=low
* debian/patches/scripting-bsh-no-envvar.diff,
@@@ -48,7 -23,7 +57,7 @@@
- move evolocal.odb into -evolution proper
- use OpenJDK on mips(el), seems to work. (ia64 still SIGSEGVs)
* debian/libreoffice-filter-binfilter.links.in: actually create symlink
- for libbindet*so in registered-components
+ for libbindet*so in registered-components
* debian/control.in:
- move libpaper-utils from Suggests to Recommends
- fix libreoffice Description: - -filter-binfilter is not installed
@@@ -56,7 -31,7 +65,7 @@@
* debian/control.in, debian/rules: move libpq-dev builddep to a
conditional
* debian/rules, debian/control*in:
- - run jh_depends and add ${java:Depends} where we have Java
+ - run jh_depends and add ${java:Depends} where we have Java
-- Rene Engelhard <rene@debian.org> Wed, 29 Jun 2011 10:03:21 +0200
@@@ -69,7 -44,7 +78,7 @@@ libreoffice (1:3.3.3-1) unstable; urgen
toolbars work in e.g. Base edit forms (closes: #617319)
* debian/rules:
- - disable -sdbc-postgresql until fixed (closes: #620100)
+ - disable -sdbc-postgresql until fixed (closes: #620100)
- stop moving vbaevents*.uno.so to -calc. Move libvbaswobj*uno.so
to -writer
- make -l10n-sw (if enabled) depend on locales (>= 2.13-5)
diff --combined patches/mips-openjdk-jre-paths.diff
index fa1eebf,55740c1..bddf262
--- a/patches/mips-openjdk-jre-paths.diff
+++ b/patches/mips-openjdk-jre-paths.diff
@@@ -1,11 -1,12 +1,12 @@@
--- /dev/null 2011-06-27 20:29:01.643585831 +0200
+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/mips-openjdk-jre-paths.diff 2011-06-28 16:06:31.000000000 +0200
- @@ -0,0 +1,17 @@
+ @@ -0,0 +1,18 @@
+--- set_soenv.in-old 2011-06-28 16:05:08.000000000 +0200
++++ set_soenv.in 2011-06-28 16:06:07.000000000 +0200
+@@ -651,11 +651,11 @@
+
- + $JRELIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+ +- $JRELIBDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH;
+ ++ $JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH;
+ if ( $JDK =~ m/sun/ && -d "@JAVA_HOME@".$ds."jre".$ds."lib".$ds."mips32" ) {
+- $JRETOOLKITDIR = '$JAVA_HOME'.$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
++ $JRETOOLKITDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds.$ARCH.$ds."client"; # Lemote
@@@ -20,19 -21,28 +21,19 @@@
+
--- libreoffice-3.4.0/libreoffice-build/patches/dev300/apply-old 2011-06-28 16:06:54.000000000 +0200
+++ libreoffice-3.4.0/libreoffice-build/patches/dev300/apply 2011-06-28 16:07:30.000000000 +0200
-@@ -34,7 +34,7 @@
- KDE4Experimental, MinGW, CalcExperimental, \
- OOXMLExportExperimental, CrossWin32Patches, AutoLayout, \
- WriterNavigation \
-- HPPA, AXP, PowerPC, Speed, GSoC2010, Toolbars, Win32Packaging
-+ HPPA, AXP, PowerPC, MIPS, Speed, GSoC2010, Toolbars, Win32Packaging
- DebianLooseSections: DebianBaseNoHelpContent
- # Optional sections
- Optional : LiberationFontsOnWindows, NovellOnlyExtensionFixes
-@@ -66,7 +66,7 @@
+@@ -50,7 +50,7 @@
# Slackware
- Slackware : LinuxCommon, SlackwareOnly, NotDebian, Mono, msaccess
+ Slackware : LinuxCommon, Mono, msaccess
# Debian
-DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC
+DebianBase : LinuxCommon, DebianBaseOnly, GCCSTL, BerkeleyDB43, Split, PowerPC, MIPS
- Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, HPPA, AXP, kFreeBSD
+ Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only
DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
# Ubuntu
-@@ -2393,3 +2393,6 @@
- [ TemporaryHacks ]
- disable-rhino.diff
- bsh-hardcode-path.diff
+@@ -1505,3 +1505,6 @@
+
+ [ DebianBaseOnly ]
+ packcomponents-remove-split-components.diff
+
+[ MIPS ]
+mips-openjdk-jre-paths.diff
--
LibreOffice packaging repository
Reply to: