./packages/openofficeorg/3.0/experimental r1242: merge. (skip -8s changes as either already there or not applicable)
------------------------------------------------------------
revno: 1242
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-08-27 05:32:58 +0200
message:
merge. (skip -8s changes as either already there or not applicable)
modified:
changelog
control
control.reportdesign.in
------------------------------------------------------------
revno: 1022.1.154
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2008-08-23 01:43:36 +0200
message:
Homepage: http://www.go-oo.org (damn, forgot to merge this back earlier)
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.155
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-08-26 23:32:44 +0200
message:
remove leftover debugging echos to /tmp/log.obr.8232 in senddoc; -8
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.156
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-08-27 05:29:19 +0200
message:
the -base dependency belongs to -report-builder-bin, not -report-builder
modified:
changelog
control
control.reportdesign.in
------------------------------------------------------------
revno: 1022.1.157
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-08-27 05:29:39 +0200
message:
typo
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-08-26 02:37:57 +0000
+++ b/changelog 2008-08-27 03:32:58 +0000
@@ -13,8 +13,11 @@
moc is an alternative and can point to the wrong Qts moc.
* debian/control.ure.in:
- Section: libdevel for uno-libs3-dbg to fix override disparity
+ * debian/control.reportdesign.in:
+ - -report-builder-bin contains librpt* which is linked against libraries
+ from -base so that one should depend on -base, not -report-builder
- -- Rene Engelhard <rene@debian.org> Tue, 26 Aug 2008 04:21:35 +0200
+ -- Rene Engelhard <rene@debian.org> Wed, 27 Aug 2008 05:32:22 +0200
openoffice.org (1:3.0.0~ooo300m3-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2008-08-25 00:52:01 +0000
+++ b/control 2008-08-27 03:32:58 +0000
@@ -3126,7 +3126,7 @@
Package: openoffice.org-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.org-base (>= 2.3.0~src680m225), openoffice.org-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Depends: ${report-builder-jar-depends}, openoffice.org-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
@@ -3145,7 +3145,7 @@
Package: openoffice.org-report-builder-bin
Section: misc
Architecture: i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.org-base (>= 2.3.0~src680m225)
Replaces: openoffice.org-report-builder
Description: OpenOffice.org Report Builder extension - support libraries
OpenOffice.org is a full-featured office productivity suite that provides
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-08-20 14:14:32 +0000
+++ b/control.reportdesign.in 2008-08-27 03:29:19 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Architecture: all
-Depends: ${report-builder-jar-depends}, openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin, openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
@@ -20,7 +20,7 @@
Package: openoffice.orgVER-report-builder-bin
Section: misc
Architecture: %OOO_JAVA_ARCHS%
-Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1)
+Depends: ${shlibs:Depends}, openoffice.org-core (>> 1:2.3.0~oog680m1), openoffice.orgVER-base (>= 2.3.0~src680m225)
Replaces: openoffice.orgVER-report-builder
Description: OpenOffice.org Report Builder extension - support libraries
OpenOffice.org is a full-featured office productivity suite that provides
Reply to: