------------------------------------------------------------ revno: 1491 committer: Rene Engelhard <[email protected]> branch nick: debian timestamp: Mon 2009-04-13 19:45:22 +0200 message: improve BUILD_KDE conditional and set BUILD_KDE=y because -kde and -keab are for KDE3 modified: changelog control control.in rules
=== modified file 'changelog' --- a/changelog 2009-04-13 14:23:08 +0000 +++ b/changelog 2009-04-13 17:45:22 +0000 @@ -1,3 +1,11 @@ +openoffice.org (1:3.1.0~rc1-3) UNRELEASED; urgency=low + + * debian/control.in, debian/control.kde.in, debian/rules: + - disable -kde and -kdeab as they're for KDE3 (closes: #FIXME). Improve + BUILD_KDE conditional + + -- Rene Engelhard <[email protected]> Mon, 13 Apr 2009 19:43:23 +0200 + openoffice.org (1:3.1.0~rc1-2) experimental; urgency=low * ooo-build:
=== modified file 'control' --- a/control 2009-04-08 19:51:23 +0000 +++ b/control 2009-04-13 17:45:22 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian OpenOffice Team <[email protected]> Uploaders: Chris Halls <[email protected]>, Rene Engelhard <[email protected]> -Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), 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 (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [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-openoffice.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] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , libvigraimpex-dev , libwpd8-dev (>= 0.8.3-3) , libwps-dev , libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs4-dev (>= 4:3.4.3-2) , 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-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) , 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-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 (>= 2.4) , debhelper (>= 6.0.7~) , openjdk-6-jdk [i386 powerpc sparc mips mipsel s390 armel amd64 ppc64] , gij [i386 sparc mips mipsel s390 armel amd64 ia64], java-gcj-compat-dev (>= 1.0.76-7) [i386 sparc mips mipsel s390 armel amd64 ia64], libgcj-bc [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-openoffice.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] , mono-jit (>= 1.9.1+dfsg-2) [amd64] , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost1.37-dev (>= 1.37.0-4) , 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-4), lp-solve (>= 5.5.0.13-4) , libsuitesparse-dev (>= 1:3.2.0-2) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-plugins-base0.10-dev , libneon27-dev , librdf0-dev , libgtk2.0-dev (>= 2.10) , libgnomevfs2-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), gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1) [amd64], base-files (= 5) Standards-Version: 3.8.0 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}, ${writer-w2l-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 | 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} +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} 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,7 +44,6 @@ * 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 @@ -321,26 +320,6 @@ not using GNOME or KDE, needs to be manually enabled in the OpenOffice.org option menu. -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-gtk Architecture: i386 powerpc sparc mips mipsel armel s390 m68k amd64 ia64 ppc64 Depends: openoffice.org-core (= ${binary:Version}), openoffice.org-style-tango, ${shlibs:Depends}, ${misc:Depends} @@ -391,18 +370,6 @@ This package allows OpenOffice.org to access Evolution address books. You need to install evolution separately. -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-emailmerge Architecture: all Depends: ${python:Depends}, python-uno, ${misc:Depends} === modified file 'control.in' --- a/control.in 2009-04-08 08:51:02 +0000 +++ b/control.in 2009-04-13 17:45:22 +0000 @@ -87,7 +87,7 @@ openoffice.org2-thesaurus, libxrender1, libgl1, - openoffice.orgVER-gnome | openoffice.orgVER-kde, + openoffice.orgVER-gnome, iceweasel | firefox | icedove | thunderbird | iceape-browser | mozilla-browser, ${java-runtime-depends}, openclipart-openoffice.org, @@ -123,7 +123,6 @@ * openoffice.orgVER-gtk: Gtk UI Plugin, GNOME File Picker support, QuickStarter for GNOMEs notification are * openoffice.orgVER-gnome: GNOME VFS, GConf backend - * openoffice.orgVER-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 @@ -576,31 +575,6 @@ not using GNOME or KDE, needs to be manually enabled in the OpenOffice.org option menu. -Package: openoffice.orgVER-kde -Architecture: %OOO_ARCHS% -Depends: openoffice.orgVER-core (= ${binary:Version}), - openoffice.orgVER-style-crystal, - ${shlibs:Depends}, - ${misc:Depends} -Suggests: konqueror, - kmail, - openoffice.orgVER-kab -Section: kde -Enhances: openoffice.orgVER -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.orgVER-gtk Architecture: %OOO_ARCHS% Depends: openoffice.orgVER-core (= ${binary:Version}), @@ -665,20 +639,6 @@ This package allows OpenOffice.org to access Evolution address books. You need to install evolution separately. -Package: openoffice.orgVER-kab -Architecture: %OOO_ARCHS% -Depends: openoffice.orgVER-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.orgVER-emailmerge Architecture: all Depends: ${python:Depends}, python-uno, === modified file 'rules' --- a/rules 2009-04-08 19:51:23 +0000 +++ b/rules 2009-04-13 17:45:22 +0000 @@ -143,7 +143,7 @@ BUILD_CAIROCANVAS=y USE_SYSTEM_CAIRO=y CAIRO_FONTS_PATCH=y -BUILD_KDE=y +BUILD_KDE=n ifeq "$(BUILD_KDE)" "y" ENABLE_KDEAB=y endif @@ -840,7 +840,6 @@ ifeq "$(BUILD_KDE)" "n" CONFIGURE_FLAGS+= --disable-kde - DEBHELPER_OPTIONS+= -Nopenoffice.org$(VER)-kde -Nopenoffice.org$(VER)-kab CONFIGURE_FLAGS+= --with-images="industrial crystal hicontrast tango $(HUMAN)" else BUILD_DEPS += , kdelibs$(shell echo "$(KDE_VER)+1" | bc)-dev $(KDELIBS_MINVER) @@ -1385,6 +1384,11 @@ sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \ >> debian/control < debian/control.sdk.in endif +ifeq "$(BUILD_KDE)" "y" + sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \ + >> debian/control < debian/control.kde.in + perl -pi -e 's/ openoffice.org$(VER)-gnome,/ openoffice.org-gnome | openoffice.org$(VER)-kde,/' debian/control +endif sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \ >> debian/control < debian/control.postgresql.in @@ -1430,6 +1434,10 @@ # match myspell-fi and openoffice.org-soikko/-voikko perl -pi -e 's/myspell-dictionary-fi/myspell-dictionary-fi | openoffice.org-spellcheck-fi/' debian/control +ifeq "$(BUILD_KDE)" "y" + perl -pi -e 's/GConf backend$$/GConf backend\n * openoffice.org$(VER)-kde: KDE UI Plugin and KDE File Picker support/' debian/control +endif + .DELETE_ON_ERROR: debian/control build: build-arch build-indep
