[libreoffice] 02/02: Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4
Rene Engelhard
rene at moszumanska.debian.org
Sat May 20 12:40:53 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 6aeff2cb64b07f5d5d0797f95d6ced0070b340ae
Merge: 34f6a4f ad1af75
Author: Rene Engelhard <rene at rene-engelhard.de>
Date: Sat May 20 14:40:46 2017 +0200
Merge remote-tracking branch 'origin/debian-experimental-5.3' into debian-experimental-5.4
changelog | 10 ++
control | 259 +++++++++++++++++++++--------------------
control.evolution.in | 1 -
control.firebird.in | 1 -
control.gtk2.in | 1 -
control.gtk3.in | 1 -
control.help.in | 1 -
control.in | 26 -----
control.kde.in | 1 -
control.lang.in | 1 -
control.mediawiki.in | 1 -
control.ogltrans.in | 1 -
control.postgresql.in | 1 -
control.reportdesign.in | 2 -
control.sdk.in | 1 -
control.subsequentcheckbase.in | 1 -
rules | 8 +-
17 files changed, 146 insertions(+), 171 deletions(-)
diff --cc changelog
index b04ea4d,ffc99ba..4e3709a
--- a/changelog
+++ b/changelog
@@@ -1,23 -1,13 +1,33 @@@
+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.
+
+ * tarballs/pdfium-3064.tar.bz2, debian/copyright,
+ debian/source/include-binaries: include pdfium
+
+ * debian/rules:
+ - adapt for (upcoming) usage of dh_missing
+
+ -- Rene Engelhard <rene at debian.org> Thu, 18 May 2017 12:54:08 +0200
+
+ libreoffice (1:5.3.3-2) UNRELEASED; urgency=medium
+
+ * debian/rules:
+ - fix logic error; make -g1 etc work also with noddebs. Build with those
+ flags also if building no -dbgsym
+ * debian/control.in:
+ - remove obsolete Pre-Depends
+
+ -- Rene Engelhard <rene at debian.org> Sat, 20 May 2017 14:32:02 +0200
+
libreoffice (1:5.3.3-1) experimental; urgency=medium
* New upstream release
diff --cc control
index 0099717,f3d5168..0446cc2
--- a/control
+++ b/control
@@@ -3648,9 -3539,7 +3533,13 @@@ Replaces: libreoffice-common (<< 1:3.0.
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-en-us,
++=======
+ Depends: libreoffice-l10n-en-us,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-en,
${misc:Depends}
@@@ -3666,9 -3555,7 +3555,13 @@@ Package: libreoffice-help-c
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ca
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-ca,
++=======
+ Depends: libreoffice-l10n-ca,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-ca,
${misc:Depends}
@@@ -3684,9 -3571,7 +3577,13 @@@ Package: libreoffice-help-c
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-cs
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-cs,
++=======
+ Depends: libreoffice-l10n-cs,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-cs,
${misc:Depends}
@@@ -3702,9 -3587,7 +3599,13 @@@ Package: libreoffice-help-d
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-da
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-da,
++=======
+ Depends: libreoffice-l10n-da,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-da,
${misc:Depends}
@@@ -3720,9 -3603,7 +3621,13 @@@ Package: libreoffice-help-d
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-de
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-de,
++=======
+ Depends: libreoffice-l10n-de,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-de,
${misc:Depends}
@@@ -3738,9 -3619,7 +3643,13 @@@ Package: libreoffice-help-d
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-dz
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-dz,
++=======
+ Depends: libreoffice-l10n-dz,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-dz,
${misc:Depends}
@@@ -3756,9 -3635,7 +3665,13 @@@ Package: libreoffice-help-e
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-el
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-el,
++=======
+ Depends: libreoffice-l10n-el,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-el,
${misc:Depends}
@@@ -3774,9 -3651,7 +3687,13 @@@ Package: libreoffice-help-en-g
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-en-gb,
++=======
+ Depends: libreoffice-l10n-en-gb,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-en,
${misc:Depends}
@@@ -3792,9 -3667,7 +3709,13 @@@ Package: libreoffice-help-e
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-es
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-es,
++=======
+ Depends: libreoffice-l10n-es,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-es,
${misc:Depends}
@@@ -3810,9 -3683,7 +3731,13 @@@ Package: libreoffice-help-e
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-et
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-et,
++=======
+ Depends: libreoffice-l10n-et,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-et,
${misc:Depends}
@@@ -3828,9 -3699,7 +3753,13 @@@ Package: libreoffice-help-e
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-eu
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-eu,
++=======
+ Depends: libreoffice-l10n-eu,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-eu,
${misc:Depends}
@@@ -3846,9 -3715,7 +3775,13 @@@ Package: libreoffice-help-f
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fi
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-fi,
++=======
+ Depends: libreoffice-l10n-fi,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-fi,
${misc:Depends}
@@@ -3864,9 -3731,7 +3797,13 @@@ Package: libreoffice-help-f
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-fr
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-fr,
++=======
+ Depends: libreoffice-l10n-fr,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-fr,
${misc:Depends}
@@@ -3882,9 -3747,7 +3819,13 @@@ Package: libreoffice-help-g
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-gl
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-gl,
++=======
+ Depends: libreoffice-l10n-gl,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-gl,
${misc:Depends}
@@@ -3900,9 -3763,7 +3841,13 @@@ Package: libreoffice-help-h
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hi
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-hi,
++=======
+ Depends: libreoffice-l10n-hi,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-hi,
${misc:Depends}
@@@ -3918,9 -3779,7 +3863,13 @@@ Package: libreoffice-help-h
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-hu
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-hu,
++=======
+ Depends: libreoffice-l10n-hu,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-hu,
${misc:Depends}
@@@ -3936,9 -3795,7 +3885,13 @@@ Package: libreoffice-help-i
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-it
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-it,
++=======
+ Depends: libreoffice-l10n-it,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-it,
${misc:Depends}
@@@ -3954,9 -3811,7 +3907,13 @@@ Package: libreoffice-help-j
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ja
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-ja,
++=======
+ Depends: libreoffice-l10n-ja,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-ja,
${misc:Depends}
@@@ -3972,9 -3827,7 +3929,13 @@@ Package: libreoffice-help-k
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-km
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-km,
++=======
+ Depends: libreoffice-l10n-km,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-km,
${misc:Depends}
@@@ -3990,9 -3843,7 +3951,13 @@@ Package: libreoffice-help-k
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ko
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-ko,
++=======
+ Depends: libreoffice-l10n-ko,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-ko,
${misc:Depends}
@@@ -4008,9 -3859,7 +3973,13 @@@ Package: libreoffice-help-n
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-nl
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-nl,
++=======
+ Depends: libreoffice-l10n-nl,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-nl,
${misc:Depends}
@@@ -4026,9 -3875,7 +3995,13 @@@ Package: libreoffice-help-o
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-om
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-om,
++=======
+ Depends: libreoffice-l10n-om,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-om,
${misc:Depends}
@@@ -4044,9 -3891,7 +4017,13 @@@ Package: libreoffice-help-p
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pl
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-pl,
++=======
+ Depends: libreoffice-l10n-pl,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-pl,
${misc:Depends}
@@@ -4062,9 -3907,7 +4039,13 @@@ Package: libreoffice-help-p
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-pt,
++=======
+ Depends: libreoffice-l10n-pt,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-pt,
${misc:Depends}
@@@ -4080,9 -3923,7 +4061,13 @@@ Package: libreoffice-help-pt-b
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-pt
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-pt-br,
++=======
+ Depends: libreoffice-l10n-pt-br,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-pt,
${misc:Depends}
@@@ -4098,9 -3939,7 +4083,13 @@@ Package: libreoffice-help-r
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-ru
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-ru,
++=======
+ Depends: libreoffice-l10n-ru,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-ru,
${misc:Depends}
@@@ -4116,9 -3955,7 +4105,13 @@@ Package: libreoffice-help-s
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sk
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-help-cs,
++=======
+ Depends: libreoffice-help-cs,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-l10n-sk,
libreoffice-style-default,
libreoffice-writer | language-support-translations-sk,
@@@ -4135,9 -3972,7 +4128,13 @@@ Package: libreoffice-help-s
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sl
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-sl,
++=======
+ Depends: libreoffice-l10n-sl,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-sl,
${misc:Depends}
@@@ -4153,9 -3988,7 +4150,13 @@@ Package: libreoffice-help-s
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-sv
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-sv,
++=======
+ Depends: libreoffice-l10n-sv,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-sv,
${misc:Depends}
@@@ -4171,9 -4004,7 +4172,13 @@@ Package: libreoffice-help-t
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-tr
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-tr,
++=======
+ Depends: libreoffice-l10n-tr,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-tr,
${misc:Depends}
@@@ -4189,9 -4020,7 +4194,13 @@@ Package: libreoffice-help-v
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-vi
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-vi,
++=======
+ Depends: libreoffice-l10n-vi,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-vi,
${misc:Depends}
@@@ -4207,9 -4036,7 +4216,13 @@@ Package: libreoffice-help-zh-c
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-zh-cn,
++=======
+ Depends: libreoffice-l10n-zh-cn,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-zh,
${misc:Depends}
@@@ -4225,9 -4052,7 +4238,13 @@@ Package: libreoffice-help-zh-t
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-zh
++<<<<<<< HEAD
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libreoffice-common (>= 1:5.4.0~beta1~),
+ libreoffice-l10n-zh-tw,
++=======
+ Depends: libreoffice-l10n-zh-tw,
++>>>>>>> origin/debian-experimental-5.3
libreoffice-style-default,
libreoffice-writer | language-support-translations-zh,
${misc:Depends}
diff --cc control.help.in
index 90c09f6,e198367..14c0e2c
--- a/control.help.in
+++ b/control.help.in
@@@ -2,10 -2,8 +2,9 @@@ Package: libreoffice-help- at LCODE
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations- at CCODE@
- Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-l10n- at LCODE@,
libreoffice-style-default,
+ libreoffice-common (>= 1:5.4.0~beta1~),
libreoffice-writer | language-support-translations- at CCODE@,
${misc:Depends}
Provides: libreoffice-help (= ${help-l10n-virtual-version})
--
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