------------------------------------------------------------
revno: 1235
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2008-12-23 22:03:07 +0100
message:
actually set java-runtime-depends for -report-builder
modified:
control.reportdesign.in
rules
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2008-12-23 13:31:12 +0000
+++ b/control.reportdesign.in 2008-12-23 21:03:07 +0000
@@ -1,7 +1,7 @@
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), ${java-runtime-depends}
+Depends: ${report-builder-jar-depends}, openoffice.orgVER-report-builder-bin,
openoffice.org-java-common (>= 1:2.3.0~oog680m1), ${java-runtime-depends}
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
Provides: openoffice.org-reportdesigner
=== modified file 'rules'
--- a/rules 2008-12-22 17:06:33 +0000
+++ b/rules 2008-12-23 21:03:07 +0000
@@ -3065,6 +3065,7 @@
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
+ -V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v`echo $(BINARY_VERSION) | cut -d: -f1`:$(shell grep
"<version" $(SOURCE_TREE)/reportdesign/util/post.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
ifeq "$(PACKAGE_PCVSLIB)" "y"
