./packages/openofficeorg/3.1/unstable r1584: add needed Pre-Depends:
------------------------------------------------------------
revno: 1584
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-06-10 09:32:34 +0200
message:
add needed Pre-Depends:
modified:
changelog
control.in
control.mediawiki.in
control.minimizer.in
control.pdfimport.in
control.postgresql.in
control.presenter.in
control.reportdesign.in
=== modified file 'changelog'
--- a/changelog 2009-06-07 22:46:16 +0000
+++ b/changelog 2009-06-10 07:32:34 +0000
@@ -12,8 +12,14 @@
/u/l/openoffice/basis-link/share/config/javasettingsunopkginstall.xml
- find out the basis and specify /var/lib/openoffice/basisX.Y directly
(hopefully closes: #530694, #531116, #531750)
+ * debian/control.in:
+ - add Pre-Depends: openoffice.org-comon to the various extension
+ Add -java-common and ${java-runtime-depends} for the Java extensions.
+ (hopefully closes: #529521)
+ - add Pre-Depends: openoffice.org-core (>= 3.1.0-2) to -evolution
+ (hopefully closes: #529519)
- -- Rene Engelhard <rene@debian.org> Mon, 08 Jun 2009 00:30:11 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 09 Jun 2009 14:57:16 +0200
openoffice.org (1:3.1.0-4) unstable; urgency=low
=== modified file 'control.in'
--- a/control.in 2009-06-05 11:20:58 +0000
+++ b/control.in 2009-06-10 07:32:34 +0000
@@ -627,7 +627,8 @@
Package: openoffice.orgVER-evolution
Architecture: %OOO_ARCHS%
Section: gnome
-Depends: openoffice.orgVER-core (= ${binary:Version}),
+Pre-Depends: openoffice.orgVER-core (>= 1:3.1.0-2)
+Depends: openoffice.orgVER-core (= ${binary:Version})
openoffice.orgVER-base,
${shlibs:Depends},
libebook1.2-9,
=== modified file 'control.mediawiki.in'
--- a/control.mediawiki.in 2009-04-27 13:34:49 +0000
+++ b/control.mediawiki.in 2009-06-10 07:32:34 +0000
@@ -2,7 +2,8 @@
Section: misc
Priority: optional
Architecture: all
-Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:2.4.0-6), openoffice.orgVER-java-common (>> 1:2.4.0), ${java-runtime-depends}, liblucene2-java,
+Pre-Depends: openoffice.orgVER-java-common (>= 1:2.4.0), ${java-runtime-depends}
+Depends: ${mediawiki-jar-depends}, openoffice.orgVER-core (>= 1:2.4.0-6), liblucene2-java,
${misc:Depends}
Enhances: openoffice.orgVER-writer
Suggests: mediawiki
=== modified file 'control.minimizer.in'
--- a/control.minimizer.in 2009-04-27 13:34:49 +0000
+++ b/control.minimizer.in 2009-06-10 07:32:34 +0000
@@ -2,6 +2,7 @@
Section: misc
Priority: optional
Architecture: %OOO_ARCHS%
+Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 2.3), openoffice.orgVER-impress,
${misc:Depends}
Enhances: openoffice.orgVER-impress
=== modified file 'control.pdfimport.in'
--- a/control.pdfimport.in 2009-04-27 13:34:49 +0000
+++ b/control.pdfimport.in 2009-06-10 07:32:34 +0000
@@ -2,6 +2,7 @@
Section: misc
Priority: extra
Architecture: %OOO_ARCHS%
+Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~bea300~dev300m6),
${misc:Depends}
Description: OpenOffice.org extension for importing PDF documents
=== modified file 'control.postgresql.in'
--- a/control.postgresql.in 2009-04-27 13:34:49 +0000
+++ b/control.postgresql.in 2009-06-10 07:32:34 +0000
@@ -2,6 +2,7 @@
Section: misc
Priority: optional
Architecture: %OOO_ARCHS%
+Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>> 1:2.3.0~oog680m1),
${misc:Depends}
Conflicts: openoffice.orgVER-java-common (<< 2.3.0~src680m212), openoffice.orgVER-gcj (<< 2.3.0~src680m212)
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2009-05-05 00:35:14 +0000
+++ b/control.presenter.in 2009-06-10 07:32:34 +0000
@@ -5,6 +5,7 @@
Conflicts: openoffice.orgVER-presenter-screen
Provides: openoffice.orgVER-presenter-screen
Replaces: openoffice.orgVER-presenter-screen
+Pre-Depends: openoffice.orgVER-common
Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.1.0~), openoffice.orgVER-impress (>= 1:3.1.0~),
${misc:Depends}
Enhances: openoffice.orgVER-impress
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2009-05-05 00:35:14 +0000
+++ b/control.reportdesign.in 2009-06-10 07:32:34 +0000
@@ -1,7 +1,8 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= 1:3.1.0~), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends},
+Pre-Depends: openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= 1:3.1.0~),
${misc:Depends}
Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
Reply to: