[libreoffice] 01/04: Clean up versioned references to internal packages <= 1:4.2
Rene Engelhard
rene at moszumanska.debian.org
Sun Jul 16 10:07:29 UTC 2017
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository libreoffice.
commit 4886dc5928f021a8699fa1cdd9ca83841df8e520
Author: Rico Tzschichholz <ricotz at ubuntu.com>
Date: Thu Jul 13 09:05:47 2017 +0200
Clean up versioned references to internal packages <= 1:4.2
---
control | 103 ++++++++++--------------------------------------
control.evolution.in | 4 +-
control.in | 60 ++++++----------------------
control.kde.in | 2 +-
control.librelogo.in | 2 +-
control.mediawiki.in | 5 +--
control.mysql.in | 3 --
control.nlpsolver.in | 2 +-
control.ogltrans.in | 1 -
control.postgresql.in | 3 +-
control.reportdesign.in | 3 --
control.sdk.in | 2 +-
control.ure.in | 7 ++--
rules | 1 -
14 files changed, 41 insertions(+), 157 deletions(-)
diff --git a/control b/control
index 56c3254..d1a52d5 100644
--- a/control
+++ b/control
@@ -338,7 +338,6 @@ Depends: fontconfig,
${shlibs:Depends}
Recommends: libpaper-utils
Breaks: browser-plugin-libreoffice,
- cli-uno-bridge (<< 1:3.0.0~dev300m22),
hunspell-ar (<< 0.0.0+20080110-1.1),
hunspell-da (<< 1:3.1.0-3),
hunspell-de-at (<< 20071211-2),
@@ -361,26 +360,15 @@ Breaks: browser-plugin-libreoffice,
libicu38 (= 3.8~d01-1),
libreoffice-base (<< ${binary:Version}),
libreoffice-calc (<< ${binary:Version}),
- libreoffice-common (<< 1:3.6.1~rc1),
libreoffice-dev (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}),
- libreoffice-evolution (<< 1:3.4.1~),
libreoffice-gnome (<< ${binary:Version}),
libreoffice-gtk2 (<< ${binary:Version}),
libreoffice-gtk3 (<< ${binary:Version}),
libreoffice-impress (<< ${binary:Version}),
- libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
libreoffice-officebean (<< ${binary:Version}),
- libreoffice-presentation-minimizer (<< 1:4.2~),
- libreoffice-sdbc-postgresql (<< 0.8.1~),
- libreoffice-style-andromeda (<< 1:3.3.0-1),
- libreoffice-style-crystal (<< 1:3.3.0-1),
- libreoffice-style-galaxy (<< 1:3.3.0-1),
- libreoffice-style-hicontrast (<< 1:3.3.0-1),
- libreoffice-style-oxygen (<< 1:3.3.0-1),
- libreoffice-style-tango (<< 1:3.3.0-1),
libreoffice-writer (<< ${binary:Version}),
mozilla-libreoffice (<< 1:3.5.0~beta~),
mozilla-plugin-vlc (<< 1.0),
@@ -429,10 +417,7 @@ Breaks: browser-plugin-libreoffice,
myspell-tl (<< 0.4-0-5)
Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
Provides: libreoffice-bundled
-Replaces: libreoffice-calc (<< 1:3.3.2-5),
- libreoffice-common (<< 1:4.4.0~rc3-1),
- uno-libs3 (<< 1:3.6.1-2),
- ure (<< 1:3.6.1-2)
+Replaces: libreoffice-common (<< 1:4.4.0~rc3-1)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -461,14 +446,6 @@ Conflicts: broffice,
Provides: libreoffice-l10n-en-us
Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-core (>= 1:${next-oover}~),
- libreoffice-mysql-connector (<< 1.0.1+LibO3.6.5-1),
- libreoffice-pdfimport (<< 1.0.6),
- libreoffice-presentation-minimizer (<< 1.0.4),
- libreoffice-presenter-console (<< 1.1.1),
- libreoffice-report-builder (<< 1.2.3),
- libreoffice-script-provider-bsh (<< 1:3.6~),
- libreoffice-script-provider-js (<< 1:3.6~),
- libreoffice-script-provider-python (<< 1:3.6~),
libreoffice-style-andromeda (<< 1:${oover}~),
libreoffice-style-crystal (<< 1:${oover}~),
libreoffice-style-crystal (>= 1:${next-oover}~),
@@ -480,14 +457,10 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-oxygen (>= 1:${next-oover}~),
libreoffice-style-tango (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
- libreoffice-wiki-publisher (<< 1.1.2),
libreoffice-writer2latex (<< 1.0.2-9),
libreoffice-writer2xhtml (<< 1.0.2-9),
libtextcat-data (<< 2.2-8),
- openoffice.org-common (<< 1:3.3.0~),
zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
-Replaces: libreoffice-emailmerge (<< 1:4.0.2~rc1),
- openoffice.org-common (<< 1:3.3.0~)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -513,7 +486,6 @@ Depends: libreoffice-base-core (= ${binary:Version}) [!hppa !ia64 !mips64 !s390
${misc:Depends},
${shlibs:Depends}
Recommends: libreoffice-math
-Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: fonts-crosextra-caladea,
fonts-crosextra-carlito,
libreoffice-base,
@@ -586,7 +558,6 @@ Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el power
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Replaces: libreoffice-base (<< 1:3.5.3~rc2-1)
Suggests: libreoffice-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
@@ -621,7 +592,6 @@ Enhances: libreoffice-core
Depends: libreoffice-style-tango, ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreoffice-style
-Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Oxygen symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -660,7 +630,6 @@ Enhances: libreoffice-core
Depends: libreoffice-style-default, ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
-Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Hicontrast symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -685,7 +654,6 @@ Package: libreoffice-style-galaxy
Architecture: all
Depends: ${misc:Depends}
Provides: libreoffice-style, libreoffice-style-default
-Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -724,10 +692,9 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
+Conflicts: python-uno, python3.3-uno
Replaces: libreoffice-common (<< 1:4.4.0~beta2),
libreoffice-core (= 1:4.3.0~beta1-1),
- python3-uno (<< 1:4.0.2~rc2),
python3.3-uno
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
@@ -756,13 +723,11 @@ Description: office productivity suite -- Java bean
Package: libreoffice-script-provider-python
Architecture: all
Section: python
-Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
- libreoffice-core (>= 1:3.5.0~alpha0~),
+Depends: libreoffice-common,
+ libreoffice-core,
${misc:Depends},
${python:Depends},
${pyuno-depends}
-Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
-Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
Description: Python script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -777,13 +742,12 @@ Description: Python script support provider for LibreOffice scripting framework
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
-Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
- libreoffice-core (>= 1:3.5.0~alpha0~),
+Depends: libreoffice-common,
+ libreoffice-core,
${java-common-depends},
${java-runtime-depends},
${java:Depends},
${misc:Depends}
-Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -798,9 +762,8 @@ Description: BeanShell script support provider for LibreOffice scripting framewo
Package: libreoffice-script-provider-js
Architecture: all
Section: web
-Replaces: libreoffice-common (<< 1:3.4~)
-Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
- libreoffice-core (>= 1:3.5.0~alpha0~),
+Depends: libreoffice-common,
+ libreoffice-core,
${java-common-depends},
${java-runtime-depends},
${java:Depends},
@@ -822,7 +785,6 @@ Priority: optional
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
Description: PDF Import component for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -835,7 +797,6 @@ Section: misc
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Recommends: gstreamer1.0-plugins-bad
-Replaces: libreoffice-core (<< 1:4.2~)
Provides: libreoffice-avmedia-backend
Description: GStreamer backend for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
@@ -866,7 +827,6 @@ Depends: libreoffice-core,
${java:Depends},
${misc:Depends},
${shlibs:Depends}
-Replaces: libreoffice-base (<< 1:4.2~)
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Section: database
Enhances: libreoffice-base-drivers
@@ -887,7 +847,7 @@ Suggests: libjtds-java,
libsqliteodbc | tdsodbc | mdbtools
Recommends: libreoffice-sdbc-firebird [alpha amd64 arm64 armel armhf i386 ia64 kfreebsd-amd64 kfreebsd-i386 mipsel mips64el ppc64el],
libreoffice-sdbc-hsqldb [alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386]
-Replaces: libreoffice-base (<< 1:4.3.0-3), libreoffice-core (<< 1:4.2~)
+Replaces: libreoffice-base (<< 1:4.3.0-3)
Breaks: libreoffice-base (<< 1:4.3.0-3)
Description: Database connectivity drivers for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
@@ -3537,7 +3497,6 @@ Description: office productivity suite -- Zulu language package
the language packs.
Package: libreoffice-help-en-us
-Replaces: libreoffice-common (<< 1:3.0.0~dev300m28)
Architecture: all
Section: doc
Recommends: libreoffice-core (>> ${base-version}) | language-support-translations-en
@@ -4071,7 +4030,7 @@ Section: libs
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: ure (<< 1:5.0.0~rc2-1)
-Breaks: libreoffice-core (<< 1:4.3.0~), ure (<< 4.1.2~)
+Breaks: libreoffice-core (<< 1:4.3.0~)
Description: LibreOffice UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
@@ -4094,13 +4053,8 @@ Section: libs
Architecture: alpha amd64 arm64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel mips64 mips64el powerpc powerpcspe ppc64 ppc64el s390 s390x sparc sparc64
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}, ${shlibs:Depends}
Suggests: java5-runtime
-Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
-Replaces: libreoffice-common (<< 1:4.5.0),
- libreoffice-core (<< 1:5.3.0~beta1~),
- libreoffice-java-common (<< 1:3.0.0~dev300m12)
-Breaks: libreoffice-common (<< 1:4.5.0),
- libreoffice-core (<< 1:5.3.0~beta1~),
- openoffice.org-core (<< 1:3.3~)
+Replaces: libreoffice-common (<< 1:4.5.0), libreoffice-core (<< 1:5.3.0~beta1~)
+Breaks: libreoffice-common (<< 1:4.5.0), libreoffice-core (<< 1:5.3.0~beta1~)
Description: LibreOffice UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
@@ -4121,7 +4075,6 @@ Depends: libreoffice-common,
${misc:Depends},
${shlibs:Depends}
Enhances: libreoffice-impress
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
Description: LibreOffice Impress extension for slide transitions using OpenGL
LibreOffice is a full-featured office productivity suite that provide
@@ -4133,15 +4086,12 @@ Description: LibreOffice Impress extension for slide transitions using OpenGL
Package: libreoffice-wiki-publisher
Section: misc
Architecture: all
-Depends: libreoffice-core (>= 1:3.4~),
+Depends: libreoffice-core,
${java-common-depends},
${java-runtime-depends},
${java:Depends},
${misc:Depends}
Enhances: libreoffice-writer
-Conflicts: libreoffice-common (<< 1:3.5~),
- libreoffice-core (<< 1:3.5~),
- ure (<< 1.5.1+OOo3.1.1-15)
Suggests: mediawiki
Description: LibreOffice extension for working with MediaWiki articles
LibreOffice is a full-featured office productivity suite that provides
@@ -4160,9 +4110,6 @@ Depends: libreoffice-core,
${java:Depends},
${misc:Depends},
${report-builder-jar-depends}
-Conflicts: libreoffice-common (<< 1:3.5~),
- libreoffice-core (<< 1:3.5~),
- ure (<< 1.5.1+OOo3.1.1-15)
Provides: libreoffice-reportdesigner
Enhances: libreoffice-base
Description: LibreOffice component for building database reports
@@ -4188,8 +4135,8 @@ Description: LibreOffice component for building database reports -- libraries
Package: libreoffice-nlpsolver
Architecture: all
-Depends: libreoffice-calc (>= 1:3.0~),
- libreoffice-core (>= 1:3.3~),
+Depends: libreoffice-calc,
+ libreoffice-core,
${java-common-depends},
${java-runtime-depends},
${misc:Depends}
@@ -4228,9 +4175,7 @@ Depends: libreoffice-core (= ${binary:Version}),
${shlibs:Depends}
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),
- libreoffice-dev-common (<< 1:5.3.2~)
+Replaces: libreoffice-dev-common (<< 1:5.3.2~)
Conflicts: libreoffice (<< 1:5.2.5-2~), libreoffice-dev-doc (<< 1:5.2.5-2~)
Breaks: libreoffice-dev-common (<< 1:5.3.2~)
Description: office productivity suite -- SDK -- architecture-dependent parts
@@ -4381,9 +4326,7 @@ Recommends: ${kde-iconset-dep}
Suggests: kmail, konqueror
Section: kde
Enhances: libreoffice
-Replaces: libreoffice-core (= 1:3.5.0~beta2-1),
- libreoffice-core (= 1:4.3.0~beta1-1),
- openoffice.org-kde (<< 1:3.3.0~)
+Replaces: libreoffice-core (= 1:4.3.0~beta1-1)
Description: office productivity suite -- KDE integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -4397,9 +4340,8 @@ Description: office productivity suite -- KDE integration
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
-Depends: libreoffice-core (>= 1:3.5.0~beta), ${misc:Depends}, ${shlibs:Depends}
+Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Suggests: postgresql (>= 8.4)
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Enhances: libreoffice-base-drivers
Description: PostgreSQL SDBC driver for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
@@ -4414,9 +4356,6 @@ Section: misc
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Suggests: default-mysql-server | virtual-mysql-server
-Conflicts: libreoffice-common (<< 1:3.5~),
- libreoffice-core (<< 1:3.5~),
- ure (<< 1.5.1+OOo3.1.1-15)
Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
Description: MariaDB/MySQL Connector extension for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
@@ -4429,14 +4368,12 @@ Package: libreoffice-evolution
Architecture: alpha amd64 arm64 armel armhf i386 m68k mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x sparc64 kfreebsd-amd64 kfreebsd-i386
Section: gnome
Depends: libreoffice-base,
- libreoffice-common (>= 1:3.4.0~),
+ libreoffice-common,
libreoffice-core (= ${binary:Version}),
${libebook-dep},
${misc:Depends},
${shlibs:Depends}
Recommends: evolution
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
-Replaces: libreoffice-common (<< 1:3.3.3-2~)
Description: office productivity suite -- Evolution addressbook support
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -4455,7 +4392,7 @@ Description: LibreOffice java test libraries
Package: libreoffice-librelogo
Section: misc
Architecture: all
-Depends: libreoffice-core (>= 1:3.4~),
+Depends: libreoffice-core,
libreoffice-script-provider-python,
libreoffice-writer,
${misc:Depends}
diff --git a/control.evolution.in b/control.evolution.in
index f22bfa3..23244be 100644
--- a/control.evolution.in
+++ b/control.evolution.in
@@ -2,14 +2,12 @@ Package: libreoffice-evolution
Architecture: %OOO_BASE_ARCHS%
Section: gnome
Depends: libreoffice-base,
- libreoffice-common (>= 1:3.4.0~),
+ libreoffice-common,
libreoffice-core (= ${binary:Version}),
${libebook-dep},
${misc:Depends},
${shlibs:Depends}
Recommends: evolution
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
-Replaces: libreoffice-common (<< 1:3.3.3-2~)
Description: office productivity suite -- Evolution addressbook support
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 7be16b6..159b790 100644
--- a/control.in
+++ b/control.in
@@ -174,8 +174,7 @@ Depends: fontconfig,
${misc:Depends},
${shlibs:Depends}
Recommends: libpaper-utils
-Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
- hunspell-ar (<< 0.0.0+20080110-1.1),
+Breaks: hunspell-ar (<< 0.0.0+20080110-1.1),
hunspell-da (<< 1:3.1.0-3),
hunspell-de-at (<< 20071211-2),
hunspell-de-ch (<< 20071211-2),
@@ -197,26 +196,15 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
libicu38 (= 3.8~d01-1),
libreoffice-base (<< ${binary:Version}),
libreoffice-calc (<< ${binary:Version}),
- libreoffice-common (<< 1:3.6.1~rc1),
libreoffice-dev (<< ${binary:Version}),
libreoffice-draw (<< ${binary:Version}),
libreoffice-evolution (<< ${binary:Version}),
- libreoffice-evolution (<< 1:3.4.1~),
libreoffice-gnome (<< ${binary:Version}),
libreoffice-gtk2 (<< ${binary:Version}),
libreoffice-gtk3 (<< ${binary:Version}),
libreoffice-impress (<< ${binary:Version}),
- libreoffice-kab (<< 1:3.4.1~),
libreoffice-kde (<< ${binary:Version}),
libreoffice-officebean (<< ${binary:Version}),
- libreoffice-presentation-minimizer (<< 1:4.2~),
- libreoffice-sdbc-postgresql (<< 0.8.1~),
- libreoffice-style-andromeda (<< 1:3.3.0-1),
- libreoffice-style-crystal (<< 1:3.3.0-1),
- libreoffice-style-galaxy (<< 1:3.3.0-1),
- libreoffice-style-hicontrast (<< 1:3.3.0-1),
- libreoffice-style-oxygen (<< 1:3.3.0-1),
- libreoffice-style-tango (<< 1:3.3.0-1),
libreoffice-writer (<< ${binary:Version}),
mozilla-libreoffice (<< 1:3.5.0~beta~),
mozilla-plugin-vlc (<< 1.0),
@@ -266,10 +254,7 @@ Breaks: cli-uno-bridge (<< 1:3.0.0~dev300m22),
browser-plugin-libreoffice
Conflicts: cacao-oj6-jre, libreoffice-filter-binfilter, libreoffice-unbundled
Provides: libreoffice-bundled
-Replaces: libreoffice-calc (<< 1:3.3.2-5),
- libreoffice-common (<< 1:4.4.0~rc3-1),
- uno-libs3 (<< 1:3.6.1-2),
- ure (<< 1:3.6.1-2)
+Replaces: libreoffice-common (<< 1:4.4.0~rc3-1)
Description: office productivity suite -- arch-dependent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -308,20 +293,9 @@ Breaks: libreoffice-core (<< 1:${oover}~),
libreoffice-style-tango (<< 1:${oover}~),
libreoffice-style-tango (>= 1:${next-oover}~),
libtextcat-data (<< 2.2-8),
- openoffice.org-common (<< 1:3.3.0~),
- libreoffice-pdfimport (<< 1.0.6),
- libreoffice-presenter-console (<< 1.1.1),
- libreoffice-wiki-publisher (<< 1.1.2),
- libreoffice-report-builder (<< 1.2.3),
- libreoffice-presentation-minimizer (<< 1.0.4),
- libreoffice-mysql-connector (<< 1.0.1+LibO3.6.5-1),
- libreoffice-script-provider-bsh (<< 1:3.6~),
- libreoffice-script-provider-js (<< 1:3.6~),
- libreoffice-script-provider-python (<< 1:3.6~),
libreoffice-writer2latex (<< 1.0.2-9),
libreoffice-writer2xhtml (<< 1.0.2-9),
zotero-libreoffice-integration (<= 3.0.11.1-26-g08fb709-1)
-Replaces: openoffice.org-common (<< 1:3.3.0~), libreoffice-emailmerge (<< 1:4.0.2~rc1)
Description: office productivity suite -- arch-independent files
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -347,7 +321,6 @@ Depends: libreoffice-base-core (= ${binary:Version})%OOO_NO_BASE_ARCHS%,
${misc:Depends},
${shlibs:Depends}
Recommends: libreoffice-math,
-Replaces: libreoffice-core (<< 1:3.3.2-5)
Suggests: fonts-crosextra-caladea,
fonts-crosextra-carlito,
libreoffice-base,
@@ -419,7 +392,6 @@ Architecture: %OOO_BASE_ARCHS%
Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${shlibs:Depends}
-Replaces: libreoffice-base (<< 1:3.5.3~rc2-1)
Suggests: libreoffice-base
Description: office productivity suite -- shared library
LibreOffice is a full-featured office productivity suite that provides
@@ -456,7 +428,6 @@ Enhances: libreoffice-core
Depends: libreoffice-style-tango, ${misc:Depends}
Suggests: kde-icons-oxygen, oxygencursors
Provides: libreoffice-style
-Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Oxygen symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -495,7 +466,6 @@ Enhances: libreoffice-core
Depends: libreoffice-style-default, ${misc:Depends}
Suggests: gtk2-engines
Provides: libreoffice-style
-Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Hicontrast symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -520,7 +490,6 @@ Package: libreoffice-style-galaxy
Architecture: all
Depends: ${misc:Depends}
Provides: libreoffice-style, libreoffice-style-default
-Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
Description: office productivity suite -- Galaxy (Default) symbol style
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -559,8 +528,8 @@ Depends: libreoffice-core (= ${binary:Version}),
${misc:Depends},
${python3:Depends},
${shlibs:Depends}
-Conflicts: python-uno, python3-uno (<< 1:4.0.2~rc2), python3.3-uno
-Replaces: python3-uno (<< 1:4.0.2~rc2), python3.3-uno, libreoffice-core (= 1:4.3.0~beta1-1), libreoffice-common (<< 1:4.4.0~beta2)
+Conflicts: python-uno, python3.3-uno
+Replaces: python3.3-uno, libreoffice-core (= 1:4.3.0~beta1-1), libreoffice-common (<< 1:4.4.0~beta2)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -588,13 +557,11 @@ Description: office productivity suite -- Java bean
Package: libreoffice-script-provider-python
Architecture: all
Section: python
-Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
- libreoffice-core (>= 1:3.5.0~alpha0~),
+Depends: libreoffice-common,
+ libreoffice-core,
${misc:Depends},
${python:Depends},
${pyuno-depends}
-Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
-Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
Description: Python script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -609,13 +576,12 @@ Description: Python script support provider for LibreOffice scripting framework
Package: libreoffice-script-provider-bsh
Architecture: all
Section: java
-Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
- libreoffice-core (>= 1:3.5.0~alpha0~),
+Depends: libreoffice-common,
+ libreoffice-core,
${java-common-depends},
${java:Depends},
${java-runtime-depends},
${misc:Depends}
-Replaces: libreoffice-java-common (<< 1:3.4~)
Description: BeanShell script support provider for LibreOffice scripting framework
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -630,9 +596,8 @@ Description: BeanShell script support provider for LibreOffice scripting framewo
Package: libreoffice-script-provider-js
Architecture: all
Section: web
-Replaces: libreoffice-common (<< 1:3.4~)
-Depends: libreoffice-common (>= 1:3.5.0~alpha0~),
- libreoffice-core (>= 1:3.5.0~alpha0~),
+Depends: libreoffice-common,
+ libreoffice-core,
${java-common-depends},
${java:Depends},
${java-runtime-depends},
@@ -654,7 +619,6 @@ Priority: optional
Architecture: %OOO_ARCHS%
Pre-Depends: ${misc:Pre-Depends}
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
-Breaks: libreoffice-common (<< 1:3.5~), libreoffice-core (<< 1:3.5~)
Description: PDF Import component for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -667,7 +631,6 @@ Section: misc
Architecture: %OOO_ARCHS%
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Recommends: gstreamer1.0-plugins-bad
-Replaces: libreoffice-core (<< 1:4.2~)
Provides: libreoffice-avmedia-backend
Description: GStreamer backend for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
@@ -690,7 +653,6 @@ Description: VLC backend for LibreOffice
Package: libreoffice-sdbc-hsqldb
Depends: libreoffice-core, ${java-common-depends}, ${java:Depends}, ${java-runtime-depends}, ${shlibs:Depends}, ${misc:Depends}
-Replaces: libreoffice-base (<< 1:4.2~)
Architecture: %OOO_JAVA_ARCHS%
Section: database
Enhances: libreoffice-base-drivers
@@ -710,7 +672,7 @@ Suggests: libreoffice-sdbc-postgresql | odbc-postgresql | libpg-java,
libsqliteodbc | tdsodbc | mdbtools,
libjtds-java,
Recommends: libreoffice-sdbc-hsqldb [%OOO_JAVA_ARCHS%], libreoffice-sdbc-firebird [%OOO_FIREBIRD_ARCHS%]
-Replaces: libreoffice-core (<< 1:4.2~), libreoffice-base (<< 1:4.3.0-3)
+Replaces: libreoffice-base (<< 1:4.3.0-3)
Breaks: libreoffice-base (<< 1:4.3.0-3)
Description: Database connectivity drivers for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.kde.in b/control.kde.in
index a86ea80..35c8129 100644
--- a/control.kde.in
+++ b/control.kde.in
@@ -7,7 +7,7 @@ Recommends: ${kde-iconset-dep}
Suggests: kmail, konqueror
Section: kde
Enhances: libreoffice
-Replaces: libreoffice-core (= 1:3.5.0~beta2-1), openoffice.org-kde (<< 1:3.3.0~), libreoffice-core (= 1:4.3.0~beta1-1)
+Replaces: libreoffice-core (= 1:4.3.0~beta1-1)
Description: office productivity suite -- KDE integration
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.librelogo.in b/control.librelogo.in
index f029b3e..8c65b73 100644
--- a/control.librelogo.in
+++ b/control.librelogo.in
@@ -1,7 +1,7 @@
Package: libreoffice-librelogo
Section: misc
Architecture: all
-Depends: libreoffice-core (>= 1:3.4~),
+Depends: libreoffice-core,
libreoffice-writer,
libreoffice-script-provider-python,
${misc:Depends}
diff --git a/control.mediawiki.in b/control.mediawiki.in
index 4924729..8cbcd4d 100644
--- a/control.mediawiki.in
+++ b/control.mediawiki.in
@@ -1,15 +1,12 @@
Package: libreoffice-wiki-publisher
Section: misc
Architecture: all
-Depends: libreoffice-core (>= 1:3.4~),
+Depends: libreoffice-core,
${java-common-depends},
${java:Depends},
${java-runtime-depends},
${misc:Depends}
Enhances: libreoffice-writer
-Conflicts: libreoffice-common (<< 1:3.5~),
- libreoffice-core (<< 1:3.5~),
- ure (<< 1.5.1+OOo3.1.1-15)
Suggests: mediawiki
Description: LibreOffice extension for working with MediaWiki articles
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.mysql.in b/control.mysql.in
index 8307bd6..7d67aaf 100644
--- a/control.mysql.in
+++ b/control.mysql.in
@@ -3,9 +3,6 @@ Section: misc
Architecture: %OOO_BASE_ARCHS%
Depends: libreoffice-core, ${misc:Depends}, ${shlibs:Depends}
Suggests: default-mysql-server | virtual-mysql-server
-Conflicts: libreoffice-common (<< 1:3.5~),
- libreoffice-core (<< 1:3.5~),
- ure (<< 1.5.1+OOo3.1.1-15)
Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
Description: MariaDB/MySQL Connector extension for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.nlpsolver.in b/control.nlpsolver.in
index ac24967..98641f8 100644
--- a/control.nlpsolver.in
+++ b/control.nlpsolver.in
@@ -1,6 +1,6 @@
Package: libreoffice-nlpsolver
Architecture: all
-Depends: ${misc:Depends}, libreoffice-calc (>= 1:3.0~), libreoffice-core (>= 1:3.3~), ${java-common-depends}, ${java-runtime-depends}
+Depends: ${misc:Depends}, libreoffice-calc, libreoffice-core, ${java-common-depends}, ${java-runtime-depends}
Section: math
Priority: optional
Description: "Solver for Nonlinear Programming" extension for LibreOffice
diff --git a/control.ogltrans.in b/control.ogltrans.in
index a803db9..7d3f866 100644
--- a/control.ogltrans.in
+++ b/control.ogltrans.in
@@ -8,7 +8,6 @@ Depends: libreoffice-common,
${misc:Depends},
${shlibs:Depends}
Enhances: libreoffice-impress
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Conflicts: libreoffice-gtk3 (<< 1:5.2.4~rc2)
Description: LibreOffice Impress extension for slide transitions using OpenGL
LibreOffice is a full-featured office productivity suite that provide
diff --git a/control.postgresql.in b/control.postgresql.in
index 838e420..2421530 100644
--- a/control.postgresql.in
+++ b/control.postgresql.in
@@ -1,11 +1,10 @@
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: %OOO_BASE_ARCHS%
-Depends: libreoffice-core (>= 1:3.5.0~beta),
+Depends: libreoffice-core,
${misc:Depends},
${shlibs:Depends}
Suggests: postgresql (>= 8.4)
-Breaks: ure (<< 1.5.1+OOo3.1.1-15)
Enhances: libreoffice-base-drivers
Description: PostgreSQL SDBC driver for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.reportdesign.in b/control.reportdesign.in
index ab40abd..51c4e2e 100644
--- a/control.reportdesign.in
+++ b/control.reportdesign.in
@@ -7,9 +7,6 @@ Depends: libreoffice-core,
${java:Depends},
${misc:Depends},
${report-builder-jar-depends}
-Conflicts: libreoffice-common (<< 1:3.5~),
- libreoffice-core (<< 1:3.5~),
- ure (<< 1.5.1+OOo3.1.1-15)
Provides: libreoffice-reportdesigner
Enhances: libreoffice-base
Description: LibreOffice component for building database reports
diff --git a/control.sdk.in b/control.sdk.in
index d8fcaf4..e6c7815 100644
--- a/control.sdk.in
+++ b/control.sdk.in
@@ -8,7 +8,7 @@ Depends: libreoffice-core (= ${binary:Version}),
${shlibs:Depends}
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), libreoffice-dev-common (<< 1:5.3.2~)
+Replaces: libreoffice-dev-common (<< 1:5.3.2~)
Conflicts: libreoffice-dev-doc (<< 1:5.2.5-2~), libreoffice (<< 1:5.2.5-2~)
Breaks: libreoffice-dev-common (<< 1:5.3.2~)
Description: office productivity suite -- SDK -- architecture-dependent parts
diff --git a/control.ure.in b/control.ure.in
index 0e41fda..1d47bde 100644
--- a/control.ure.in
+++ b/control.ure.in
@@ -3,7 +3,7 @@ Section: libs
Architecture: %OOO_ARCHS%
Depends: ${misc:Depends}, ${shlibs:Depends}
Replaces: ure (<< 1:5.0.0~rc2-1)
-Breaks: ure (<< 4.1.2~), libreoffice-core (<< 1:4.3.0~)
+Breaks: libreoffice-core (<< 1:4.3.0~)
Description: LibreOffice UNO runtime environment -- public shared libraries
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
@@ -26,9 +26,8 @@ Section: libs
Architecture: %OOO_ARCHS%
Depends: uno-libs3 (= ${ure:Version}), ${misc:Depends}, ${shlibs:Depends}
Suggests: java5-runtime
-Conflicts: cli-uno-bridge (<< 1:3.0.0~dev300m22)
-Replaces: libreoffice-java-common (<< 1:3.0.0~dev300m12), libreoffice-common (<< 1:4.5.0), libreoffice-core (<< 1:5.3.0~beta1~)
-Breaks: openoffice.org-core (<< 1:3.3~), libreoffice-core (<< 1:5.3.0~beta1~), libreoffice-common (<< 1:4.5.0)
+Replaces: libreoffice-common (<< 1:4.5.0), libreoffice-core (<< 1:5.3.0~beta1~)
+Breaks: libreoffice-core (<< 1:5.3.0~beta1~), libreoffice-common (<< 1:4.5.0)
Description: LibreOffice UNO runtime environment
The Uno Runtime Environment (URE) is the well-known UNO component model
of LibreOffice, packaged up as an individual product.
diff --git a/rules b/rules
index 920e654..389c663 100755
--- a/rules
+++ b/rules
@@ -1820,7 +1820,6 @@ ifeq (pt-BR,$(findstring pt-BR,$(LANGPACKISOS)))
perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
perl -pi -e 's/libreoffice2-l10n-pt-br$$/libreoffice2-l10n-pt-br, broffice/' debian/control
endif
- perl -pi -e 's/Package: libreoffice-help-en-us/Package: libreoffice-help-en-us\nReplaces: libreoffice-common (<< 1:3.0.0~dev300m28)/' debian/control
ifeq "$(MYSQL_FLAVOUR)" "mysql"
perl -pi -e "s/(Build-Conflicts: .*)/\1,libmariadbclient-dev,/" debian/control
--
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