[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.5.2_rc2-1-5-ga163c97



The following commit has been merged in the master branch:
commit a163c978600f306fc6874ef8301d6f9f8f3d2bba
Author: Rene Engelhard <rene@debian.org>
Date:   Mon Apr 2 22:03:07 2012 +0200

    make extensions conflicts against libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)

diff --git a/changelog b/changelog
index d2ef647..99f12b5 100644
--- a/changelog
+++ b/changelog
@@ -9,9 +9,12 @@ libreoffice (1:3.5.2~rc2-2) UNRELEASED; urgency=low
   * debian/uno-libs3.lintian-overrides:
     - override shlibs-declares-dependency-on-other-package and
       symbols-declares-dependency-on-other-package
+  * debian/control*.in:
+    - 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) 
 
-
- -- Rene Engelhard <rene@debian.org>  Mon, 02 Apr 2012 00:11:02 +0200
+ -- Rene Engelhard <rene@debian.org>  Mon, 02 Apr 2012 20:07:00 +0200
 
 libreoffice (1:3.5.2~rc2-1) unstable; urgency=low
 
diff --git a/control b/control
index 97a1509..7b4df83 100644
--- a/control
+++ b/control
@@ -360,7 +360,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 
@@ -3150,7 +3150,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
@@ -3165,7 +3165,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
@@ -3195,7 +3195,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.
@@ -3212,7 +3212,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
@@ -3238,7 +3238,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.
@@ -3354,7 +3354,7 @@ Section: misc
 Architecture: alpha amd64 hppa i386 ia64 mips mipsel s390 s390x 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 32224c6..15eb79a 100644
--- a/control.in
+++ b/control.in
@@ -503,7 +503,7 @@ Depends: libreofficeVER-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 
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: