------------------------------------------------------------
revno: 1247
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Thu 2008-09-04 16:26:25 +0200
message:
start with m5 stuff and make -report-builder stricly want 3.0... :-(
modified:
changelog
control.reportdesign.in
=== modified file 'changelog'
--- a/changelog 2008-09-04 05:56:17 +0000
+++ b/changelog 2008-09-04 14:26:25 +0000
@@ -1,8 +1,9 @@
-openoffice.org (1:3.0.0~ooo300m4-0.1pre) experimental; urgency=low
+openoffice.org (1:3.0.0~ooo300m5-0.1pre) experimental; urgency=low
- * OpenOffice.org 3.0 release branch milestone 4 (OOO300_m4)
+ * OpenOffice.org 3.0 release branch milestone 5 (OOO300_m5)
- catches exception on (malformed) ODGs referencing not existing
images (closes: #494644)
+ - makes -report-builder depend on 3.0 *exactly*.
* ooo-build:
- update (r13751)
* debian/rules:
@@ -12,6 +13,10 @@
- various conditional updates for new extension configure defaults
- temporarily disable report-builder as reportbuilder module is not
available in the tarballs yet...
+ * debian/control.reportdesign.in:
+ - depend on OOo base and java-common with >= ${base-version} and conflict
+ against them with >= ${base-version}.1. According to the bug this
+ closes: #497204
-- Rene Engelhard <[EMAIL PROTECTED]> Tue, 02 Sep 2008 01:25:48 +0200
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-08-27 03:29:19 +0000
+++ b/control.reportdesign.in 2008-09-04 14:26:25 +0000
@@ -1,8 +1,8 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin,
openoffice.org-java-common (>= 1:2.3.0~oog680m1)
-Conflicts: openoffice.org-reportdesigner
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin
(>= ${base-version}), openoffice.org-java-common (>= ${base-version})
+Conflicts: openoffice.org-reportdesigner, openoffice.orgVER-report-builder (>=
${base-version}.1), openoffice.org-java-common (>= ${base-version}.1)
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
Enhances: openoffice.orgVER-base
