./packages/openofficeorg/3.0/experimental r1047: merge 2.4.0-5
------------------------------------------------------------
revno: 1047
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-04-23 09:38:47 +0200
message:
merge 2.4.0-5
modified:
changelog
control
control.in
rules
------------------------------------------------------------
revno: 1022.1.43
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-04-15 20:25:03 +0200
message:
revert libstlport4.6-dev builddep bump
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.44
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Tue 2008-04-15 21:38:07 +0200
message:
set PACKAGE_NPSOPLUGIN=n when MOZILLA= (--disable-mozilla)
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.45
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2008-04-16 04:22:36 +0200
message:
mention CVEs
modified:
changelog
------------------------------------------------------------
revno: 1022.1.46
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2008-04-16 04:23:51 +0200
message:
&& instead of ;
modified:
rules
------------------------------------------------------------
revno: 1022.1.47
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2008-04-16 08:34:54 +0200
message:
Correct control.mozilla.in inclusion regardless of host architecture (merge from Ubuntu)
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.48
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2008-04-16 14:57:59 +0200
message:
enable scsolver for armel
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.49
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Wed 2008-04-16 23:18:59 +0200
message:
* debian/control.in, debian/rules:
- only add a dependency on openoffice.org-officebean to openoffice.org
when openoffice.org-officebean is actually built (i.e. we build with
Java)
modified:
changelog
control.in
rules
------------------------------------------------------------
revno: 1022.1.50
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2008-04-17 18:33:35 +0200
message:
update ooo-build; regenerate control
modified:
changelog
control
------------------------------------------------------------
revno: 1022.1.51
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-04-18 13:05:17 +0200
message:
ooo-build-2-4 branch
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.52
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Fri 2008-04-18 21:27:06 +0200
message:
close 476678
modified:
changelog
------------------------------------------------------------
revno: 1022.1.53
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-04-21 10:28:47 +0200
message:
close #477104
modified:
changelog
------------------------------------------------------------
revno: 1022.1.54
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Mon 2008-04-21 17:09:37 +0200
message:
update ooo-build
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.55
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2008-04-22 17:48:13 +0200
message:
suggest ttf-liberation as an alternative to msttcorefonts
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.56
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Tue 2008-04-22 18:32:15 +0200
message:
revert, ttf-liberation from debian-multimedia.org Provides: msttcorefonts
modified:
changelog
control
control.in
------------------------------------------------------------
revno: 1022.1.57
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Wed 2008-04-23 09:34:38 +0200
message:
-5
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-04-15 12:10:58 +0000
+++ b/changelog 2008-04-23 07:38:47 +0000
@@ -34,6 +34,36 @@
-- Rene Engelhard <rene@debian.org> Wed, 09 Apr 2008 12:47:50 +0200
+openoffice.org (1:2.4.0-5) unstable; urgency=low
+
+ * rebuild with python-central 0.6.4 (closes: #476678)
+ * ooo-build
+ - use ooo-build-2-4 branch
+ - update (r12270)
+ + patches/src680/configures-explicit-arch.diff: fix up for
+ the internal icu build
+ + patches/src680/sc-openformula-frequency.diff: fixed a silly regression
+ that prevents the built-in FREQUENCY function from working properly
+ (closes: #477104)
+ + patches/src680/sdk-settings-honour-linux.diff: honour also linux
+ as in s390-ibm-linux instead of only linux-gnu (closes: #477153)
+ * debian/rules:
+ - revert libstlport4.6-dev builddep bump. Will break our builddeps
+ for etch-backports and testing now has already -ldbl
+ - set PACKAGE_NPSOPLUGIN=n when MOZILLA= (--disable-mozilla)
+ - enable scsolver for armel (lp-solve now available)
+ * debian/control.in, debian/rules:
+ - only add a dependency on openoffice.org-officebean to openoffice.org
+ when openoffice.org-officebean is actually built (i.e. we build with
+ Java), thaks Chris Cheney
+ * debian/changelog: mention the various security fixes in OOH680_m5 and
+ OOH680_m6
+ * merge from Ubuntu:
+ - debian/rules:
+ + Correct control.mozilla.in inclusion regardless of host architecture
+
+ -- Rene Engelhard <rene@debian.org> Mon, 21 Apr 2008 17:02:51 +0200
+
openoffice.org (1:2.4.0-4) unstable; urgency=medium
* rebuild against python 2.5 (closes: #476220)
@@ -295,6 +325,8 @@
openoffice.org (1:2.4.0~ooh680m6-1) experimental; urgency=low
* new upstream snapshot (OOH680_m6)
+ - fixes CVE-2007-4770 and CVE-2007-4771 for the (unused) internal icu
+ copy
* ooo-build:
- update (r11494)
* debian/rules:
@@ -314,6 +346,8 @@
- now queries CUPS for printers again when opening the print dialogue;
not only on startup (closes: #290016)
- doesn't link libofficebean.so with -lgcj anymore (closes: #441202)
+ - fixes CVE-2007-5745, CVE-2007-5746, CVE-2007-5747 and
+ CVE-2008-0320
* ooo-build:
- use trunk again (r11432)
- src:
=== modified file 'control'
--- a/control 2008-04-15 12:10:58 +0000
+++ b/control 2008-04-23 07:38:47 +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-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxtst-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] libxrandr-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3.1) [i386] , libboost-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], autoconf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], sharutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], pkg-config [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xutils [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfontconfig1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxtst-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xsltproc [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], fdupes [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], xml-core [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxkbfile-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxinerama-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], x11proto-render-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], gperf [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libpq-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] libxrandr-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], , g++ (>> 4.3.0) [s390], gcc (>> 4.3.0) [s390] , dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgl1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64], libglu1-mesa-dev [i386 powerpc sparc s390 amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , python-dev (>= 2.4) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , debhelper (>= 6.0.7~) , java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], librepository-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , mono-mcs (>= 1.2.3) [i386 sparc amd64 ia64], mono-gmcs (>= 1.2.3) [i386 sparc amd64 ia64], libmono-dev (>= 1.2.3) [i386 sparc amd64 ia64], mono-utils (>= 1.2.3) [i386 sparc amd64 ia64], cli-common-dev (>= 0.4.4) [i386 sparc amd64 ia64], mono-1.0-devel [i386 sparc amd64 ia64], mono-2.0-devel [i386 sparc amd64 ia64] , libhunspell-dev (>= 1.1.5-2) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libhyphen-dev (>= 2.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libvigraimpex-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwps-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libwpg-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libicu-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libxslt1-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libcairo2-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [], lp-solve (>= 5.5.0.10-10) [] , libsuitesparse-dev (>> 3.1.0) [] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64]
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, libicu36-dev (<= 3.6-7), libicu-dev (<= 3.8-1), 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]
Standards-Version: 3.7.2
XS-Python-Version: current
@@ -13,7 +13,7 @@
Package: openoffice.org
Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
-Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, openoffice.org-officebean, ${ooo-binfilter-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
+Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-writer, openoffice.org-calc, openoffice.org-impress, openoffice.org-draw, openoffice.org-math, openoffice.org-base, ${ooo-officebean-dep}, ${ooo-binfilter-dep}, ${writer-w2l-dep}, openoffice.org-filter-mobiledev, ${java-common-depends}
Suggests: hunspell-dictionary, myspell-dictionary, openoffice.org-help-${help-l10n-virtual-version}, openoffice.org-l10n-${help-l10n-virtual-version}, menu, unixodbc, cupsys-bsd, libsane, ttf-dejavu, openoffice.org-hyphenation, openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts, 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 (<< ${Source-Version})
Replaces: openoffice.org2 (<< ${Source-Version}), openoffice.org-debian-files
=== modified file 'control.in'
--- a/control.in 2008-04-15 12:10:58 +0000
+++ b/control.in 2008-04-23 07:38:47 +0000
@@ -67,7 +67,7 @@
openoffice.orgVER-draw,
openoffice.orgVER-math,
openoffice.orgVER-base,
- openoffice.orgVER-officebean,
+ ${ooo-officebean-dep},
${ooo-binfilter-dep},
${writer-w2l-dep},
openoffice.orgVER-filter-mobiledev,
=== modified file 'rules'
--- a/rules 2008-04-15 12:10:58 +0000
+++ b/rules 2008-04-23 07:38:47 +0000
@@ -306,6 +306,8 @@
ifeq (,$(findstring $(ARCH),$(OOO_MONO_ARCHS)))
ENABLE_MONO=n
endif
+
+ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
# Mozilla plugin. Crashes on amd64
OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
@@ -323,12 +325,9 @@
PACKAGE_NPSOPLUGIN=n
endif
endif
-
-# lp-solve and libsuitesparse not available
-ifeq "$(ARCH)" "armel"
- ENABLE_SCSOLVER=n
+else
+OOO_NPSOPLUGIN_ARCHS=
endif
-OOO_SCSOLVER_ARCHS= $(filter-out armel,$(OOO_ARCHS))
# builds long...
ifneq (,$(findstring arm,$(ARCH)))
@@ -621,6 +620,7 @@
else
CONFIGURE_FLAGS += --disable-reportdesign
endif
+ OOO_OFFICEBEAN_DEP = openoffice.org$(VER)-officebean
else
CONFIGURE_FLAGS += --without-java
DEBHELPER_OPTIONS += -Nopenoffice.org$(VER)-officebean -Nopenoffice.org$(VER)-java-common -Nopenoffice.org$(VER)-filter-mobiledev
@@ -636,6 +636,7 @@
CONFIGURE_FLAGS += --with-system-mozilla=$(MOZILLA)
else
CONFIGURE_FLAGS += --disable-mozilla --without-system-mozilla
+ PACKAGE_NPSOPLUGIN=n
endif
ifeq "$(USE_SYSTEM_DMAKE)" "y"
@@ -681,7 +682,7 @@
CONFIGURE_FLAGS += --without-stlport
else
ifeq "$(USE_SYSTEM_STLPORT)" "y"
- LIBSTLPORT_MINVER= (>= 4.6.2-3.1)
+ LIBSTLPORT_MINVER= (>= 4.6.2-3)
BUILD_DEPS += , libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
DEV_STL_DEPENDS=, libstlport4.6-dev $(LIBSTLPORT_MINVER) [$(OOO_STLPORT_ARCHS)]
CONFIGURE_FLAGS+= --with-stlport=$(CURDIR)/stlport
@@ -1020,7 +1021,8 @@
src/easter/*.png \
patches/test/*.tar \
www/images/*.png \
- www/l10n/*.gif
+ www/l10n/*.gif \
+ doc/class_diagram.odg
if [ -d ooo-build/test ]; then \
find ooo-build/test ooo-build/doc ooo-build/scratch -type f \
\( -name '*.123' -o -name '*.doc' -o -name '*.lwp' \
@@ -1114,6 +1116,7 @@
desktop/mimetypes/48x48/*.png \
www/images/*.png \
www/l10n/*.gif \
+ doc/class_diagram.odg \
; do \
if [ -s $$f ]; then \
uuencode $$f $$f > $$f.uu.tmp && \
@@ -1281,7 +1284,7 @@
cat debian/control.pcvslib.in \
>> debian/control
endif
-ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
+ifneq "$(OOO_NPSOPLUGIN_ARCHS)" ""
sed -e "s|openoffice.orgVER|openoffice.org$(VER)|g" \
>> debian/control < debian/control.mozilla.in
endif
@@ -2471,7 +2474,7 @@
rm -f $(PKGDIR)-common/$(OODIR)/program/oo_product.bmp
# Extract and install icons
- cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract openoffice.org-debian-menus_*_all.deb . && cd usr/share/icons; \
+ cd $(SOURCE_TREE)/sysui/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin/desktop-integration && dpkg --extract openoffice.org-debian-menus_*_all.deb . && cd usr/share/icons && \
for d in `find -type d`; do \
install -d -m755 $(CURDIR)/$(PKGDIR)-common/usr/share/icons/$$d || exit 1 ;\
done &&\
@@ -2974,6 +2977,7 @@
-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-binfilter-dep=$(OOO_BINFILTER_DEP)' \
+ -V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
-V'lpsolve-dep=$(LPSOLVE_DEP)' \
-V'gstreamer-plugins-suggests=$(GSTREAMER_PLUGINS_SUGGESTS)' \
-V'dbg-dbg-suggests=$(DBG_DBG_SUGGESTS)' \
Reply to: