[libreoffice] 01/01: regen control...
Rene Engelhard
rene at moszumanska.debian.org
Mon May 22 18:34:39 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.5
in repository libreoffice.
commit 46ccffce0c8017dea405d0bcbd9c354815ddb2b7
Author: Rene Engelhard <rene at debian.org>
Date: Mon May 22 20:34:25 2017 +0200
regen control...
---
control | 165 ----------------------------------------------------------
tests/control | 2 +-
2 files changed, 1 insertion(+), 166 deletions(-)
diff --git a/control b/control
index 2165df6..fea7651 100644
--- a/control
+++ b/control
@@ -3534,13 +3534,8 @@ Replaces: libreoffice-common (<< 1:3.0.0~dev300m28)
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}
@@ -3556,13 +3551,8 @@ Package: libreoffice-help-ca
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}
@@ -3578,13 +3568,8 @@ Package: libreoffice-help-cs
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}
@@ -3600,13 +3585,8 @@ Package: libreoffice-help-da
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}
@@ -3622,13 +3602,8 @@ Package: libreoffice-help-de
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}
@@ -3644,13 +3619,8 @@ Package: libreoffice-help-dz
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}
@@ -3666,13 +3636,8 @@ Package: libreoffice-help-el
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}
@@ -3688,13 +3653,8 @@ Package: libreoffice-help-en-gb
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}
@@ -3710,13 +3670,8 @@ Package: libreoffice-help-es
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}
@@ -3732,13 +3687,8 @@ Package: libreoffice-help-et
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}
@@ -3754,13 +3704,8 @@ Package: libreoffice-help-eu
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}
@@ -3776,13 +3721,8 @@ Package: libreoffice-help-fi
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}
@@ -3798,13 +3738,8 @@ Package: libreoffice-help-fr
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}
@@ -3820,13 +3755,8 @@ Package: libreoffice-help-gl
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}
@@ -3842,13 +3772,8 @@ Package: libreoffice-help-hi
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}
@@ -3864,13 +3789,8 @@ Package: libreoffice-help-hu
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}
@@ -3886,13 +3806,8 @@ Package: libreoffice-help-it
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}
@@ -3908,13 +3823,8 @@ Package: libreoffice-help-ja
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}
@@ -3930,13 +3840,8 @@ Package: libreoffice-help-km
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}
@@ -3952,13 +3857,8 @@ Package: libreoffice-help-ko
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}
@@ -3974,13 +3874,8 @@ Package: libreoffice-help-nl
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}
@@ -3996,13 +3891,8 @@ Package: libreoffice-help-om
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}
@@ -4018,13 +3908,8 @@ Package: libreoffice-help-pl
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}
@@ -4040,13 +3925,8 @@ Package: libreoffice-help-pt
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}
@@ -4062,13 +3942,8 @@ Package: libreoffice-help-pt-br
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}
@@ -4084,13 +3959,8 @@ Package: libreoffice-help-ru
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}
@@ -4106,13 +3976,8 @@ Package: libreoffice-help-sk
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,
@@ -4129,13 +3994,8 @@ Package: libreoffice-help-sl
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}
@@ -4151,13 +4011,8 @@ Package: libreoffice-help-sv
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}
@@ -4173,13 +4028,8 @@ Package: libreoffice-help-tr
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}
@@ -4195,13 +4045,8 @@ Package: libreoffice-help-vi
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}
@@ -4217,13 +4062,8 @@ Package: libreoffice-help-zh-cn
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}
@@ -4239,13 +4079,8 @@ Package: libreoffice-help-zh-tw
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 --git a/tests/control b/tests/control
index bd89282..700952b 100644
--- a/tests/control
+++ b/tests/control
@@ -1,5 +1,5 @@
Tests: junit-subsequentcheck
-Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
+Depends: libreoffice, libreoffice-subsequentcheckbase, libreoffice-sdbc-hsqldb, autoconf, automake, bc, bison, bzip2, fastjar, flex (>= 2.3.35), gperf, libcups2-dev, libfontconfig1-dev, libfreetype6-dev (>= 2.2.0), libgl1-mesa-dev, libice-dev, libsm-dev, libx11-dev, libxaw7-dev, libxext-dev, libxinerama-dev, libxkbfile-dev, libxrender-dev, libxt-dev, libxtst-dev, pkg-config, unzip, x11proto-render-dev, xsltproc, zip, zlib1g-dev , libgltf-dev (>= 0.1.0) , opencollada-dev (>= 0.1.0~2014070 [...]
Tests: pyuno-import
Depends: python3-uno
--
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