./packages/openofficeorg/3.1/experimental r1527: merge
------------------------------------------------------------
revno: 1527
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Wed 2009-05-06 00:08:03 +0200
message:
merge
modified:
rules
------------------------------------------------------------
revno: 1332.1.140
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2009-05-06 00:05:57 +0200
message:
more lenny backport fixes (wrt kab)
modified:
rules
=== modified file 'rules'
--- a/rules 2009-05-05 00:00:09 +0000
+++ b/rules 2009-05-05 22:08:03 +0000
@@ -283,6 +283,9 @@
SUITESPARSE_MIN_VERSION= (>= 3.1.0)
USE_SYSTEM_JFREEREPORT=n
BUILD_KDE=y
+ifeq "$(BUILD_KDE)" "y"
+ ENABLE_KDEAB=y
+endif
CURL_SECTYPE=openssl
endif
@@ -1956,6 +1959,8 @@
done
mv $(PKGDIR)-core/$(OOBRANDDIR)/program/kdefilepicker \
$(PKGDIR)-kde/$(OOBRANDDIR)/program
+endif
+ifeq "$(ENABLE_KDEAB)" "y"
rm -rf $(PKGDIR)-kab
mkdir -p -m755 $(PKGDIR)-kab/$(OODIR)/program
for f in libkab*so; do \
Reply to: