[SCM] LibreOffice packaging repository branch, debian-experimental-3.5, updated. libreoffice_3.5.0_beta2-2-12-g6eba544
The following commit has been merged in the debian-experimental-3.5 branch:
commit a9b5f51117e66b3d18fe96f3d32e879d12c84cab
Merge: 17c53458b1760a3ad5298a1acae48d17716014c0 fc07ffb882b07cae4be2315b23878d964953bc58
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jan 2 22:35:32 2012 +0100
Merge remote branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index f2dcfb5,86021c0..e10dda8
--- a/changelog
+++ b/changelog
@@@ -1,94 -1,28 +1,97 @@@
-libreoffice (1:3.4.4-3) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~beta2-3) UNRELEASED; urgency=low
+
+ * debian/patches/conditionalize-qadevOOo-build.diff: build qadevOOo only
+ when OOO_JUNIT_JAR is not empty
+
+ * debian/libreoffice-core.preinst.in:
+ - rm -f /var/lib/libreoffice/basis3.4/program/services.rdb on upgrade
+ (and for safety on install, too) (closes: #650341)
+
++ * merge from ubuntu-precise-3.5:
++ - add debian multiarch support for Qt4
++
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Dec 2011 15:08:54 +0100
+
+libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
+
+ * debian/patches/fix-ARM-detetcion-in-set-soenv.diff: as name says
+ * debian/patches/make-package-modules-not-suck.diff: add missing , so
+ that kde4be1.uno.so correctly ends up in -kde
+
+ * debian/smoketest/patches/smoketest-disable-db-insert-delete-seek-tests.diff,
+ debian/rules: make patch apply again
+
+ * debian/rules:
+ - force boost to 1.46 due to ICE with 1.48
+ - prevent creating bogus gcc- build-dependency on gcj archs
+
+ -- Rene Engelhard <rene@debian.org> Fri, 30 Dec 2011 00:11:06 +0100
+
+libreoffice (1:3.5.0~beta2-1) experimental; urgency=low
[ Rene Engelhard ]
- * debian/patches/fdo43139.diff: add from libreoffice-3-4 branch:
- fix build with bleeding edge external boost and gcc (closes: #652784)
+ * new upstream beta release
+
+ * debian/*:
+ - use "core" sources, no libreoffice-build anymore. Loads of updates.
+
+ * debian/patches/*: move from patches/hotfixes to patch the code
+ directly without libreoffice-build
- * debian/libreoffice-core.postrm.in:
- - on remove, delete created services.rdb (closes: #650341)
+ * debian/rules, debian/vars.*, debian/*.links.in:
+ - loads of updates for new envfile name and gone LIBSUFFIX
+ * debian/rules:
+ - enable new build against Gtk3
+ - bump python b-d to >= 2.6 as we don't work with earlier anymore.
+ Also build python3-uno
+ - add new conditionals and build-deps for new (libvisio,librsvg,gettext,
+ libcmis) libraries and libexttextcat switch - and those we needed to move
+ from libreoffice-builds' distro-configs. Adapt for changed configure
+ options
+ - add new conditionals and build-deps for new libvisio,librsvg,gettext,
+ libcmis usage and libexttextcat switch - and those we needed to move
+ from libreoffice-builds' distro-configs
+ - run new "make check" instead of solenv/bin/subsequenttests and
+ manual smoketest
+ - remove fakeroot hackaround
+ * debian/rules, debian/make-package-modules-not-suck.diff: migrate loads of
+ mv's in debian/rules to proper scp2 patches
+ * debian/rules, debian/control.in:
+ - move from self-defined UPSTREAM_VERSION/ARCH etc. to use
+ /usr/share/dpkg/*.mk
* debian/control.in:
+ - update descriptions for new Gtk(3) print dialog
- move libreoffice, libreoffice-l10n-{in,za} to new metapackages
section
- * debian/vars.armhf: add
* debian/control.fonts.in: ttf-opensymbol should be in oldlibs, thanks
lintian
- * debian/rules:
- - prevent creating bogus gcc- build-dependency on gcj archs
-
- * merge from ubuntu-precise-3.5:
- - add debian multiarch support for Qt4
+ * debian/patches:
+ - migrate reportdesign-mention-package.diff from libreoffice/build
+ - migrate jdbc-driver-classpaths.diff from libreoffice/build
+ - migrate mysqlcppconn-mysqlclient-SONAME.diff from libreoffice/build
+ - migrate system-python-{ure-bootstrap,uno-path}.diff and
+ pyuno-ooodir.diff from libreoffice/build
+ - migrate split-icons-search-usr-share.diff from libreoffice/build
+ * debian/vars.armhf: add
- [ Björn Michaelsen ]
- * debian/patches/fix-armhf-build-in-bridges.patch: fix armhf build in
- bridges
+ [ Bjoern Michaelsen ]
+ * debian/rules:
+ - set CURDIR before first use and use safe method to set it
+ - update GIT_ vars, add GIT_BASEURL for local mirrors
+ - update get-orig-source
+ - build needs the ext-sources
+ * debian/README:
+ - update most outdated README sections
+ * debian/patches:
+ - migrate mention-java-common-package.diff from libreoffice/build
+ - migrate help-msg-add-package-info.diff from libreoffice/build
+ - update help-msg-add-package-info.diff, replace openoffice.org with
+ libreoffice
+ - migrate sensible-ooomua.diff from libreoffice/build and rename to
+ sensible-lomua; add icedove and thunderbird as fallbacks
+ - migrate sensible-browser.diff from libreoffice/build
- -- Rene Engelhard <rene@debian.org> Wed, 28 Dec 2011 20:57:18 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 27 Dec 2011 10:16:18 +0000
libreoffice (1:3.4.4-2) unstable; urgency=medium
diff --combined patches/add-debian-multiarch-support.diff
index 0000000,c54a265..1f008fb
mode 000000,100644..100644
--- a/patches/add-debian-multiarch-support.diff
+++ b/patches/add-debian-multiarch-support.diff
@@@ -1,0 -1,30 +1,24 @@@
-diff --git a/patches/add-debian-multiarch-support.diff b/patches/add-debian-multiarch-support.diff
-new file mode 100644
-index 0000000..1f008fb
---- /dev/null
-+++ libreoffice-3.4.4/libreoffice-build/patches/hotfixes/add-debian-multiarch-support.diff
-@@ -0,0 +1,24 @@
-+From fe0e97628499a1485b71c87736029cadf9a7669f Mon Sep 17 00:00:00 2001
-+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-+Date: Fri, 16 Dec 2011 02:06:28 +0100
-+Subject: [PATCH] add debian multiarch support
-+
-+---
-+ configure.in | 1 +
-+ 1 files changed, 1 insertions(+), 0 deletions(-)
-+
-+diff --git a/configure.in b/configure.in
-+index 59cb7fb..904003a 100644
-+--- configure.in
-++++ configure.in
-+@@ -7868,6 +7868,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
-+ AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
-+ fi
-+
-++ qt_libdirs="/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` $qt_libdirs"
-+ AC_MSG_CHECKING([for Qt4 libraries])
-+ qt_lib_dir="no"
-+ for lib_dir in $qt_libdirs ; do
-+--
-+1.7.5.4
-+
++From fe0e97628499a1485b71c87736029cadf9a7669f Mon Sep 17 00:00:00 2001
++From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
++Date: Fri, 16 Dec 2011 02:06:28 +0100
++Subject: [PATCH] add debian multiarch support
++
++---
++ configure.in | 1 +
++ 1 files changed, 1 insertions(+), 0 deletions(-)
++
++diff --git a/configure.in b/configure.in
++index 59cb7fb..904003a 100644
++--- a/configure.in
+++++ b/configure.in
++@@ -7868,6 +7868,7 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
++ AC_MSG_ERROR([Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running "configure".])
++ fi
++
+++ qt_libdirs="/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH` $qt_libdirs"
++ AC_MSG_CHECKING([for Qt4 libraries])
++ qt_lib_dir="no"
++ for lib_dir in $qt_libdirs ; do
++--
++1.7.5.4
++
diff --combined patches/series
index 41d6852,637bab5..49fa42a
--- a/patches/series
+++ b/patches/series
@@@ -1,29 -1,29 +1,30 @@@
splash-progressbarcolor.diff
-buildfix-patches.diff
no-minimaltoc.diff
-update-debian-opt.diff
-gcc4.6.0.diff
+debian-opt.diff
odk-jni-include.diff
-disable-ooinstall-in-package-ooo.diff
jurt-soffice-location.diff
-packcomponents-remove-split-components.diff
+split-binfilters-and-evo.diff
debian-debug.diff
-disable-rhino.diff
-bsh-hardcode-path.diff
-mips-openjdk-jre-paths.diff
-autogen.diff
+rhino-build-optional.diff
disable-dynamic-list-cpp.diff
libebook-1.2.so.12.diff
-vbaobj-visibility-fix.diff
make-gengal-work-again.diff
-fix-distro-config.diff
-mipsel-jfw-plugin-arch.diff
-no-deprecated-options-in-qstart-wrappers.diff
-update-sdbc-postgresql.diff
-jdk-1.7.0-vendorname.diff
-s390x.diff
-update-libreoffice.1.diff
-wordml2ooo_draw.xsl-add-missing-include.diff
-fix-armhf-build-in-bridges.diff
-fdo43139.diff
+fix-system-lpsolve-build.diff
+install-fixes.diff
+smoketest-only-en-US.diff
+getMIMEDescription-mismatch.diff
+mention-java-common-package.diff
+help-msg-add-package-info.diff
+sensible-lomua.diff
+sensible-browser.diff
+fix-unordf_complex-check.diff
+reportdesign-mention-package.diff
+jdbc-driver-classpaths.diff
+mysqlcppconn-mysqlclient-SONAME.diff
+make-pyuno-work-with-system-wide-module-install.diff
+search-usr-share-for-images.diff
+make-package-modules-not-suck.diff
+set-correct-icon-names-in-desktop-files.diff
+fix-ARM-detection-in-set-soenv.diff
+conditionalize-qadevOOo-build.diff
+ add-debian-multiarch-support.diff
--
LibreOffice packaging repository
Reply to: