r921 ./packages/openofficeorg/2.3/experimental: update ooo-build - ooqstart and qstart.desktop apparently are obsolete; fix ln; ENABLE_OPENGL conditional for cws transogl1; revert lib32icu36 change (not working) and build-conflict against the broken libicu36-devs
- To: debian-openoffice@lists.debian.org
- Subject: r921 ./packages/openofficeorg/2.3/experimental: update ooo-build - ooqstart and qstart.desktop apparently are obsolete; fix ln; ENABLE_OPENGL conditional for cws transogl1; revert lib32icu36 change (not working) and build-conflict against the broken libicu36-devs
- From: Rene Engelhard <rene@debian.org>
- Date: Sat, 20 Oct 2007 15:08:33 +0200
- Message-id: <[🔎] E1IjE5b-0002PK-4n@alioth.debian.org>
------------------------------------------------------------
revno: 921
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Sat 2007-10-20 15:08:33 +0200
message:
update ooo-build - ooqstart and qstart.desktop apparently are obsolete; fix ln; ENABLE_OPENGL conditional for cws transogl1; revert lib32icu36 change (not working) and build-conflict against the broken libicu36-devs
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2007-10-19 18:20:02 +0000
+++ b/changelog 2007-10-20 13:08:33 +0000
@@ -1,19 +1,25 @@
openoffice.org (1:2.3.0-2.3pre) experimental; urgency=low
* ooo-build:
- - update (r10536)
+ - update (r10547)
+ ooo82608.vcl.gtkbadfree.diff: backport fix from i#82608 to fix
bad free on theme resources (closes: #444741)
+ - src/: (re)add biblio.tar.bz2
* debian/rules:
- readd $(OOO_ARCHS) at neon builddep which got lost
- add a libstlport_gcc.so symlink in /usr/lib/openoffice/program when
using STLport4 to not rely on libstlport4.6-dev where binary-only
components would expect a libstlport_gcc.so
- - build-depend on lib32icu36 on amd64 when using ICU 3.6 to work around
- #447275
- look for Autodoc_DiagnosticMessages.txt in the correct path...
+ - add conditional for --enable-openl (cws transogl1)
+ * debian/control.in:
+ - build-conflict against nvidia-glx-dev for safety
+ - build-conflict against broken libicu36-devs on amd64, see #447275
+ * debian/control.in, debian/rules:
+ - adapt for new qstart implementation in ooo-build, which apparently
+ makes ooqstart and qstart.desktop obsolete
- -- Rene Engelhard <rene@debian.org> Fri, 19 Oct 2007 20:14:19 +0200
+ -- Rene Engelhard <rene@debian.org> Sat, 20 Oct 2007 14:52:28 +0200
openoffice.org (1:2.3.0-2) experimental; urgency=low
=== modified file 'control'
--- a/control 2007-10-19 09:28:01 +0000
+++ b/control 2007-10-20 13:08:33 +0000
@@ -3,8 +3,8 @@
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-1) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64], libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , java-gcj-compat-dev (>= 1.0.56) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.8-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
-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]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc amd64 ppc64], flex [i386 powerpc sparc amd64 ppc64], libpam0g-dev [i386 powerpc sparc amd64 ppc64], libxaw7-dev [i386 powerpc sparc amd64 ppc64], unzip [i386 powerpc sparc amd64 ppc64], zip [i386 powerpc sparc amd64 ppc64], autoconf [i386 powerpc sparc amd64 ppc64], sharutils [i386 powerpc sparc amd64 ppc64], pkg-config [i386 powerpc sparc amd64 ppc64], xutils [i386 powerpc sparc amd64 ppc64], libfontconfig1-dev [i386 powerpc sparc amd64 ppc64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64 ppc64], libfreetype6-dev [i386 powerpc sparc amd64 ppc64], libx11-dev [i386 powerpc sparc amd64 ppc64], libsm-dev [i386 powerpc sparc amd64 ppc64], libxt-dev [i386 powerpc sparc amd64 ppc64], libxext-dev [i386 powerpc sparc amd64 ppc64], libice-dev [i386 powerpc sparc amd64 ppc64], libsane-dev [i386 powerpc sparc amd64 ppc64], libxrender-dev [i386 powerpc sparc amd64 ppc64], libcupsys2-dev [i386 powerpc sparc amd64 ppc64], libarchive-zip-perl [i386 powerpc sparc amd64 ppc64], libstartup-notification0-dev [i386 powerpc sparc amd64 ppc64], libpng12-dev [i386 powerpc sparc amd64 ppc64], libjpeg62-dev [i386 powerpc sparc amd64 ppc64], libxml2-dev [i386 powerpc sparc amd64 ppc64], libldap2-dev [i386 powerpc sparc amd64 ppc64], libexpat1-dev [i386 powerpc sparc amd64 ppc64], libgnomevfs2-dev [i386 powerpc sparc amd64 ppc64], fastjar [i386 powerpc sparc amd64 ppc64], libsndfile1-dev [i386 powerpc sparc amd64 ppc64], xsltproc [i386 powerpc sparc amd64 ppc64], graphicsmagick [i386 powerpc sparc amd64 ppc64], netpbm [i386 powerpc sparc amd64 ppc64], fdupes [i386 powerpc sparc amd64 ppc64], xml-core [i386 powerpc sparc amd64 ppc64], libxkbfile-dev [i386 powerpc sparc amd64 ppc64], libxinerama-dev [i386 powerpc sparc amd64 ppc64], x11proto-render-dev [i386 powerpc sparc amd64 ppc64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc amd64 ppc64] libxml-parser-perl [i386 powerpc sparc amd64 ppc64], gperf [i386 powerpc sparc amd64 ppc64], libpq-dev [i386 powerpc sparc amd64 ppc64] , libcurl4-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libdb4.5-dev [i386 powerpc sparc amd64 ppc64] , python-central (>= 0.5) [i386 powerpc sparc amd64 ppc64], debhelper (>= 5.0.37.2) , python-dev (>= 2.4) [i386 powerpc sparc amd64 ppc64] , java-gcj-compat-dev (>= 1.0.56) [i386 powerpc sparc amd64 ppc64] , ant (>= 1.6.5) [i386 powerpc sparc amd64 ppc64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64 ppc64] , libxerces2-java [i386 powerpc sparc amd64 ppc64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc amd64 ppc64] , mingw32 [i386 powerpc sparc amd64 ppc64] , libxul-dev [i386 powerpc sparc amd64 ppc64], libnss3-dev [i386 powerpc sparc amd64 ppc64] , dmake (>= 1:4.7) [i386 powerpc sparc amd64 ppc64] , mono-mcs (>= 1.2.3) [i386 amd64], mono-gmcs (>= 1.2.3) [i386 amd64], libmono-dev (>= 1.2.3) [i386 amd64], mono-utils (>= 1.2.3) [i386 amd64], cli-common-dev (>= 0.4.4) [i386 amd64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc amd64 ppc64] , libaltlinuxhyph-dev (>= 0.1.1-11) [i386 powerpc sparc amd64 ppc64] , libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64 ppc64] , libboost-dev [i386 powerpc sparc amd64 ppc64] , libvigraimpex-dev [i386 powerpc sparc amd64 ppc64] , portaudio19-dev [i386 powerpc sparc amd64 ppc64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64 ppc64] , libwps-dev [i386 powerpc sparc amd64 ppc64] , libwpg-dev [i386 powerpc sparc amd64 ppc64] , libsvg-dev [i386 powerpc sparc amd64 ppc64] , libicu-dev [i386 powerpc sparc amd64 ppc64] , lib32icu36 [amd64] , libxslt1-dev [i386 powerpc sparc amd64 ppc64] , libcairo2-dev [i386 powerpc sparc amd64 ppc64], libglitz-glx1-dev [i386 powerpc sparc amd64 ppc64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64 ppc64] , libhsqldb-java (>= 1.8.0.8-1) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc amd64 ppc64] , libsuitesparse-dev [i386 powerpc sparc amd64 ppc64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64 ppc64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64 ppc64] , libneon27-gnutls-dev [i386 powerpc sparc amd64 ppc64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
+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, libicu36-dev (= 3.6-4) [amd64], libicu36-dev (= 3.6-5) [amd64], libicu36-dev (= 3.6-5) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
XS-Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3/experimental
@@ -103,7 +103,7 @@
Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol, ${shlibs:Depends}, fontconfig, ${mozilla-nss-depends}
Recommends: nfs-common
-Conflicts: openoffice.org-thesaurus, ooqstart-gnome, oooqs-kde, openoffice.org-unbundled, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde (<< 2.0.3-7), ooqstart-gnome (<= 0.8.3-8), openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1)
+Conflicts: openoffice.org-thesaurus, openoffice.org-unbundled, openoffice.org-l10n-1.9.108, openoffice.org-l10n-1.9.114, openoffice.org-l10n-1.9.121, openoffice.org-1.9.125, oooqs-kde, ooqstart-gnome, openoffice.org-help-de (<< 2.0), openoffice.org-help-en (<< 2.0), openoffice.org-help-el (<< 2.0), openoffice.org-help-es (<< 2.0), openoffice.org-help-fr (<< 2.0), openoffice.org-help-it (<< 2.0), openoffice.org-help-ja (<< 2.0), openoffice.org-help-ko (<< 2.0), openoffice.org-help-pt-br (<< 2.0), openoffice.org-help-sv (<< 2.0), openoffice.org-help-tr (<< 2.0), openoffice.org-help-zh-cn (<< 2.0), openoffice.org-help-zh-tw (<< 2.0), openoffice.org-help-2.0.0, openoffice.org-help-2.0.1, openoffice.org-help-2.0.2, openoffice.org-help-2.0.3, openoffice.org-bin, openoffice.org2-core, openoffice.org-crashrep, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-calc (<< ${Source-Version}), openoffice.org-writer (<< ${Source-Version}), openoffice.org-impress (<< ${Source-Version}), openoffice.org-draw (<< ${Source-Version}), openoffice.org-base (<< ${Source-Version}), openoffice.org-gtk (<< ${Source-Version}), openoffice.org-gnome (<< ${Source-Version}), openoffice.org-kde (<< ${Source-Version}), openoffice.org-evolution (<< ${Source-Version}), openoffice.org-filter-so52 (<< ${Source-Version}), openoffice.org-officebean (<< ${Source-Version}), openoffice.org-dev (<< ${Source-Version}), libcairo2 (= 1.4.8-1)
Provides: openoffice.org-bundled, openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell
Replaces: openoffice.org-bin, openoffice.org (<< 1.9), openoffice.org-gtk (<< 2.0.3+2.0.4m179), openoffice.org2-core, openoffice.org-java, openoffice.org2-hunspell, openoffice.org-hunspell, openoffice.org-common (<< 2.0.3+2.0.4m180), openoffice.org-calc (<< 2.2.1~oof680m15-2)
Description: OpenOffice.org office suite architecture dependent files
@@ -314,12 +314,12 @@
* kaddressbook
Package: openoffice.org-gtk
-Conflicts: ooqstart-gnome, oooqs-kde
Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-style-tango, ${shlibs:Depends}
Section: gnome
Enhances: openoffice.org
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0), openoffice.org-common (<< 2.0.4~rc1-0)
+Conflicts: ooqstart-gnome, oooqs-kde
Description: GTK Integration for OpenOffice.org (Widgets, Dialogs, Quickstarter)
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
=== modified file 'control.in'
--- a/control.in 2007-10-15 12:18:11 +0000
+++ b/control.in 2007-10-20 13:08:33 +0000
@@ -46,12 +46,12 @@
libxkbfile-dev [%OOO_ARCHS%],
libxinerama-dev [%OOO_ARCHS%],
x11proto-render-dev [%OOO_ARCHS%],
- unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%],
+ unixodbc-dev (>= 2.2.11) [%OOO_ARCHS%]
libxml-parser-perl [%OOO_ARCHS%],
gperf [%OOO_ARCHS%],
libpq-dev [%OOO_ARCHS%]
%BUILD_DEPS%
-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]
+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, libicu36-dev (= 3.6-4) [amd64], libicu36-dev (= 3.6-5) [amd64], libicu36-dev (= 3.6-5) [amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
XS-Vcs-Bzr: http://bzr.debian.org/pkg-openoffice/packages/openofficeorg/2.3/experimental
@@ -191,8 +191,8 @@
openoffice.orgVER-l10n-1.9.114,
openoffice.orgVER-l10n-1.9.121,
openoffice.orgVER-1.9.125,
- oooqs-kde (<< 2.0.3-7),
- ooqstart-gnome (<= 0.8.3-8),
+ oooqs-kde,
+ ooqstart-gnome,
openoffice.org-help-de (<< 2.0),
openoffice.org-help-en (<< 2.0),
openoffice.org-help-el (<< 2.0),
@@ -545,12 +545,14 @@
Enhances: openoffice.orgVER
Replaces: openoffice.org-gnome (<< 2.0.4~rc1-0),
openoffice.org-common (<< 2.0.4~rc1-0)
-Description: GTK Integration for OpenOffice.org (Widgets, Dialogs)
+Conflicts: ooqstart-gnome, oooqs-kde
+Description: GTK Integration for OpenOffice.org (Widgets, Dialogs, Quickstarter)
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the Gtk plugin for drawing OOo's widgets with
- Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME.
+ Gtk+ and a Gtk/GNOMEish File Picker when running under GNOME. It also
+ contains a QuickStarter for the "notification area".
Package: openoffice.orgVER-headless
Architecture: %OOO_ARCHS%
=== modified file 'rules'
--- a/rules 2007-10-19 18:04:32 +0000
+++ b/rules 2007-10-20 13:08:33 +0000
@@ -127,7 +127,6 @@
USE_DBUS=y
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
-PACKAGE_QUICKSTART=y
USE_OOO_BUILD_DESKTOPS=n
PACKAGE_SDK=y
RUN_SMOKETEST=n
@@ -142,6 +141,7 @@
NEONSONR=27
PARALLEL_BUILD=n
MOZILLA=xulrunner
+ENABLE_OPENGL=n
# when we have a package we want to have to be installed on older things with some older
# C++ ABI (like it was the case with openoffice.org2), we need to set this. Don't touch
@@ -169,10 +169,6 @@
# when we don't do that here, too.
CONFIGURE_FLAGS += --disable-access
-ifneq "$(PACKAGE_QUICKSTART)" "y"
- CONFIGURE_FLAGS+= --disable-quickstart
-endif
-
#############
# Distro-specific overrides
@@ -276,6 +272,11 @@
BUILDDEB_OPTIONS = -- -Zbzip2
endif
+ifeq "$(ENABLE_OPENGL)" "y"
+ BUILD_DEPS += , libgl1-mesa-dev, libglu1-mesa-dev
+ CONFIGURE_FLAGS += --enable-opengl
+endif
+
ifeq "$(USE_LIBCURL4)" "y"
BUILD_DEPS += , libcurl4-gnutls-dev [$(OOO_ARCHS)]
else
@@ -1107,15 +1108,6 @@
perl -pi -e "s,%OOO_MONO_ARCHS%,$(OOO_MONO_ARCHS),g" debian/control
perl -pi -e "s,%OOO_NPSOPLUGIN_ARCHS%,$(OOO_NPSOPLUGIN_ARCHS),g" debian/control
-ifeq "$(PACKAGE_QUICKSTART)" "y"
- perl -pi -e 's#\(Widgets, Dialogs\)#\(Widgets, Dialogs, Quickstarter\)#' debian/control
- perl -pi -e 's/GNOME\./GNOME. It also\n contains a QuickStarter for the \"notification area\"./' debian/control
- perl -pi -e 's/Package: openoffice.org$(VER)-gtk$$/Package: openoffice.org-gtk\nConflicts: ooqstart-gnome, oooqs-kde/' debian/control
- perl -pi -e 's/Conflicts: openoffice.org-thesaurus/Conflicts: openoffice.org-thesaurus, ooqstart-gnome, oooqs-kde/' debian/control
-else
- perl -pi -e 's/Conflicts: openoffice.org-thesaurus/Conflicts: openoffice.org-thesaurus, ooqstart-gnome <= 0.8.3-8), oooqs-kde (<< 2.0.3-7)/' debian/control
-endif
-
ifeq (he,$(findstring he,$(LANGPACKISOS)))
perl -pi -e 's/openoffice.org-help-he$$/openoffice.org-help-he, openoffice.org-ctl-he/' debian/control
endif
@@ -1416,16 +1408,6 @@
cd debian/tmp/pkg; \
rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
-ifeq "$(PACKAGE_QUICKSTART)" "y"
- # ooqstart should go into -core; we have just a glib dependency
- mkdir -p debian/tmp/pkg/openoffice.org-core/$(OODIR)/program
- mv debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/ooqstart \
- debian/tmp/pkg/openoffice.org-core/$(OODIR)/program
- mkdir -p -m755 debian/tmp/pkg/openoffice.org-gnome/$(OODIR)/share/xdg
- mv debian/tmp/pkg/openoffice.org-common/$(OODIR)/share/xdg/qstart.desktop \
- debian/tmp/pkg/openoffice.org-gnome/$(OODIR)/share/xdg
-endif
-
# move gengal stuff into -dev
mkdir -p debian/tmp/pkg/openoffice.org-dev/$(OODIR)/program
mv debian/tmp/pkg/openoffice.org-core/$(OODIR)/program/gengal* \
@@ -1631,15 +1613,9 @@
for f in gnome-open-url.bin fps_gnome.uno.so libvclplug_gtk[0-9]*.so; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
-ifeq "$(PACKAGE_QUICKSTART)" "y"
for f in libeggtray* libqstart_gtk*; do \
mv $(PKGDIR)-core/$(OODIR)/program/$$f $(PKGDIR)-gnome/$(OODIR)/program || exit 1;\
done
-else
- for f in libeggtray* libqstart_gtk*; do \
- rm -f $(PKGDIR)-core/$(OODIR)/program/$$f; \
- done
-endif
# split out gtk stuff
rm -rf $(PKGDIR)-gtk
@@ -1786,14 +1762,7 @@
< $$dirname/$$p.desktop \
> $(PKGDIR)-$$p/usr/share/applications/ooo$(VER)-$$p.desktop || exit 1 ;\
done
- # qstart.desktop is different to the above. Should be handled by --with-unix-wrapper of ooo-build
- # but that somehow doesn't work as expected. FIXME.
- PRODUCTVERSION=`grep PRODUCTVERSION $(SOURCE_TREE)/sysui/desktop/productversion.mk | head -n 1 | cut -d"=" -f2 | sed -e s/\ //g`; \
- sed -i -e "s,Exec=openoffice.org$$PRODUCTVERSION,Exec=ooffice$(VER)," \
- -e "s,Name=OpenOffice.org $$PRODUCTVERSION,Name=OpenOffice.org $(VER)," \
- -e "s/ / /" \
- $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
- # we don't need the share/xdgs except qstart
+ # we don't need the share/xdgs
for f in `find debian -name '*.desktop' | grep xdg | grep -v qstart`; do \
rm -f $$f; done
for f in `find debian -name '*.desktop'`; do \
@@ -1809,7 +1778,6 @@
for i in writer calc impress draw math base; do \
perl -pi -e 's/Application;//; s/X-Red-Hat-Base;//; s/X-SuSE-Core-Office;//; s/X-MandrivaLinux-.*;//;' $(PKGDIR)-$$i/usr/share/applications/ooo$(VER)-$$i.desktop; \
done
- perl -pi -e 's/Application;//' $(PKGDIR)-gtk/$(OODIR)/share/xdg/qstart.desktop
else
# menu files from ooo-build/desktop
for p in writer calc impress draw math base; do \
@@ -1965,7 +1933,7 @@
rm -f $(PKGDIR)-core/$(OODIR)/program/libstlport*
ifneq "$(USE_STLPORT5)" "y"
ln -s `readlink /usr/lib/libstlport_gcc.so` \
- libstlport_gcc.so
+ debian/openoffice.org$(VER)-core/$(OODIR)/program/libstlport_gcc.so
endif
endif
Reply to: