./packages/openofficeorg/3.1/unstable r1595: - add conditionals for KDE4, enable -kde for KDE4 again (closes: #528487)
------------------------------------------------------------
revno: 1595
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Sun 2009-06-14 13:58:01 +0200
message:
- add conditionals for KDE4, enable -kde for KDE4 again (closes: #528487)
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2009-06-14 11:56:57 +0000
+++ b/changelog 2009-06-14 11:58:01 +0000
@@ -7,6 +7,7 @@
* debian/rules:
- WITH_SPLIT=n, enable milestone detection again, use ooo-build tarballs
+ - add conditionals for KDE4, enable -kde for KDE4 again (closes: #528487)
-- Rene Engelhard <rene@debian.org> Sat, 13 Jun 2009 23:20:33 +0200
=== modified file 'control'
--- a/control 2009-06-13 22:01:02 +0000
+++ b/control 2009-06-14 11:58:01 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <halls@debian.org>, Rene Engelhard <rene@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-
jdk , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common (>= 1:4.4.0) [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openof
fice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 arm armel amd64
ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old, libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config, libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2) [powerpc], zlib1g-dev, libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev, libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl, libpng12-dev, libjpeg62-dev, libxml2-dev, libldap2-dev, libexpat1-dev, fastjar, xsltproc, imagemagick, netpbm, fdupes, xml-core, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev (>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, bc , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ia64 ppc64] , libpoppler-dev (>= 0.8.0) , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central (>= 0.5) , python-dev , debhelper (>= 6.0.7~) , openjdk-6-
jdk , gcj-jdk [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-common (>= 1:4.4.0) [i386 sparc mips mipsel s390 armel amd64 ia64] , ant (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], ant-optional (>= 1.7.0) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , mingw32 [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-codec-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-httpclient-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-lang-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libbase-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libsac-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libxml-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libflute-java-openof
fice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libpentaho-reporting-flow-engine-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], liblayout-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libloader-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libformula-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], librepository-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libfonts-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64], libserializer-java-openoffice.org [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libcommons-logging-java [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , iceape-dev (>= 1.1.9-5) [i386 powerpc sparc mips mipsel s390 arm armel amd64 ia64 ppc64], libnss3-dev [i386 powerpc sparc mips mipsel s390 arm armel amd64
ia64 ppc64] , dmake (>= 1:4.11) , mono-devel (>= 2.0.1) [i386 sparc amd64 ia64], libmono-dev (>= 2.0.1) [i386 sparc amd64 ia64], mono-utils (>= 2.0.1) [i386 sparc amd64 ia64], cli-common-dev (>= 0.5.7) [i386 sparc amd64 ia64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , libhsqldb-java (>> 1.8.0.10) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , bsh (>= 2.0b4) [i386 powerpc sparc mips mipsel s390 armel amd64 ia64 ppc64] , liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) , libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomev
fs2-dev
Build-Conflicts: libcairo2 (= 1.4.8-1), libxul-dev (= 1.8.0.13~pre070720-0etch1), gjdoc (= 0.7.8-2), libc6-dev (= 2.6.1-3) [i386 amd64], libc6-dev (= 2.6.1-4) [i386 amd64], nvidia-glx-dev, nvidia-glx-legacy-dev, libmono-dev (= 1.2.6+dfsg-1), libmono-dev (= 1.2.6+dfsg-2), libmono-dev (= 1.2.6+dfsg-3), libmono-dev (= 1.2.6+dfsg-4), libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], base-files (= 5)
Standards-Version: 3.8.1
XS-Python-Version: current
@@ -15,7 +15,7 @@
Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-report-builder-bin, ttf-dejavu, ${ooo-officebean-dep}, openoffice.org-filter-mobiledev, ${lucene-depends}, ${java-common-depends}, ${misc:Depends}
Recommends: ${ooo-binfilter-dep}, ttf-liberation | msttcorefonts
-Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, openoffice.org-gnome, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
+Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cups-bsd, libsane, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, pstoedit, graphicsmagick-imagemagick-compat | imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${binary:Version}), openoffice.org-java-common (<< 1:3.0.0)
Replaces: openoffice.org2 (<< ${binary:Version}), openoffice.org-debian-files
Provides: openoffice.org2
@@ -44,6 +44,7 @@
* openoffice.org-gtk: Gtk UI Plugin, GNOME File Picker support,
QuickStarter for GNOMEs notification are
* openoffice.org-gnome: GNOME VFS, GConf backend
+ * openoffice.org-kde: KDE UI Plugin and KDE File Picker support
* menu: Will add openoffice.org menu entries for every Debian window manager.
* unixodbc: ODBC database support
* cups-bsd: Allows OpenOffice.org to detect your CUPS printer queues
@@ -3452,6 +3453,38 @@
.
It also contains the gsicheck utility.
+Package: openoffice.org-kde
+Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-style-crystal, ${shlibs:Depends}, ${misc:Depends}
+Suggests: konqueror, kmail, openoffice.org-kab
+Section: kde
+Enhances: openoffice.org
+Conflicts: openoffice.org2-kde (<< ${binary:Version})
+Provides: openoffice.org2-kde
+Replaces: openoffice.org2-kde (<< ${binary:Version})
+Description: full-featured office productivity suite -- KDE integration
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the KDE plugin for drawing OOo's widgets with
+ KDE/Qt and a KDEish File Picker when running under KDE.
+ You can extend the functionality of this by installing these packages:
+ .
+ * konqueror / kmail
+ * openoffice.org-kab: KDE Addressbook support
+
+Package: openoffice.org-kab
+Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64
+Depends: openoffice.org-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Recommends: kaddressbook
+Replaces: openoffice.org-kde (<= 1:3.0.0~beta2-1)
+Description: full-featured office productivity suite -- KDE adressbook support
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package allows OpenOffice.org to access the KDE Addressbook.
+ You need to install kaddressbook separately.
+
Package: openoffice.org-sdbc-postgresql
Section: misc
Priority: optional
=== modified file 'rules'
--- a/rules 2009-06-14 11:56:57 +0000
+++ b/rules 2009-06-14 11:58:01 +0000
@@ -144,11 +144,18 @@
BUILD_CAIROCANVAS=y
USE_SYSTEM_CAIRO=y
CAIRO_FONTS_PATCH=y
-BUILD_KDE=n
+BUILD_KDE=y
+KDE_VER=4
ifeq "$(BUILD_KDE)" "y"
- ENABLE_KDEAB=y
-endif
-KDE_VER=3
+ ifeq "$(KDE_VER)" "3"
+ ENABLE_KDEAB=y
+ else
+ ENABLE_KDEAB=n
+ endif
+endif
+ifeq "$(KDE_VER)" "3"
+ KDELIBS_MINVER= (>= 4:3.4.3-2)
+endif
BUILD_DBG_PACKAGE=y
USE_SYSTEM_BSH=y
USE_SYSTEM_HSQLDB=y
@@ -159,7 +166,6 @@
# for UOF, but still for e.g. M$.
USE_SYSTEM_SAXON=n
USE_SYSTEM_LUCENE=y
-KDELIBS_MINVER= (>= 4:3.4.3-2)
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
LPSOLVE_MIN_VERSION= (>= 5.5.0.13-5+b1)
@@ -287,6 +293,7 @@
ifeq "$(BUILD_KDE)" "y"
ENABLE_KDEAB=y
endif
+ KDE_VER=3
CURL_SECTYPE=openssl
HSQLDB_MINVER= (>> 1.8.0.9)
ifeq "$(ARCH)" "ia64"
@@ -853,19 +860,23 @@
ifeq "$(BUILD_KDE)" "n"
CONFIGURE_FLAGS+= --disable-kde
+ CONFIGURE_FLAGS-= --disable-kde4
CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango $(HUMAN)"
else
+ ifeq "$(KDE_VER)" "4"
+ CONFIGURE_FLAGS += --disable-kde
+ else
+ CONFIGURE_FLAGS += --disable-kde4
+ endif
BUILD_DEPS += , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dev $(KDELIBS_MINVER)
ifeq "$(KDE_VER)" "4"
DBG_DBG_SUGGESTS+= , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dbg, libqt4-dbg
else
DBG_DBG_SUGGESTS+= , kdelibs-dbg, qt-x11-free-dbg
endif
- ifeq "$(KDE_VER)" "4"
- ADDITIONAL_SECTIONS += KDE4
- endif
ifeq "$(ENABLE_KDEAB)" "y"
ifeq "$(KDE_VER)" "4"
+ ADDITIONAL_SECTIONS += KDE4Experimental
BUILD_DEPS += , kdepimlibs$(shell echo "$(KDE_VER)+1" | bc)-dev
endif
else
@@ -1984,11 +1995,13 @@
ifeq "$(BUILD_KDE)" "y"
mkdir -p -m755 $(PKGDIR)-kde/$(OODIR)/program
mkdir -p -m755 $(PKGDIR)-kde/$(OOBRANDDIR)/program
- for f in fps_kde.uno.so libvclplug_kde*.so; do \
+ for f in fps_kde*.uno.so libvclplug_kde*.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-kde/$(OODIR)/program || exit 1 ;\
done
+ ifeq "$(KDE_VER)" "3"
mv $(PKGDIR)-core/$(OOBRANDDIR)/program/kdefilepicker \
$(PKGDIR)-kde/$(OOBRANDDIR)/program
+ endif
# install files for KDEs "create new" ...
mkdir -p $(PKGDIR)-kde/usr/share/templates/.source
Reply to: