------------------------------------------------------------
revno: 1736
committer: Rene Engelhard <r...@debian.org>
branch nick: unstable
timestamp: Fri 2009-10-30 19:20:33 +0100
message:
actually add lucene-depends to -wiki-publishers dh_gencontrol call
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-10-30 08:16:07 +0000
+++ b/changelog 2009-10-30 18:20:33 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:3.1.1-6) UNRELEASED; urgency=low
+openoffice.org (1:3.1.1-6) unstable; urgency=low
[ Rene Engelhard ]
* ooo-build:
@@ -23,6 +23,8 @@
- add conflict against (<< <minor version of lucene OOo was built with)
for -help-en-us as newer versions necessarily don't create indexes a old
version can read...
+ - actually add lucene-depends to -wiki-publishers dh_gencontrol call
+ (closes: #553370)
* debian/control.in:
- conflict against libhsqldb-java (>= 1.8.1~)
@@ -30,7 +32,7 @@
* debian/po:
- update ru.po, tr.po
- -- Rene Engelhard <r...@debian.org> Thu, 29 Oct 2009 20:47:58 +0100
+ -- Rene Engelhard <r...@debian.org> Fri, 30 Oct 2009 12:48:32 +0100
openoffice.org (1:3.1.1-5) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2009-10-24 20:03:17 +0000
+++ b/rules 2009-10-30 18:20:33 +0000
@@ -3455,6 +3455,7 @@
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -popenoffice.org$(VER)-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_DEPENDS)' \
+ -V'lucene-depends=$(LUCENE_DEPENDS)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-v$(shell grep "<version"
$(SOURCE_TREE)/swext/mediawiki/src/description.xml | perl -pi -e 's,<version
value=\"(.*)\"/>,\1,; s/^\s+//')+OOo`echo $(BINARY_VERSION) | cut -d: -f2`
endif
