[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.1-1-79-gd756c58
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 52b62570b94efc5842bf357f57e6d810bb7f1761
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Tue Apr 3 10:49:47 2012 +0200
make extensions conflicts against libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
- cherry-picked from master
Conflicts:
changelog
control.in
diff --git a/changelog b/changelog
index b394d23..52642f8 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,12 @@
+libreoffice (1:3.5.1-1ubuntu5) precise; urgency=low
+
+ * cherry-picked a163c978 from master:
+ - make extensions conflicts against libreoffice-core (<< 1:3.5~),
+ libreoffice-common (<< 1:3.5~) to (hopefully) help unopkg be working
+ when called on upgrades 3.4 -> 3.5 (closes: #666523)
+
+ -- Bjoern Michaelsen <bjoern.michaelsen@canonical.com> Tue, 03 Apr 2012 10:47:08 +0200
+
libreoffice (1:3.5.1-1ubuntu4) precise; urgency=low
* version bump for bug 930217
diff --git a/control b/control
index 1fd783d..8afc564 100644
--- a/control
+++ b/control
@@ -361,7 +361,7 @@ Section: python
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Enhances: libreoffice
Depends: libreoffice-core (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: python3-uno
+Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
@@ -3151,7 +3151,7 @@ Pre-Depends: ${java-runtime-depends}
Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends}
Enhances: libreoffice-writer
Recommends: ${lucene-depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Suggests: mediawiki
Description: LibreOffice extension for working with MediaWiki articles
LibreOffice is a full-featured office productivity suite that provides
@@ -3166,7 +3166,7 @@ Section: misc
Architecture: all
Pre-Depends: ${java-runtime-depends}
Depends: ${report-builder-jar-depends}, libreoffice-report-builder-bin (>= ${base-version}), libreoffice-core, libreoffice-java-common, ${java:Depends}, ${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Provides: libreoffice-reportdesigner
Enhances: libreoffice-base
Description: LibreOffice extension for building database reports
@@ -3196,7 +3196,7 @@ Section: misc
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
Enhances: libreoffice-impress
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: LibreOffice extension for size-efficient presentations
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3213,7 +3213,7 @@ Homepage: http://extensions.services.openoffice.org/project/PresentationMinimize
Package: libreoffice-presenter-console
Section: misc
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Depends: ${shlibs:Depends}, libreoffice-core, libreoffice-impress, ${misc:Depends}
Enhances: libreoffice-impress
Description: LibreOffice Impress extension for a separate presenter's console
@@ -3239,7 +3239,7 @@ Section: misc
Priority: extra
Architecture: alpha amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: LibreOffice extension for importing PDF documents
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3355,7 +3355,7 @@ Section: misc
Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 sparc kfreebsd-amd64 kfreebsd-i386
Depends: ${shlibs:Depends}, libreoffice-core, ${misc:Depends}
Suggests: mysql-server (>= 5.1)
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
Description: MySQL Connector extension for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.in b/control.in
index 4af840a..bde92de 100644
--- a/control.in
+++ b/control.in
@@ -519,7 +519,7 @@ Depends: libreoffice-core (= ${binary:Version}),
${python:Depends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: python3-uno, libreoffice-common (<< 1:3.5.0)
+Conflicts: python3-uno, libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python-UNO bridge
The Python-UNO bridge allows use of the standard LibreOffice API
with the Python scripting language. It additionally allows
diff --git a/control.mediawiki.in b/control.mediawiki.in
index b8525f1..6dd9962 100644
--- a/control.mediawiki.in
+++ b/control.mediawiki.in
@@ -7,7 +7,7 @@ Depends: ${mediawiki-jar-depends}, libreofficeVER-core (>= 3.4~), libreofficeVER
${misc:Depends}
Enhances: libreofficeVER-writer
Recommends: ${lucene-depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Suggests: mediawiki
Description: LibreOffice extension for working with MediaWiki articles
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.minimizer.in b/control.minimizer.in
index 9ae32c0..5a8919a 100644
--- a/control.minimizer.in
+++ b/control.minimizer.in
@@ -4,7 +4,7 @@ Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
Depends: ${shlibs:Depends}, libreofficeVER-core, libreofficeVER-impress,
${misc:Depends}
Enhances: libreofficeVER-impress
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: LibreOffice extension for size-efficient presentations
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.mysql.in b/control.mysql.in
index 7868af2..945c096 100644
--- a/control.mysql.in
+++ b/control.mysql.in
@@ -4,7 +4,7 @@ Architecture: %OOO_BASE_ARCHS%
Depends: ${shlibs:Depends}, libreofficeVER-core,
${misc:Depends}
Suggests: mysql-server (>= 5.1)
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Homepage: http://extensions.services.openoffice.org/en/project/mysql_connector
Description: MySQL Connector extension for LibreOffice
LibreOffice is a full-featured office productivity suite that provides
diff --git a/control.pdfimport.in b/control.pdfimport.in
index f17c350..32f138d 100644
--- a/control.pdfimport.in
+++ b/control.pdfimport.in
@@ -4,7 +4,7 @@ Priority: extra
Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
Depends: ${shlibs:Depends}, libreofficeVER-core,
${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: LibreOffice extension for importing PDF documents
LibreOffice is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
diff --git a/control.presenter.in b/control.presenter.in
index dd64db1..6fe8360 100644
--- a/control.presenter.in
+++ b/control.presenter.in
@@ -1,7 +1,7 @@
Package: libreofficeVER-presenter-console
Section: misc
Architecture: %OOO_ARCH_DEP_EXTENSIONS_ARCHS%
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Depends: ${shlibs:Depends}, libreofficeVER-core, libreofficeVER-impress,
${misc:Depends}
Enhances: libreofficeVER-impress
diff --git a/control.reportdesign.in b/control.reportdesign.in
index 9902d07..69d969c 100644
--- a/control.reportdesign.in
+++ b/control.reportdesign.in
@@ -5,7 +5,7 @@ Pre-Depends: ${java-runtime-depends}
Depends: ${report-builder-jar-depends}, libreofficeVER-report-builder-bin (>= ${base-version}), libreoffice-core, libreoffice-java-common,
${java:Depends},
${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
+Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Provides: libreoffice-reportdesigner
Enhances: libreofficeVER-base
Description: LibreOffice extension for building database reports
--
LibreOffice packaging repository
Reply to: