./packages/openofficeorg/3.1/experimental r1526: update depends/conflicts to match description.xml
------------------------------------------------------------
revno: 1526
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2009-05-05 02:35:14 +0200
message:
update depends/conflicts to match description.xml
modified:
changelog
control
control.presenter.in
control.reportdesign.in
=== modified file 'changelog'
--- a/changelog 2009-05-05 00:00:09 +0000
+++ b/changelog 2009-05-05 00:35:14 +0000
@@ -22,8 +22,10 @@
ftp.gwdg.de
* debian/control.in:
- also suggest libjtds-java
+ * debian/control.reportdesign.in, control.presenter.in:
+ - update depends/conflicts to match description.xml
- -- Rene Engelhard <rene@debian.org> Tue, 05 May 2009 00:54:48 +0200
+ -- Rene Engelhard <rene@debian.org> Tue, 05 May 2009 02:32:48 +0200
openoffice.org (1:3.1.0~rc2-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2009-05-04 22:57:46 +0000
+++ b/control 2009-05-05 00:35:14 +0000
@@ -3295,8 +3295,8 @@
Package: openoffice.org-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>= ${base-version}), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}, ${misc:Depends}
-Conflicts: openoffice.org-reportdesigner, openoffice.org-report-builder-bin (>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin (>= 1:3.1.0~), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends}, ${misc:Depends}
+Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
Enhances: openoffice.org-base
@@ -3349,7 +3349,7 @@
Conflicts: openoffice.org-presenter-screen
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
-Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.0.0~bea300~dev300m6), openoffice.org-impress (>= 1:3.0.0~bea300~dev300m6), ${misc:Depends}
+Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.1.0~), openoffice.org-impress (>= 1:3.1.0~), ${misc:Depends}
Enhances: openoffice.org-impress
Description: OpenOffice.org Impress extension for a separate presenter's console
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2009-04-27 13:34:49 +0000
+++ b/control.presenter.in 2009-05-05 00:35:14 +0000
@@ -5,7 +5,7 @@
Conflicts: openoffice.orgVER-presenter-screen
Provides: openoffice.orgVER-presenter-screen
Replaces: openoffice.orgVER-presenter-screen
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.0.0~bea300~dev300m6), openoffice.orgVER-impress (>= 1:3.0.0~bea300~dev300m6),
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.1.0~), openoffice.orgVER-impress (>= 1:3.1.0~),
${misc:Depends}
Enhances: openoffice.orgVER-impress
Description: OpenOffice.org Impress extension for a separate presenter's console
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2009-04-27 13:34:49 +0000
+++ b/control.reportdesign.in 2009-05-05 00:35:14 +0000
@@ -1,9 +1,9 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= ${base-version}), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends},
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin (>= 1:3.1.0~), openoffice.org-java-common (>= ${base-version}), ${java-runtime-depends},
${misc:Depends}
-Conflicts: openoffice.org-reportdesigner, openoffice.orgVER-report-builder-bin (>= ${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
+Conflicts: openoffice.org-reportdesigner, openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
Enhances: openoffice.orgVER-base
Reply to: