./packages/openofficeorg/3.0/experimental r1270: merge
------------------------------------------------------------
revno: 1270
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-10-03 00:13:55 +0200
message:
merge
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.169
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-10-02 22:40:23 +0200
message:
make openoffice.org depend on -report-builder-bin
modified:
changelog
control
control.in
=== modified file 'changelog'
--- a/changelog 2008-10-02 19:11:02 +0000
+++ b/changelog 2008-10-02 22:13:55 +0000
@@ -2,12 +2,17 @@
* OpenOffice.org 3.0 release branch milestone 9 (OOO300_m9)
* ooo-build:
- - update (r14190)
+ - update (r14191)
- unxsplash-rework.diff: don't run the external oosplash with -nologo
(no splash anyway) and with the (new) -no-oosplash
* debian/*.mime: run with -no-oosplash (closes: #396276)
+ * debian/control.in:
+ - make the openoffice.org metapackage depend on
+ openoffice.org-report-builder-bin as the libs contained there are
+ in the standard OOo install and the SRB needs it (even more when
+ installed not from the deb)
- -- Rene Engelhard <rene@debian.org> Thu, 02 Oct 2008 21:08:18 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 02 Oct 2008 21:54:16 +0200
openoffice.org (1:3.0.0~rc3-1) experimental; urgency=high
=== modified file 'control'
--- a/control 2008-09-28 10:54:15 +0000
+++ b/control 2008-10-02 22:13:55 +0000
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ttf-dejavu, ttf-liberation, ${ooo-officebean-dep}, ${writer-w2l-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-report-builder-bin, ttf-dejavu, ttf-liberation, ${ooo-officebean-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
Recommends: ${ooo-binfilter-dep}
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, 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})
=== modified file 'control.in'
--- a/control.in 2008-09-28 10:21:46 +0000
+++ b/control.in 2008-10-02 22:13:55 +0000
@@ -66,6 +66,7 @@
openoffice.orgVER-draw,
openoffice.orgVER-math,
openoffice.orgVER-base,
+ openoffice.orgVER-report-builder-bin,
ttf-dejavu,
ttf-liberation,
${ooo-officebean-dep},
Reply to: