------------------------------------------------------------
revno: 1118
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-06-13 21:22:14 +0200
message:
we only need to build-depend on kdepimlibs when we enable kab
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-06-13 15:16:10 +0000
+++ b/changelog 2008-06-13 19:22:14 +0000
@@ -7,7 +7,7 @@
to a read-only location (closes: #238906)
- fixes printing of handouts in grayscale mode (closes: #416309)
* ooo-build:
- - update (r12868)
+ - update (r12883)
* debian/template.desktop.in: move to ..
* debian/startcenter.desktop.in: .. this and run ooffice now, which
will bring us to the new StartCenter. Reuse writers icon.
@@ -62,7 +62,7 @@
- s/cupsys/cups/
- remove xutils build-dep, nas was using xmkmf and it's long gone here
- -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 13 Jun 2008 15:18:07 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 13 Jun 2008 20:37:17 +0200
openoffice.org (1:2.4.1-2) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-06-13 13:19:20 +0000
+++ b/rules 2008-06-13 19:22:14 +0000
@@ -125,6 +125,9 @@
USE_SYSTEM_CAIRO=y
CAIRO_FONTS_PATCH=y
BUILD_KDE=n
+ifeq "$(BUILD_KDE)" "y"
+ ENABLE_KDEAB=y
+endif
KDE_VER=3
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
@@ -777,13 +780,17 @@
CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango
$(HUMAN)"
else
BUILD_DEPS += , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dev
$(KDELIBS_MINVER)
- ifneq "$(KDE_VER)" "3"
- BUILD_DEPS += , kdepimlibs$(shell echo "$(KDE_VER)+1" | bc)-dev
- endif
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
ifeq "$(KDE_VER)" "4"
CONFIGURE_FLAGS += --with-additional-sections="KDE4"
endif
+ ifeq "$(ENABLE_KDEAB)" "y"
+ ifeq "$(KDE_VER)" "4"
+ BUILD_DEPS += , kdepimlibs$(shell echo "$(KDE_VER)+1" | bc)-dev
+ endif
+ else
+ CONFIGURE_FLAGS+= --disable-kdeab
+ endif
endif
ifeq "$(BUILD_GTK)" "n"
