[libreoffice] 04/07: bump dev/dev-doc conflicts to <= 1:5.0.3~rc1-2 to get upgrades from 1:5.0.3~rc1-2 working
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit 552cc71f39e3138472964b1f051deb18653e8fe6
Author: Rene Engelhard <rene@debian.org>
Date: Sat Oct 31 13:19:00 2015 +0100
bump dev/dev-doc conflicts to <= 1:5.0.3~rc1-2 to get upgrades from 1:5.0.3~rc1-2 working
Conflicts:
changelog
---
changelog | 6 +++---
control | 8 ++++----
control.in | 2 +-
control.sdk.in | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/changelog b/changelog
index 6ed39ea..35d9a4d 100644
--- a/changelog
+++ b/changelog
@@ -10,10 +10,10 @@ libreoffice (1:5.1.0~alpha1-2) experimental; urgency=medium
Save As.. works (at least for me...) - closes: #681180
- remove l10ntools build hack again, now obsolete
* debian/control{.sdk}.in, debian/rules, debian/libreoffice-dev-doc.links:
- - stop moving the SDK docs into libreoffice-devs /usr/share/doc (and move the
- stuff installed into /usr/share/doc/libreoffice/sdk in libreoffice-dev to
+ - stop moving the SDK docs into libreoffice-devs /usr/share/doc (and move
+ the stuff installed into /usr/share/doc/libreoffice/sdk in libreoffice-dev
to /usr/share/doc/libreoffice-dev, too) and conflict against
- libreoffice-dev / libreoffice-dev-doc (<< 1:5.0.3~rc1-2) where needed
+ libreoffice-dev / libreoffice-dev-doc (<= 1:5.0.3~rc1-2) where needed
(closes: #803272, #803306)
-- Rene Engelhard <rene@debian.org> Sat, 24 Oct 2015 18:52:43 +0200
diff --git a/control b/control
index 69be8d3..9efba80 100644
--- a/control
+++ b/control
@@ -225,8 +225,8 @@ Suggests: cups-bsd,
${gstreamer-plugins-suggests},
${java-runtime-depends},
${ooo-officebean-dep}
-Conflicts: libreoffice-dev (<< 1:5.0.3~rc1-2),
- libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
+Conflicts: libreoffice-dev (<= 1:5.0.3~rc1-2),
+ libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -4268,7 +4268,7 @@ Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: libmythes-dev, libreoffice-dev-doc, libreofficekit-dev
Replaces: libreoffice-common (<< 1:4.1.0~beta1),
libreoffice-core (<< 1:4.1.0~beta1)
-Conflicts: libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
+Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -4283,7 +4283,7 @@ Architecture: all
Depends: ${misc:Depends}
Recommends: libreoffice-dev (= ${binary:Version}), www-browser
Suggests: libreoffice-dtd-officedocument1.0
-Conflicts: libreoffice-dev (<< 1:5.0.3~rc1-2), openoffice.org-dev-doc
+Conflicts: libreoffice-dev (<= 1:5.0.3~rc1-2), openoffice.org-dev-doc
Description: office productivity suite -- SDK documentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.in b/control.in
index 4842d94..bd69e4c 100644
--- a/control.in
+++ b/control.in
@@ -69,7 +69,7 @@ Suggests: cups-bsd,
${java-runtime-depends},
${ooo-officebean-dep},
%LO-DESKTOP-INTEGRATION%
-Conflicts: libreoffice-dev (<< 1:5.0.3~rc1-2), libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
+Conflicts: libreoffice-dev (<= 1:5.0.3~rc1-2), libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
Description: office productivity suite (metapackage)
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.sdk.in b/control.sdk.in
index 4cbba6d..7fbcde1 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -8,7 +8,7 @@ Depends: libreoffice-core (= ${binary:Version}),
Recommends: g++, ${java-common-depends}, ${java-runtime-depends}
Suggests: libmythes-dev, libreofficekit-dev, libreoffice-dev-doc
Replaces: libreoffice-core (<< 1:4.1.0~beta1), libreoffice-common (<< 1:4.1.0~beta1)
-Conflicts: libreoffice-dev-doc (<< 1:5.0.3~rc1-2)
+Conflicts: libreoffice-dev-doc (<= 1:5.0.3~rc1-2)
Description: office productivity suite -- SDK
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -24,7 +24,7 @@ Depends: ${misc:Depends}
Recommends: libreoffice-dev (= ${binary:Version}),
www-browser
Suggests: libreoffice-dtd-officedocument1.0
-Conflicts: openoffice.org-dev-doc, libreoffice-dev (<< 1:5.0.3~rc1-2)
+Conflicts: openoffice.org-dev-doc, libreoffice-dev (<= 1:5.0.3~rc1-2)
Description: office productivity suite -- SDK documentation
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: