[libreoffice] 01/01: Merge remote-tracking branch 'origin/master' into debian-experimental-5.4
Rene Engelhard
rene at moszumanska.debian.org
Sun May 28 10:05:07 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.4
in repository libreoffice.
commit 9e1da77a1843ca0b7578cdca1e5d5e8f47dc3db3
Merge: 039dc19 a4f4eec
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sun May 28 12:05:03 2017 +0200
Merge remote-tracking branch 'origin/master' into debian-experimental-5.4
changelog | 2 +-
control | 56 ++++++++++++++++++++++++++++----------------------------
rules | 2 ++
3 files changed, 31 insertions(+), 29 deletions(-)
diff --cc changelog
index 2908823,fea52b9..8cfabdd
--- a/changelog
+++ b/changelog
@@@ -1,35 -1,4 +1,35 @@@
+libreoffice (1:5.4.0~beta1-1) UNRELEASED; urgency=medium
+
+ * New upstream beta release
+ - is now able to do "insert->image, choose pdf". Not insert->docunent
+ but close enough, so this closes: #814598
+ (unfortunately only using internal pdfium. sigh.)
+
+ * debian/scripts/gid2pkgdirs.sh, debian/control{,.transitionals}.in:
+ remove extra libreoffice-pdfimport, merge (even though the poppler
+ dependency...) back to -common/-core since it has the above new feature and
+ otherwise it may get confusing what is what.
+
+ * debian/rules, debian/patches/cppunit-optional.diff: as name says;
+ make cppunit build-dep optional and add <!nocheck> to the build-dep
+ * debian/patches/disable-unneeded-test-programs.diff : micro-optimisation;
+ as name says.
+
+ * tarballs/pdfium-3064.tar.bz2, debian/copyright,
+ debian/source/include-binaries: include pdfium
+
+ * tarballs/cppunit-1.14.0.tar.gz, debian/copyright,
+ debian/source/include-binaries, debian/rules: use internal cppunit, we
+ need >= 1.14.0 here and that one is in NEW only yet
+
+ * debian/rules:
+ - adapt for (upcoming) usage of dh_missing
+ - run build-nocheck with --without-junit --without-cppunit to configure
+ and run check without them
+
+ -- Rene Engelhard <rene at debian.org> Sat, 27 May 2017 10:52:43 +0200
+
- libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
+ libreoffice (1:5.3.3-2) experimental; urgency=medium
* debian/patches/sensible-lomua.diff: sync upstreams
"add xdg-email as the default email route" into here
diff --cc control
index b51ee9f,832e3c2..4de96a7
--- a/control
+++ b/control
@@@ -188,9 -184,9 +188,9 @@@ Build-Conflicts: amd-libopencl1
nvidia-libopencl1,
qt3-dev-tools
Standards-Version: 3.9.4
-Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git -b debian-experimental-5.4
Vcs-Browser: https://anonscm.debian.org/git/pkg-openoffice/libreoffice.git
--Bugs:
++Bugs: mailto:debian-openoffice at lists.debian.org
Homepage: http://www.libreoffice.org
Package: libreoffice
@@@ -943,23 -949,23 +943,23 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-am
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-am
++Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
--Suggests: hunspell-dictionary-am | myspell-dictionary-am,
-- hyphen-am,
-- libreoffice-grammarcheck-am,
-- libreoffice-help-am,
-- mythes-am
--Description: office productivity suite -- Amharic language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Amharic.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -1791,23 -1797,23 +1791,23 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-gug
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gug
++Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
--Suggests: hunspell-dictionary-gug | myspell-dictionary-gug,
-- hyphen-gug,
-- libreoffice-grammarcheck-gug,
-- libreoffice-help-gug,
-- mythes-gug
--Description: office productivity suite -- Guarani language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Guarani.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
@@@ -2172,23 -2178,23 +2172,23 @@@ Description: office productivity suite
install extra dictionaries/hyphenation patterns/thesauri independently of
the language packs.
--Package: libreoffice-l10n-kmr
++Package: libreoffice-l10n-
Section: localization
Architecture: all
Depends: libreoffice-common, locales | locales-all, ${misc:Depends}
--Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-kmr
++Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-
Provides: libreoffice-l10n (= ${help-l10n-virtual-version})
--Suggests: hunspell-dictionary-kmr | myspell-dictionary-kmr,
-- hyphen-kmr,
-- libreoffice-grammarcheck-kmr,
-- libreoffice-help-kmr,
-- mythes-kmr
--Description: office productivity suite -- Kurmanji language package
++Suggests: hunspell-dictionary- | myspell-dictionary-,
++ hyphen-,
++ libreoffice-grammarcheck-,
++ libreoffice-help-,
++ mythes-
++Description: office productivity suite -- language package
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the localization of LibreOffice in
-- Kurmanji.
++ .
It contains the user interface, the templates and the autotext features.
(please note that not all this is available for all possible languages).
You can switch user interface language using the locales system.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
More information about the Pkg-openoffice-commits
mailing list