------------------------------------------------------------
revno: 1086
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Tue 2008-04-29 10:04:29 +0200
message:
Only depend on openoffice.org-writer2latex when Java is enabled
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-04-28 17:38:09 +0000
+++ b/changelog 2008-04-29 08:04:29 +0000
@@ -10,7 +10,8 @@
right versioned build-dep for !etch
- correct control.mono.in inclusion regardless of host architecture
- explicitely set ENABLE_REPORTDESIGN=n in arch conditonals for
- disabling java (-> arm(el))
+ disabling java (-> arm(el)). Only depend on openoffice.org-writer2latex
+ when Java is enabled
* debian/scripts/vars.ppc64: actually add
-- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Apr 2008 00:59:54 +0200
=== modified file 'rules'
--- a/rules 2008-04-28 17:38:09 +0000
+++ b/rules 2008-04-29 08:04:29 +0000
@@ -475,10 +475,12 @@
CONFIGURE_FLAGS += --disable-qadevooo
endif
-ifeq "$(PACKAGE_WRITER2LATEX)" "n"
+ifeq "$(ENABLE_JAVA)" "y"
+ ifeq "$(PACKAGE_WRITER2LATEX)" "n"
CONFIGURE_FLAGS += --without-writer2latex
- ifeq "$(USE_EXTERNAL_WRITER2LATEX)" "y"
+ ifeq "$(USE_EXTERNAL_WRITER2LATEX)" "y"
WRITER_W2L_DEP = openoffice.org-writer2latex
+ endif
endif
endif
