------------------------------------------------------------
revno: 2199
committer: Rene Engelhard <[email protected]>
branch nick: debian
timestamp: Wed 2010-11-17 03:21:12 +0100
message:
stop libreoffice depending on the officebean
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2010-11-16 21:58:34 +0000
+++ b/changelog 2010-11-17 02:21:12 +0000
@@ -9,6 +9,9 @@
Will be the only option from next version on anyway...
* debian/control.ure.in: Breaks: openoffice.org-core (<< 1:3.3~) due to
upstream
(private library) symbol breakage (closes: #603549)
+ * debian/control.in: as LibO is independent from Sun and doesn't need to obey
+ what Sun thinks is "integral part of the office", stop libreoffice
depending on
+ the officebean (closes: #459332)
-- Rene Engelhard <[email protected]> Tue, 16 Nov 2010 22:58:06 +0100
=== modified file 'control'
--- a/control 2010-11-16 21:58:34 +0000
+++ b/control 2010-11-17 02:21:12 +0000
@@ -14,9 +14,9 @@
Package: libreoffice
Architecture: i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc
-Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel], libreoffice-report-builder-bin [!armel], ttf-dejavu,
ttf-sil-gentium-basic, ${ooo-officebean-dep}, libreoffice-filter-mobiledev,
${lucene-depends}, ${java-common-depends}, ${misc:Depends}
+Depends: libreoffice-core (= ${binary:Version}), libreoffice-writer,
libreoffice-calc, libreoffice-impress, libreoffice-draw, libreoffice-math,
libreoffice-base [!armel], libreoffice-report-builder-bin [!armel], ttf-dejavu,
ttf-sil-gentium-basic, libreoffice-filter-mobiledev, ${lucene-depends},
${java-common-depends}, ${misc:Depends}
Recommends: ttf-liberation | ttf-mscorefonts-installer
-Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, libreoffice-hyphenation, libreoffice2-thesaurus, libxrender1, libgl1,
libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, libpaper-utils,
${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep},
+Suggests: hunspell-dictionary, myspell-dictionary,
libreoffice-help-${help-l10n-virtual-version},
libreoffice-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd,
libsane, libreoffice-hyphenation, libreoffice2-thesaurus, libxrender1, libgl1,
libreoffice-gnome | libreoffice-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends},
openclipart-libreoffice, pstoedit, imagemagick |
graphicsmagick-imagemagick-compat, libpaper-utils,
${gstreamer-plugins-suggests}, ${libldap-suggests}, ${ooo-binfilter-dep},
${ooo-officebean-dep}
Conflicts: libreoffice2 (<< ${binary:Version}), libreoffice-java-common (<<
1:3.0.0)
Replaces: libreoffice2 (<< ${binary:Version}), libreoffice-debian-files
Provides: libreoffice2
=== modified file 'control.in'
--- a/control.in 2010-11-12 07:54:04 +0000
+++ b/control.in 2010-11-17 02:21:12 +0000
@@ -67,7 +67,6 @@
libreofficeVER-report-builder-bin [%OOO_NO_BASE_ARCHS%],
ttf-dejavu,
ttf-sil-gentium-basic,
- ${ooo-officebean-dep},
libreofficeVER-filter-mobiledev,
${lucene-depends},
${java-common-depends},
@@ -95,6 +94,7 @@
${gstreamer-plugins-suggests},
${libldap-suggests},
${ooo-binfilter-dep},
+ ${ooo-officebean-dep}
Conflicts: libreoffice2 (<< ${binary:Version}), libreofficeVER-java-common (<<
1:3.0.0)
Replaces: libreoffice2 (<< ${binary:Version}), libreoffice-debian-files
Provides: libreoffice2
