------------------------------------------------------------
revno: 1004
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sun 2008-02-17 09:55:15 +0100
message:
+ - only recommend openoffice.org-writer2latex at -writer. Add it
+ to the "openoffice.org" metapackage as Depends (closes: #466170)
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-02-16 21:18:23 +0000
+++ b/changelog 2008-02-17 08:55:15 +0000
@@ -8,8 +8,11 @@
(closes: #466040)
- BUILD_IA64=y
- --disable-mono for arm(el)
+ * debian/control.in:
+ - only recommend openoffice.org-writer2latex at -writer. Add it
+ to the "openoffice.org" metapackage as Depends (closes: #466170)
- -- Rene Engelhard <[EMAIL PROTECTED]> Sat, 16 Feb 2008 22:05:03 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 17 Feb 2008 09:44:33 +0100
openoffice.org (1:2.4.0~rc1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-02-16 21:18:23 +0000
+++ b/control 2008-02-17 08:55:15 +0000
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-officebean,
${ooo-binfilter-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer,
openoffice.org-calc, openoffice.org-impress, openoffice.org-draw,
openoffice.org-math, openoffice.org-base, openoffice.org-officebean,
${ooo-binfilter-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev,
${java-common-depends}
Suggests: hunspell-dictionary, myspell-dictionary,
openoffice.org-help-${help-l10n-virtual-version},
openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd,
libsane, ttf-dejavu, openoffice.org-hyphenation, openoffice.org2-thesaurus,
libxrender1, libgl1, msttcorefonts, openoffice.org-gnome | openoffice.org-kde,
iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser,
${java-runtime-depends}, openclipart-openoffice.org, pstoedit,
graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils,
${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
@@ -142,8 +142,8 @@
Package: openoffice.org-writer
Architecture: i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}, ${writer-w2l-dep}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base-core
(= ${Source-Version}), ${shlibs:Depends}, ${writer-pyuno-dep}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<<
1:2.3.1)
Conflicts: openoffice.org-debian-files, openoffice.org2-writer (<<
${Source-Version}), openoffice.org-java-common (<= 1:2.3.1)
Provides: openoffice.org2-writer
=== modified file 'control.in'
--- a/control.in 2008-02-08 13:23:13 +0000
+++ b/control.in 2008-02-17 08:55:15 +0000
@@ -69,6 +69,7 @@
openoffice.orgVER-base,
openoffice.orgVER-officebean,
${ooo-binfilter-dep},
+ ${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
${java-common-depends}
Suggests: hunspell-dictionary,
@@ -315,9 +316,8 @@
Depends: openoffice.orgVER-core (= ${Source-Version}),
openoffice.orgVER-base-core (= ${Source-Version}),
${shlibs:Depends},
- ${writer-pyuno-dep},
- ${writer-w2l-dep}
-Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}
+ ${writer-pyuno-dep}
+Recommends: ${ooo-binfilter-dep}, ${java-runtime-depends},
${java-common-depends}, ${writer-w2l-dep}
Replaces: openoffice.org (<< 1.9),
openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}),
