------------------------------------------------------------
revno: 1080
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Tue 2008-05-13 15:33:06 +0200
message:
fix -pdfimport and -wiki-publishers Depends:
modified:
rules
=== modified file 'rules'
--- a/rules 2008-05-13 12:28:22 +0000
+++ b/rules 2008-05-13 13:33:06 +0000
@@ -2867,7 +2867,7 @@
LD_LIBRARY_PATH="/usr/lib/libfakeroot:$(PKGDIR)-core/$(OODIR)/program"
\
dpkg-shlibdeps -O \
$(SOURCE_TREE)/xpdf/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/bin/xpdfimport \
- $(SOURCE_TREE)/filter/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/pdfimport.uno.so
+ $(SOURCE_TREE)/filter/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/pdfimport.uno.so \
> debian/openoffice.org$(VER)-pdfimport.substvars
endif
@@ -2923,6 +2923,7 @@
ifeq "$(ENABLE_MEDIAWIKI)" "y"
dh_gencontrol -popenoffice.org$(VER)-wiki-publisher -- \
-V'mediawiki-jar-depends=$(MEDIAWIKI_JAR_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
ifeq "$(ENABLE_PDFIMPORT)" "y"
