./packages/openofficeorg/3.2/experimental r1778: fixup -presenter-console dependencies (see issue 108605)
------------------------------------------------------------
revno: 1778
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Tue 2010-01-26 15:06:37 +0100
message:
fixup -presenter-console dependencies (see issue 108605)
modified:
changelog
control
control.in
control.presenter.in
=== modified file 'changelog'
--- a/changelog 2010-01-26 09:40:37 +0000
+++ b/changelog 2010-01-26 14:06:37 +0000
@@ -18,9 +18,11 @@
message on DEBIAN_FRONTEND = noninteractive so that people in that case also
know what goes on
* debian/openoffice.org-common.tenplates,in, debian/rules, debian/po*: Move
- debconf template to shared/openofficeorg-running (see #566644(; Unfuzzy.
+ debconf template to shared/openofficeorg-running (see #566644); Unfuzzy.
+ * debian/control.presenter.in: depend on (our) OOo 3.2
+ * debian/control.in: Breaks: openoffice.org-presenter-console (<< 1.0.3~)
- -- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2010 08:56:37 +0100
+ -- Rene Engelhard <rene@debian.org> Tue, 26 Jan 2010 15:04:41 +0100
openoffice.org (1:3.2.0~rc3-1) experimental; urgency=low
=== modified file 'control'
--- a/control 2010-01-24 20:33:49 +0000
+++ b/control 2010-01-26 14:06:37 +0000
@@ -174,6 +174,7 @@
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files, openoffice.org2-impress (<< ${binary:Version}), openoffice.org-common (<< 2.0.3+2.0.4m179)
Provides: openoffice.org2-impress
Conflicts: openoffice.org-debian-files, openoffice.org2-impress (<< ${binary:Version})
+Breaks: openoffice.org-presenter-console (<< 1.0.3~)
Description: full-featured office productivity suite -- presentation
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3529,7 +3530,7 @@
Provides: openoffice.org-presenter-screen
Replaces: openoffice.org-presenter-screen
Pre-Depends: openoffice.org-common, debconf (>= 0.5) | debconf-2.0, procps
-Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.1.0~), openoffice.org-impress (>= 1:3.1.0~), ${misc:Depends}
+Depends: ${shlibs:Depends}, openoffice.org-core (>= 1:3.2.0~), openoffice.org-impress (>= 1:3.2.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.in'
--- a/control.in 2010-01-24 20:33:49 +0000
+++ b/control.in 2010-01-26 14:06:37 +0000
@@ -392,6 +392,7 @@
Provides: openoffice.org2-impress
Conflicts: openoffice.org-debian-files,
openoffice.org2-impress (<< ${binary:Version})
+Breaks: openoffice.org-presenter-console (<< 1.0.3~)
Description: full-featured office productivity suite -- presentation
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.presenter.in'
--- a/control.presenter.in 2009-10-04 00:40:54 +0000
+++ b/control.presenter.in 2010-01-26 14:06:37 +0000
@@ -5,7 +5,7 @@
Provides: openoffice.orgVER-presenter-screen
Replaces: openoffice.orgVER-presenter-screen
Pre-Depends: openoffice.orgVER-common, debconf (>= 0.5) | debconf-2.0, procps
-Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.1.0~), openoffice.orgVER-impress (>= 1:3.1.0~),
+Depends: ${shlibs:Depends}, openoffice.orgVER-core (>= 1:3.2.0~), openoffice.orgVER-impress (>= 1:3.2.0~),
${misc:Depends}
Enhances: openoffice.orgVER-impress
Description: OpenOffice.org Impress extension for a separate presenter's console
Reply to: