The following commit has been merged in the debian-experimental-3.5 branch:
commit 99e60cd31d64e3d4da05d4b4d2b9a7edcad85979
Merge: e7efe35cbe10704835630ba977eaa7666b3b7404
e7a37305438d90165191029c5772189688cb5de2
Author: Rene Engelhard <r...@debian.org>
Date: Sat Jan 28 12:47:06 2012 +0100
Merge remote branch 'origin/master' into debian-experimental-3.5
diff --combined changelog
index 2df04eb,48f8515..304b080
--- a/changelog
+++ b/changelog
@@@ -1,163 -1,54 +1,163 @@@
-libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
+libreoffice (1:3.5.0~rc2-2) UNRELEASED; urgency=low
* debian/rules:
+ - fix another merge error to really fix patch rule in check
- - enable ca-XV, put into --{l10n,help}-ca
++ - enable ca-XV, put into -{l10n,help}-ca
+
+ -- Rene Engelhard <r...@debian.org> Sat, 28 Jan 2012 11:36:42 +0100
+
+libreoffice (1:3.5.0~rc2-1) experimental; urgency=low
+
+ * new upstream release candidate
+
+ * debian/rules:
+ - fix patch rule in check
+ - fix merge errors: $(ARCH) -> $(DEB_HOST_ARCH)
- install full changelog only for packages with the same name in OOo
times; strip pre-libreoffice entries otherwise.
- - enable ca-XV, put into -{l10n,help}-ca
- *
ext-sources/ext-sources/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz:
- add missing file which should have been in updated .orig-ext-sources..
- * debian/libreoffice-sdbc-postgresql.preinst.in: cleanup to avoid dpkg
- warnings, thanks Julian Gilbey (closes: #657530)
+ - (re-)enable -script-provider-js
+ * debian/libreoffice-common.postrm.in: fix merge:
+ @OOBRANDDIR@/@OOBASISDIR@ -> @OODIR@
+
+ -- Rene Engelhard <r...@debian.org> Fri, 27 Jan 2012 09:23:07 +0000
+
+libreoffice (1:3.5.0~rc1-1) experimental; urgency=low
- -- Rene Engelhard <r...@debian.org> Sat, 28 Jan 2012 12:20:01 +0100
+ * new upstream release candidate
-libreoffice (1:3.4.5-2) unstable; urgency=low
+ * debian/patches/gbuild-JavaClassSet-honour-JAVAFLAGS.diff: honour
+ JAVAFLAGS (-source 1.5 -target 1.5)
+ * debian/rules:
+ - fix Java stuff in SDK install (don't remove /usr/share/libreoffice/sdk)
+ - work around smoketest failure; disable base for powerpc(spe)/ppc64 as
+ for armel
+ - switch to .xz tarballs, upstream will only provide those...
+
+ * merge from ubuntu-precise-3.5:
+ - reenable junit tests
+
+ -- Rene Engelhard <r...@debian.org> Fri, 20 Jan 2012 10:19:36 +0000
+
+libreoffice (1:3.5.0~beta3-1) experimental; urgency=low
+
+ * new upstream beta release
+
+ * debian/patches/fix-ARM-detection-in-set-soenv.diff: fix for armhf...
+ * debian/patches/revert-468fe685e3c58c84bce6d9a48b931dcc21682679.diff:
+ fix armhf build in bridges...
+ * debian/patches/ppc-fix-soffice.sh.diff: make soffice.sh on ppc correct
* debian/patches/jdbc-driver-threading.diff: backport fix for
Attach/Detach-CurrentThread slowness from libreoffice-3-5
(closes: #644957)
+
+ * 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)
+ * debian/libreoffice-{common,core}.postrm.in:
+ - on remove, remove all /var/lib content on remove (prereg/bundled
+ basisX.Y)
* debian/rules:
+ - stop creating a dependency on ure for uno-libs3 in .shlibs, use
+ uno-libs3 instead
- specify correct --with-servlet-api= after recent libcommons-logging-java
changes
+ * debian/uno-libs3.symbols:
+ - use uno-libs3, not ure as dependency
+ * debian/control.ure.in:
+ - remove obsolete cli-uno-bridge Suggests
+
+ * merge from ubuntu-precise-3.5:
+ - add debian multiarch support for Qt4
+ - no dependencies needed for full builds
+ + propagate gb_FULLDEPS
+ - get rid of obsolete BrOffice specialcasing (LP: #884786)
+ - enable l10n
+ * merge from libreoffice_3.5.0_beta2-2ubuntu2
+ - enable gio, disable gvfs
- -- Rene Engelhard <r...@debian.org> Tue, 17 Jan 2012 01:36:05 +0000
+ -- Rene Engelhard <r...@debian.org> Tue, 17 Jan 2012 10:03:24 +0000
-libreoffice (1:3.4.5-1) unstable; urgency=medium
+libreoffice (1:3.5.0~beta2-2) experimental; urgency=low
- * new upstream release
- - fixes build with bleeding edge external boost and gcc (closes: #652784)
+ * 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/libreoffice-{common,core}.postrm.in:
- - on remove, delete created services.rdb (closes: #650341) and
- remove all /var/lib content on remove (prereg/bundled, basisX.Y)
+ *
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 <r...@debian.org> Fri, 30 Dec 2011 00:11:06 +0100
+
+libreoffice (1:3.5.0~beta2-1) experimental; urgency=low
+
+ [ Rene Engelhard ]
+ * 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/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
- - fix qstart.desktop Exec= (closes: #655076)
- - update fakeroot hack for multiarch paths
- - stop creating a dependency on ure for uno-libs3 in .shlibs, use
- uno-libs3 instead
- * debian/uno-libs3.symbols:
- - use uno-libs3, not ure as dependency
+ * 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
- * merge from ubuntu-precise-3.5:
- - add debian multiarch support for Qt4
+ [ 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 <r...@debian.org> Thu, 12 Jan 2012 18:56:37 +0000
+ -- Rene Engelhard <r...@debian.org> Tue, 27 Dec 2011 10:16:18 +0000
libreoffice (1:3.4.4-2) unstable; urgency=medium
--
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/e1rr6ke-0003sn...@vasks.debian.org
