------------------------------------------------------------
revno: 1053
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-04-07 11:05:13 +0200
message:
%OOO_ARCHS% -> %OOO_JAVA_ARCHS%
update ooo-build
modified:
changelog
control.reportdesign.in
=== modified file 'changelog'
--- a/changelog 2008-04-06 22:34:39 +0000
+++ b/changelog 2008-04-07 09:05:13 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.0-3.4pre) unstable; urgency=low
* ooo-build:
- - update (r12107)
+ - update (r12115)
+ disables cjk-character-units-*.diff as they cause some problems
(closes: #474028)
+ emf+-canvas-vcl-non-closed-polygon.diff: fixed invalid access
@@ -18,8 +18,10 @@
+ Update and sort mime-types.
- debian/rules:
+ Use openjdk-6-jre instead of icedtea-java7-jre.
+ - debian/control.reportdesign.in:
+ + change %OOO_ARCHS% to %OOO_JAVA_ARCHS%
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 06 Apr 2008 23:51:16 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 07 Apr 2008 08:12:57 +0200
openoffice.org (1:2.4.0-3) unstable; urgency=low
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2007-12-12 20:57:07 +0000
+++ b/control.reportdesign.in 2008-04-07 09:05:13 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Priority: optional
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_JAVA_ARCHS%
Depends: ${shlibs:Depends}, ${report-builder-jar-depends},
openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-core (>>
1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
