[SCM] LibreOffice packaging repository branch, debian-experimental-4.0, updated. libreoffice_3.6.4_rc1-1-158-g6fa9576
The following commit has been merged in the debian-experimental-4.0 branch:
commit 6fa9576017a54f17ea69c6e4028ef2e53b47f9c2
Author: Rene Engelhard <rene@debian.org>
Date: Tue Nov 27 21:06:19 2012 +0100
remove obsolete Conflicts: in -pdfimport (no extension anymore)
diff --git a/control b/control
index 44f20b7..e3dc4f7 100644
--- a/control
+++ b/control
@@ -17,7 +17,7 @@ Homepage: http://www.libreoffice.org
Package: libreoffice
Architecture: amd64 armel armhf hppa i386 ia64 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc kfreebsd-amd64 kfreebsd-i386
Section: metapackages
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, python-uno, ${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer, libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math, libreoffice-base, libreoffice-report-builder-bin [!hppa !kfreebsd-amd64 !kfreebsd-i386], ttf-dejavu, ttf-sil-gentium-basic, libreoffice-filter-mobiledev, python3-uno | python-uno, ${java-common-depends}, ${misc:Depends}
Recommends: fonts-liberation | ttf-mscorefonts-installer, libpaper-utils
Suggests: hunspell-dictionary, myspell-dictionary, libreoffice-help-${help-l10n-virtual-version}, libreoffice-l10n-${help-l10n-virtual-version}, unixodbc, cups-bsd, libsane, hyphen-hyphenation-patterns, mythes-thesaurus, libreoffice-grammarcheck, libxrender1, libgl1, libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-libreoffice, pstoedit, imagemagick | graphicsmagick-imagemagick-compat, ${gstreamer-plugins-suggests}, ${ooo-officebean-dep}
Description: office productivity suite (metapackage)
@@ -431,7 +431,7 @@ Description: office productivity suite -- legacy 1.0 XML DTD
Package: libreoffice-script-provider-python
Architecture: all
Section: python
-Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python-uno | python3-uno, ${misc:Depends}
+Depends: libreoffice-common, libreoffice-core (>= 1:3.5.0~alpha0~), libreoffice-common (>= 1:3.5.0~alpha0~), ${python:Depends}, python3-uno | python-uno, ${misc:Depends}
Replaces: python-uno (<< 1:3.5.2-2), python3-uno (<< 1:3.5.2-2)
Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
Description: Python script support provider for LibreOffice scripting framework
diff --git a/control.pdfimport.in b/control.pdfimport.in
index c8c5f09..c10a9cd 100644
--- a/control.pdfimport.in
+++ b/control.pdfimport.in
@@ -4,7 +4,7 @@ Priority: extra
Architecture: %OOO_ARCHS%
Depends: ${shlibs:Depends}, libreofficeVER-core,
${misc:Depends}
-Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
+Conflicts: libreoffice-core (<< 1:3.5~), libreoffice-common (<< 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.
--
LibreOffice packaging repository
Reply to: