The following commit has been merged in the debian-experimental-3.6 branch:
commit 93edb37f8d8602ae9b4ade757a9942d1cc88d653
Merge: 99ab00ee59994f1be193173fbdbb74b2dda8077f
40c7be9f24fe0f3646590ed3aa1cbe598822a4ae
Author: Rene Engelhard <r...@debian.org>
Date: Mon Oct 22 19:36:55 2012 +0200
Merge remote-tracking branch 'origin/debian-experimental-3.5' into
debian-experimental-3.6
diff --combined changelog
index 09ad8cd,27ab036..23e9154
--- a/changelog
+++ b/changelog
@@@ -1,142 -1,47 +1,144 @@@
-libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
+libreoffice (1:3.6.3~rc1-2) UNRELEASED; urgency=low
- * new upstream release
- - caches fontconfig font substitutions (closes: #681308)
-
- * debian/patches/ca-XV-update.diff: update ca-XV translations, thanks
- Jordi Mallach
* debian/patches/soffice-bashisms.diff: fix bashism in soffice for
valgrinding (closes: #690717)
* debian/patches/he-lucida-sans-unicode.diff: Update default Hebrew font
from Lucida Sans to Lucida Sans Unicode, thanks Lior Kaplan
+ * debian/patches/ure-no-etc-opt-ure.diff: exclude /etc/opt/ure from ure
+ search paths (closes: #677601)
* debian/rules:
- - use generic python3.pc instead of pythonX.Y(mu).pc
+ - fix upstream README(_en-US) install for binary-indep packages
+ - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
+
- -- Rene Engelhard <r...@debian.org> Wed, 17 Oct 2012 18:23:23 +0200
++ -- Rene Engelhard <r...@debian.org> Mon, 22 Oct 2012 19:36:19 +0200
+
+libreoffice (1:3.6.3~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ [ Rene Engelhard ]
+ * debian/patches/sensible-lomua.diff: add patch from Dave Steele to
+ make senddoc.sh default to standard mailto handler (closes: #687228)
+
+ * debian/rules:
+ - try again with gcc 4.6 for mips* since apparently testtools/smoketest
+ now work..
+ - document truth and remove alpha from supported architectures
+ - exclude .desktop from dh_link call to get absolute symlinks
+ (closes: #690336)
+
+ [ Bjoern Michaelsen ]
+ * make metapackage explicit in short description
+
+ -- Rene Engelhard <r...@debian.org> Sun, 14 Oct 2012 17:07:23 +0200
+
+libreoffice (1:3.6.2~rc1-1) experimental; urgency=low
+
+ * new upstream release candidate
+ - waits for InternalIPC::ProcessingDone in oosplash (closes: #681185)
+
+ * debian/patches/disable-flaky-unoapi-tests.diff: disable flaky
+ toolkit and sc.ScAccessible* unoapi tests
+ * debian/patches/gcj-safe-jni-h-include.diff: add missing -I...
+ * debian/control.in:
+ - make -core break libreoffice-common (<< 1:3.6.1~rc1) as "unopkg sync"
+ ran in the triggers is gone (closes: #686666)
+ * debian/rules:
+ - fix native-jars dependeny to depend on install-common ...
+ - ... but as this doesn't build then disable it for now...
- hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
extremely slowing down the install target...
- - document truth and remove alpha from supported architectures
- - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
+ - use xz compression for all binary packages (closes: #687041)
+
+ -- Rene Engelhard <r...@debian.org> Fri, 14 Sep 2012 11:01:04 +0200
+
+libreoffice (1:3.6.1-1) experimental; urgency=low
+
+ * LibreOffice 3.6.1 final release (identical to rc2)
+
+ * debian/rules:
+ - work around possible failure install-common target with missing
+ ca-XV .dirs/.install...
+
+ -- Rene Engelhard <r...@debian.org> Mon, 27 Aug 2012 18:47:58 +0200
+
+libreoffice (1:3.6.1~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ * debian/patches/debian-debug.diff: patch new gb_SYMBOLS in unxgcc.mk to
+ make ENABLE_SYMBOLS=SMALL (-g1) working again..
+ * debian/patches/debian/patches/kfrebsd-add-missing-P_SEP.diff: fix Java
build
+ on kfreebsd (non-broken CLASSPATH)
+
+ * src/2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2: remove
+ zlib-1.2.7/doc/rfc195{0,1,2}.txt (closes: #685133)
+
+ * debian/rules:
+ - save some space/build time: build only with en-US in build-arch first
+ and build sdext/mysqlc (localized help/descriptions) manually with all
+ languages after make check; remove buildd special-casing for
+ languages
+ * debian/control.fonts.in: remove ttf-opensymbol transitional package
* debian/control.in:
- remove obsolete sharutils, po-debconf and wget | curl build-deps
- -- Rene Engelhard <r...@debian.org> Mon, 22 Oct 2012 19:20:07 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 23 Aug 2012 22:34:27 +0200
+
+libreoffice (1:3.6.1~rc1-2) experimental; urgency=low
-libreoffice (1:3.5.4+dfsg-2) unstable; urgency=low
+ * debian/rules:
+ - revert "build-depend against libpng-dev instead of libpng12-dev"
+ as it breaks on the buildds which install the libpng from experimental
+ (fails GTK3 pkg-config test) (reopens: #662411)
+ - fix build and install targets to prevent build-arch be called under
+ fakeroot, thanks rleigh for the hints
- * use xz compression for all binary packages (closes: #687041)
+ -- Rene Engelhard <r...@debian.org> Sat, 18 Aug 2012 11:09:34 +0200
- -- Rene Engelhard <r...@debian.org> Sun, 09 Sep 2012 14:45:20 +0200
+libreoffice (1:3.6.1~rc1-1) experimental; urgency=low
-libreoffice (1:3.5.4+dfsg-1) unstable; urgency=low
+ * new upstream release candidate
+ - fixes splashscreen location in multi-monitor setups
+ (closes: #657444, #431473)
+ - caches fontconfig font substitutions (closes: #631308)
+ - fixes dot handling in KDE File Picker (closes: #645946)
- * src/c735eab2d659a96e5a594c9e8541ad63-zlib-1.2.5.tar.gz: remove
- zlib-1.2.5/doc/rfc195{0,1,2}.txt (closes: #685133)
+ * debian/patches/build-dont-run-checks.diff: as name says
* debian/rules:
- - fix python3-dev builddep to >= 3.2; 3.1 had a different naming of
- the .pc (without "mu")
+ - new conditionals for: doxygen, libcdr, liblcms2
+ - remove liblucene2-java stuff; now clucene is used
+ - build-depend on libxml2-utils, xmllint now needed
+ - build-depend on liboost-date-time-date, we now link to boost...
+ - build-depend against libpng-dev instead of libpng12-dev
+ (closes: #662411)
+ - remove squeeze-backports stuff, add wheezy-backports
+ - install upstreams README(_en-US) (closes: #676340)
+ - clean up some warnings:
+ + readd /usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/libfakeroot
+ to LD_LIBRARY_PATH for dh_shlibdeps
+ + don't run jh_depends -i/-a, use -p for each package, otherwise it
+ gets confused by help.jar/s*.jar which is just zips, no "real" jar
+ - switch to default-jdk, b-d on default-jdk (>= 1:1.7-48) on ia64 and
+ check for "OpenJDK" in tests yes/no clause for JDK=default
+ - add ENABLE_HELP conditional now that we have --without-help; also
+ add the new --disable-extensions and --disable-database-connectivity to
+ their respective places
+ - split build into build-{arch,indep}
+ - use generic python3.pc instead of pythonX.Y(mu).pc
+ * debian/uno-libs3.symbols: update
* debian/libreoffice-common.links.in:
- s/libreofficeoasis/libreoffice-oasis/, thanks Jakub Wilk
(closes: #683784)
+ * debian/shell-lib-extensions.sh, debian/rules,
+ debian/libreoffice-common.lintian.overrides.in: unopkg sync not
+ necessary anymore; remove. javasettingsunopkginstall.xml also gone
+ * debian/*.p*.in, debian/*.triggers.in: remove obsolete triggers and
+ sync_extensions calls (closes: #677146)
- -- Rene Engelhard <r...@debian.org> Fri, 17 Aug 2012 14:45:26 +0200
+ -- Rene Engelhard <r...@debian.org> Wed, 15 Aug 2012 13:52:20 +0200
libreoffice (1:3.5.4-7) unstable; urgency=high
diff --combined patches/he-lucida-sans-unicode.diff
index bbe39f9,211eb3a..52a1cab
--- a/patches/he-lucida-sans-unicode.diff
+++ b/patches/he-lucida-sans-unicode.diff
@@@ -1,29 -1,27 +1,29 @@@
---- a/officecfg/registry/data/org/openoffice/VCL.xcu 2012-10-19
10:40:40.099426979 +0200
-+++ b/officecfg/registry/data/org/openoffice/VCL.xcu 2012-10-19
10:44:28.004557099 +0200
-@@ -480,19 +480,19 @@
- <value>Tahoma;Andale Sans UI;Arial Unicode MS;Lucida Sans
Unicode;DejaVu Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface
User;WarpSans;Geneva;Tahoma;MS Sans
Serif;Helv;Dialog;Lucida;Helvetica;Charcoal;Chicago;Helmet;Interface
System;Sans Serif</value>
+diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu
b/officecfg/registry/data/org/openoffice/VCL.xcu
+index e01d207..6050768 100644
+--- a/officecfg/registry/data/org/openoffice/VCL.xcu
++++ b/officecfg/registry/data/org/openoffice/VCL.xcu
+@@ -187,19 +187,19 @@
+ <value>Tahoma;Arial Unicode MS;Lucida Sans Unicode;DejaVu
Sans;Albany AMT;Albany;Arial;Nimbus Sans L;Interface
User;Geneva;Tahoma;Dialog;Lucida;Helvetica;Helmet;Interface System;Sans
Serif</value>
</prop>
<prop oor:name="CTL_DISPLAY" oor:type="xs:string" oor:op="replace">
- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
- + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasansunicode;Lucida Sans Unicode;Arial Unicode
MS</value>
+ + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_HEADING" oor:type="xs:string" oor:op="replace">
- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
- + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasansunicode;Lucida Sans Unicode;Arial Unicode
MS</value>
+ + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_PRESENTATION" oor:type="xs:string" oor:op="replace">
- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
- + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasansunicode;Lucida Sans Unicode;Arial Unicode
MS</value>
+ + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_SPREADSHEET" oor:type="xs:string" oor:op="replace">
- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
- + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasansunicode;Lucida Sans Unicode;Arial Unicode
MS</value>
+ + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
</prop>
<prop oor:name="CTL_TEXT" oor:type="xs:string" oor:op="replace">
- <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasans;Lucida Sans;Arial Unicode MS</value>
- + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucidasansunicode;Lucida Sans Unicode;Arial Unicode
MS</value>
+ + <value>Nachlieli CLM;Miriam CLM;Ellinia CLM;Aharoni CLM;Drugulin
CLM;Miriam Mono CLM;Lucida Sans Unicode;Arial Unicode MS</value>
</prop>
</node>
<node oor:name="th" oor:op="replace">
diff --combined patches/series
index 6bf672b,5bd67a7..327adf4
--- a/patches/series
+++ b/patches/series
@@@ -4,10 -4,11 +4,10 @@@ gcj-safe-jni-h-include.dif
jurt-soffice-location.diff
split-binfilters-and-evo.diff
debian-debug.diff
-rhino-build-optional.diff
+#rhino-build-optional.diff
disable-dynamic-list-cpp.diff
fix-system-lpsolve-build.diff
install-fixes.diff
-smoketest-only-en-US.diff
mention-java-common-package.diff
help-msg-add-package-info.diff
sensible-lomua.diff
@@@ -16,16 -17,23 +16,17 @@@ reportdesign-mention-package.dif
jdbc-driver-classpaths.diff
mysqlcppconn-libmysqlclient-SONAME.diff
make-pyuno-work-with-system-wide-module-install.diff
-search-usr-share-for-images.diff
+#search-usr-share-for-images.diff
make-package-modules-not-suck.diff
-fix-ARM-detection-in-set-soenv.diff
-propagate-gb_FULLDEPS.diff
-disable-unoapi-subsequentcheck-for-now.diff
mediwiki-oor-replace.diff
pythonloader.uno.so-libpyuno-and-pyuno-are-duplicate.diff
debian-hardened-buildflags.diff
gtk3-hack-explicit-gmodule.diff
-lp-926940-visio-mime-for-draw.diff
-gcc-4.4.diff
-lp-904212-add-missing-mimetypes-to-impress.desktop.diff
+pyuno-py3-module.diff
ignore-sc_cellrangesbase-fails.diff
-fix-Test-BigPtrArray-on-64bit-bigendian.diff
-CVE-2012-2665-binfilter.diff
-ca-XV-update.diff
+build-dont-run-checks.diff
+#disable-broken-sdext_pdfimport-cppunit-test-for-now.diff
+disable-flaky-unoapi-tests.diff
soffice-bashisms.diff
he-lucida-sans-unicode.diff
+ ure-no-etc-opt-ure.diff
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tqlve-0003tc...@vasks.debian.org
