------------------------------------------------------------
revno: 1046
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-04-15 14:10:58 +0200
message:
merge 1:2.4.0-4
modified:
changelog
control
control.minimizer.in
control.reportdesign.in
openoffice.org-base.mime
openoffice.org-calc.mime
openoffice.org-draw.mime
openoffice.org-filter-binfilter.mime
openoffice.org-impress.mime
openoffice.org-math.mime
openoffice.org-writer.mime
rules
------------------------------------------------------------
revno: 1022.1.23
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-02 13:39:36 +0200
message:
update and sort mimetypes (merge from Ubuntu)
modified:
changelog
openoffice.org-base.mime
openoffice.org-calc.mime
openoffice.org-draw.mime
openoffice.org-filter-binfilter.mime
openoffice.org-impress.mime
openoffice.org-math.mime
openoffice.org-writer.mime
------------------------------------------------------------
revno: 1022.1.24
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-02 13:42:59 +0200
message:
more mime stuff from Ubuntu
modified:
openoffice.org-base.mime
openoffice.org-calc.mime
openoffice.org-draw.mime
openoffice.org-filter-binfilter.mime
openoffice.org-impress.mime
openoffice.org-math.mime
openoffice.org-writer.mime
------------------------------------------------------------
revno: 1022.1.25
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-02 14:09:26 +0200
message:
- handle new aotcompile.py location to prevent FTBFS when
java-gcj-compat-dev gets rebuilt with a python-central >= 0.6.
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.26
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-02 14:17:19 +0200
message:
Use openjdk-6-jre instead of icedtea-java7-jre (from Ubuntu)
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.27
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Thu 2008-04-03 23:06:35 +0200
message:
update ooo-build
modified:
changelog
------------------------------------------------------------
revno: 1022.1.28
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-04-04 15:55:17 +0200
message:
update ooo-build; close #465423 although it already is closed because it
somehow didn't appear in rc6 anymore
modified:
changelog
------------------------------------------------------------
revno: 1022.1.29
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-04-07 00:34:39 +0200
message:
bump LIBSTLPORT_MINVER; mention updated GSIs
modified:
changelog
control
rules
------------------------------------------------------------
revno: 1022.1.30
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-04-07 01:04:53 +0200
message:
reenable system-hunspell, tighten libhyphen0 depends
modified:
control
rules
------------------------------------------------------------
revno: 1022.1.31
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-04-07 11:05:13 +0200
message:
%OOO_ARCHS% -> %OOO_JAVA_ARCHS%
update ooo-build
modified:
changelog
control.reportdesign.in
------------------------------------------------------------
revno: 1022.1.32
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-04-07 15:42:31 +0200
message:
update ooo-build
modified:
changelog
------------------------------------------------------------
revno: 1022.1.33
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Wed 2008-04-09 21:34:31 +0200
message:
fix mozilla/ogltrans conditionals, the new java-gcj-compat-dev is now in
sid; adapt description
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.34
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Thu 2008-04-10 00:12:09 +0200
message:
it's java-gcj-compat-dev...
modified:
changelog
------------------------------------------------------------
revno: 1022.1.35
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Thu 2008-04-10 10:35:08 +0200
message:
update ooo-build, close 469894
modified:
changelog
------------------------------------------------------------
revno: 1022.1.36
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Fri 2008-04-11 10:22:38 +0200
message:
explicitely specify --host and --build
modified:
changelog
rules
------------------------------------------------------------
revno: 1022.1.37
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2008-04-12 16:07:58 +0200
message:
fix
modified:
changelog
------------------------------------------------------------
revno: 1022.1.38
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Sun 2008-04-13 14:43:06 +0200
message:
typo; make it medium
modified:
changelog
------------------------------------------------------------
revno: 1022.1.39
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: unstable
timestamp: Sun 2008-04-13 15:27:54 +0200
message:
two missing changelog entries
modified:
changelog
------------------------------------------------------------
revno: 1022.1.40
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-04-14 12:30:53 +0200
message:
disable Java and Mozilla on armel; fix extension descriptions; ooo-build
update; close #475987
modified:
changelog
control
control.in
control.reportdesign.in
rules
------------------------------------------------------------
revno: 1022.1.41
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-04-15 09:59:29 +0200
message:
close 476220
modified:
changelog
------------------------------------------------------------
revno: 1022.1.42
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Tue 2008-04-15 13:46:06 +0200
message:
-4
modified:
changelog
=== modified file 'changelog'
--- a/changelog 2008-04-09 10:51:17 +0000
+++ b/changelog 2008-04-15 12:10:58 +0000
@@ -34,6 +34,44 @@
-- Rene Engelhard <[EMAIL PROTECTED]> Wed, 09 Apr 2008 12:47:50 +0200
+openoffice.org (1:2.4.0-4) unstable; urgency=medium
+
+ * rebuild against python 2.5 (closes: #476220)
+ * ooo-build:
+ - update (r12156)
+ + disables cjk-character-units-*.diff as they cause some problems
+ (closes: #474028)
+ + emf+-canvas-vcl-non-closed-polygon.diff: fixed invalid access
+ (closes: #465423)
+ + sw-hindi-numbers.diff: revert change for i#81577 to fix number
+ displaying in hebrew docs
+ + fixes uninitialized memory in manual spellchecking (closes: #469894)
+ - src: update GSIs from ftp.linux.cz: bg da et fi ga mk nb nn
+ * debian/rules:
+ - handle new aotcompile.py location in java-gcj-compat-dev due to
+ python-central >= 0.6 (closes: #475987)
+ - bump libstlport4.6-dev builddep to ensure building against
+ libstlport4.6ldbl
+ - reenable system-hunspell
+ - bump libhyphen0 dep to 2.3-1-3
+ - set MOZILLA= when arch not in OOO_MOZILLA_ARCHS
+ - fix OOO_OGLTRANS_ARCHS conditional
+ - disable Java (OOM) and mozilla (no xulrunner/nss/nspr available yet)
+ on armel
+ * debian/rules, ooo-build/patches/src680/configures-explicit-arch.diff:
+ explicitely specify --host and --build (closes: #475037)
+ * debian/control.in, debian/control.reportdesign.in: Fix long
+ description, thanks Gerfried Fuchs (closes: #475992)
+ * merge from Ubuntu:
+ - debian/*.mime:
+ + Update and sort mime-types.
+ - debian/rules:
+ + Use openjdk-6-jre instead of icedtea-java7-jre.
+ - debian/control.reportdesign.in:
+ + change %OOO_ARCHS% to %OOO_JAVA_ARCHS%
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 14 Apr 2008 12:23:51 +0200
+
openoffice.org (1:2.4.0-3) unstable; urgency=low
* The "Third time is a charm?" release.
=== modified file 'control'
--- a/control 2008-04-03 21:45:26 +0000
+++ b/control 2008-04-15 12:10:58 +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-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 armel s390
amd64 ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libxerces2-java [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel
s390 amd64 ppc64 ia64] , mingw32 [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64] , libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64], libsac-java [i386 powerpc sparc mips mipsel armel
s390 amd64 ppc64 ia64], libxml-java [i386 powerpc sparc mips mipsel armel s390
amd64 ppc64 ia64], libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel
armel s390 amd64 ppc64 ia64], libpentaho-reporting-flow-engine-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], liblayout-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libloader-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libformula-java [i386
powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], librepository-java
[i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64], libfonts-java (>=
0.2.6) [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64],
libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel s390 amd64
ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel armel s390 amd64 ppc64
ia64], libnss3-dev [i386 powerpc sparc mips mipsel armel 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] , 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
armel s390 amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel
armel 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.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-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
@@ -412,7 +412,7 @@
Homepage: http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
-Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64
Section: misc
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${java-runtime-depends}, ${java-common-depends}
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
@@ -3047,7 +3047,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc sparc mips mipsel armel s390
+Architecture: i386 powerpc sparc mips mipsel s390
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@ -3079,7 +3079,7 @@
Package: openoffice.org-report-builder
Section: misc
Priority: optional
-Architecture: i386 powerpc sparc mips mipsel armel s390 amd64 ppc64 ia64
+Architecture: i386 powerpc sparc mips mipsel s390 amd64 ppc64 ia64
Depends: ${shlibs:Depends}, ${report-builder-jar-depends}, openoffice.org-base
(>= 2.3.0~src680m225), openoffice.org-core (>> 1:2.3.0~oog680m1),
openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
@@ -3090,7 +3090,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the report builder extension:
- "Create with the Sun Report Builder stylish, smart-looking database reports.
+ "Create with the Sun Report Builder stylish, smart-looking database reports.
The flexible report editor can define group and page headers as well as
group and page footers and even calculation fields are available to
accomplish complex database reports."
@@ -3107,7 +3107,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the presentation minimizer extension:
- "The Sun Presentation Minimizer is used to reduce the file size of the
+ "The Sun Presentation Minimizer is used to reduce the file size of the
current presentation. Images will be compressed, and data that is no longer
needed will be removed.
The Sun Presentation Minimizer can optimize the image quality size.
=== modified file 'control.minimizer.in'
--- a/control.minimizer.in 2008-04-03 21:18:38 +0000
+++ b/control.minimizer.in 2008-04-15 12:10:58 +0000
@@ -9,7 +9,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the presentation minimizer extension:
- "The Sun Presentation Minimizer is used to reduce the file size of the
+ "The Sun Presentation Minimizer is used to reduce the file size of the
current presentation. Images will be compressed, and data that is no longer
needed will be removed.
The Sun Presentation Minimizer can optimize the image quality size.
=== modified file 'control.reportdesign.in'
--- a/control.reportdesign.in 2007-12-12 20:57:07 +0000
+++ b/control.reportdesign.in 2008-04-14 10:30:53 +0000
@@ -1,7 +1,7 @@
Package: openoffice.orgVER-report-builder
Section: misc
Priority: optional
-Architecture: %OOO_ARCHS%
+Architecture: %OOO_JAVA_ARCHS%
Depends: ${shlibs:Depends}, ${report-builder-jar-depends},
openoffice.orgVER-base (>= 2.3.0~src680m225), openoffice.orgVER-core (>>
1:2.3.0~oog680m1), openoffice.org-java-common (>= 1:2.3.0~oog680m1)
Conflicts: openoffice.org-reportdesigner
Replaces: openoffice.org-reportdesigner
@@ -12,7 +12,7 @@
a near drop-in replacement for Microsoft(R) Office.
.
This package contains the report builder extension:
- "Create with the Sun Report Builder stylish, smart-looking database reports.
+ "Create with the Sun Report Builder stylish, smart-looking database reports.
The flexible report editor can define group and page headers as well as
group and page footers and even calculation fields are available to
accomplish complex database reports."
=== modified file 'openoffice.org-base.mime'
--- a/openoffice.org-base.mime 2006-11-01 21:56:26 +0000
+++ b/openoffice.org-base.mime 2008-04-02 11:42:59 +0000
@@ -1,1 +1,11 @@
-application/vnd.oasis.opendocument.database; soffice -base '%s'; edit=soffice
-base '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument Database";
nametemplate=%s.odb
+###
+# shared-mime-info
+
+# OASIS OpenDocument Format
+application/vnd.oasis.opendocument.database; soffice -base '%s'; edit=soffice
-base '%s'; test=test -n "$DISPLAY"; description="OpenDocument Database";
nametemplate=%s.odb; priority=9
+
+# OpenOffice.org 1.0
+application/vnd.sun.xml.base; soffice -writer '%s'; edit=soffice -writer '%s';
description="OpenOffice.org Database"; nametemplate=%s.sdb; priority=8
+
+#
+###
=== modified file 'openoffice.org-calc.mime'
--- a/openoffice.org-calc.mime 2007-07-31 10:52:31 +0000
+++ b/openoffice.org-calc.mime 2008-04-02 11:42:59 +0000
@@ -1,8 +1,46 @@
-application/vnd.oasis.opendocument.spreadsheet; soffice -calc '%s';
edit=soffice -calc '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument
Spreadsheet"; nametemplate=%s.ods
-application/vnd.oasis.opendocument.spreadsheet-template; soffice -calc '%s';
edit=soffice -calc '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument
Spreadsheet Template"; nametemplate=%s.ots
-application/vnd.oasis.opendocument.chart; soffice -calc '%s'; edit=soffice
-calc '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument Chart";
nametemplate=%s.odc
-application/vnd.sun.xml.calc; soffice -calc '%s'; edit=soffice -calc '%s';
test=test "$DISPLAY" != "" ; description="OpenOffice.org Spreadsheet";
nametemplate=%s.sxc; priority=8
-application/vnd.sun.xml.calc.template; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Spreadsheet
Template"; nametemplate=%s.stc; priority=8
-application/msexcel; soffice -calc '%s'; edit=soffice -calc '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.xls; description="Microsoft Excel Document";
priority=3
-application/vnd.ms-excel; soffice -calc '%s'; edit=soffice -calc '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.xls; description="Microsoft Excel
Document"; priority=3
-application/x-msexcel; soffice -calc '%s'; edit=soffice -calc '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.xls; description="Microsoft Excel Document";
priority=3
+###
+# shared-mime-info
+
+# Generic
+text/csv; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n
"$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; priority=3
+text/spreadsheet; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n
"$DISPLAY"; description="Spreadsheet Interchange Document";
nametemplate=%s.slk; priority=3
+
+# Corel Quattro Pro
+application/x-quattropro; soffice -calc '%s'; edit=soffice -calc '%s';
test=test -n "$DISPLAY"; description="Quattro Pro 6 for Windows Spreadsheet";
nametemplate=%s.wb2; priority=3
+
+# dBase dBASE
+application/x-dbf; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n
"$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf; priority=3
+
+# ECMA Office Open XML (Microsoft Office 2007)
+application/vnd.ms-excel.sheet.macroEnabled.12; soffice -calc '%s';
edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML
Spreadsheet with Macros Enabled"; nametemplate=%s.xlsm; priority=3
+application/vnd.ms-excel.template.macroEnabled.12; soffice -calc '%s';
edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="Office Open XML
Spreadsheet Template with Macros Enabled"; nametemplate=%s.xltm; priority=3
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet; soffice
-calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY";
description="Office Open XML Spreadsheet"; nametemplate=%s.xlsx; priority=3
+application/vnd.openxmlformats-officedocument.spreadsheetml.template; soffice
-calc '%s'; edit=soffice -calc '%s'; test=test -n "$DISPLAY";
description="Office Open XML Spreadsheet Template"; nametemplate=%s.xltx;
priority=3
+
+# IBM Lotus 1-2-3
+application/vnd.lotus-1-2-3; soffice -calc '%s'; edit=soffice -calc '%s';
test=test -n "$DISPLAY"; description="Lotus 1-2-3 spreadsheet";
nametemplate=%s.123; priority=3
+
+# Microsoft Excel
+application/vnd.ms-excel; soffice -calc '%s'; edit=soffice -calc '%s';
test=test -n "$DISPLAY"; description="Microsoft Excel Document";
nametemplate=%s.xls; priority=3
+
+# OASIS OpenDocument Format
+application/vnd.oasis.opendocument.chart; soffice -calc '%s'; edit=soffice
-calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument Chart";
nametemplate=%s.odc; priority=9
+application/vnd.oasis.opendocument.spreadsheet; soffice -calc '%s';
edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument
Spreadsheet"; nametemplate=%s.ods; priority=9
+application/vnd.oasis.opendocument.spreadsheet-template; soffice -calc '%s';
edit=soffice -calc '%s'; test=test -n "$DISPLAY"; description="OpenDocument
Spreadsheet Template"; nametemplate=%s.ots; priority=9
+
+# OpenOffice.org 1.0
+application/vnd.sun.xml.calc; soffice -calc '%s'; edit=soffice -calc '%s';
test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet";
nametemplate=%s.sxc; priority=8
+application/vnd.sun.xml.calc.template; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Spreadsheet
Template"; nametemplate=%s.stc; priority=8
+
+#
+###
+
+###
+# KDE 3 (obsolete)
+
+application/msexcel; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n
"$DISPLAY"; description="Microsoft Excel Document"; nametemplate=%s.xls;
priority=3
+application/x-dbase; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n
"$DISPLAY"; description="xBase Document"; nametemplate=%s.dbf; priority=3
+text/x-csv; soffice -calc '%s'; edit=soffice -calc '%s'; test=test -n
"$DISPLAY"; description="CSV Document"; nametemplate=%s.csv; priority=3
+
+#
+###
=== modified file 'openoffice.org-draw.mime'
--- a/openoffice.org-draw.mime 2007-07-31 10:52:31 +0000
+++ b/openoffice.org-draw.mime 2008-04-02 11:42:59 +0000
@@ -1,4 +1,13 @@
-application/vnd.oasis.opendocument.graphics; soffice -draw '%s'; edit=soffice
-draw '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument Drawing";
nametemplate=%s.odg
-application/vnd.oasis.opendocument.graphics-template; soffice -draw '%s';
edit=soffice -draw '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument
Drawing Template"; nametemplate=%s.otg
-application/vnd.sun.xml.draw; soffice -draw '%s'; edit=soffice -draw '%s';
test=test "$DISPLAY" != "" ; description="OpenOffice.org Drawing";
nametemplate=%s.sxd; priority=8
-application/vnd.sun.xml.draw.template; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Drawing
Template"; nametemplate=%s.std; priority=8
+###
+# shared-mime-info
+
+# OASIS OpenDocument Format
+application/vnd.oasis.opendocument.graphics; soffice -draw '%s'; edit=soffice
-draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument Drawing";
nametemplate=%s.odg; priority=9
+application/vnd.oasis.opendocument.graphics-template; soffice -draw '%s';
edit=soffice -draw '%s'; test=test -n "$DISPLAY"; description="OpenDocument
Drawing Template"; nametemplate=%s.otg; priority=9
+
+# OpenOffice.org 1.0
+application/vnd.sun.xml.draw; soffice -draw '%s'; edit=soffice -draw '%s';
test=test -n "$DISPLAY"; description="OpenOffice.org Drawing";
nametemplate=%s.sxd; priority=8
+application/vnd.sun.xml.draw.template; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Drawing Template";
nametemplate=%s.std; priority=8
+
+#
+###
=== modified file 'openoffice.org-filter-binfilter.mime'
--- a/openoffice.org-filter-binfilter.mime 2007-07-30 12:10:34 +0000
+++ b/openoffice.org-filter-binfilter.mime 2008-04-02 11:42:59 +0000
@@ -1,8 +1,14 @@
-application/vnd.stardivision.calc; soffice -calc '%s';edit=soffice -calc
'%s';test=test "$DISPLAY" != "" ;description="StarCalc 5.0";
nametemplate=%s.sdc; priority=5
-application/vnd.stardivision.chart; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test "$DISPLAY" != "" ; description="StarChart 5.0";
nametemplate=%s.sds; priority=5
-application/vnd.stardivision.draw; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test "$DISPLAY" != "" ; description="StarDraw 5.0";
nametemplate=%s.sda; priority=5
-application/vnd.stardivision.impress; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test "$DISPLAY" != "" ; description="StarImpress 5.0";
nametemplate=%s.sdd; priority=5
-application/vnd.stardivision.math; soffice -math '%s'; edit=soffice -math
'%s'; test=test "$DISPLAY" != "" ; description="StarMath 5.0";
nametemplate=%s.sdf; priority=5
-application/vnd.stardivision.writer-global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0 Master
Document"; nametemplate=%s.sgl; priority=5
-application/vnd.stardivision.writer; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="StarWriter 5.0";
nametemplate=%s.sdw; priority=5
-
+###
+# shared-mime-info
+
+# StarDivision StarOffice 5.0
+application/vnd.stardivision.calc; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test -n "$DISPLAY"; description="StarCalc 5.0"; nametemplate=%s.sdc;
priority=8
+application/vnd.stardivision.chart; soffice -calc '%s'; edit=soffice -calc
'%s'; test=test -n "$DISPLAY"; description="StarChart 5.0";
nametemplate=%s.sds; priority=8
+application/vnd.stardivision.draw; soffice -draw '%s'; edit=soffice -draw
'%s'; test=test -n "$DISPLAY"; description="StarDraw 5.0"; nametemplate=%s.sda;
priority=8
+application/vnd.stardivision.impress; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test -n "$DISPLAY"; description="StarImpress 5.0";
nametemplate=%s.sdd; priority=8
+application/vnd.stardivision.math; soffice -math '%s'; edit=soffice -math
'%s'; test=test -n "$DISPLAY"; description="StarMath 5.0"; nametemplate=%s.sdf;
priority=8
+application/vnd.stardivision.writer-global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0 Master
Document"; nametemplate=%s.sgl; priority=8
+application/vnd.stardivision.writer; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test -n "$DISPLAY"; description="StarWriter 5.0";
nametemplate=%s.sdw; priority=8
+
+#
+###
=== modified file 'openoffice.org-impress.mime'
--- a/openoffice.org-impress.mime 2007-09-11 18:35:28 +0000
+++ b/openoffice.org-impress.mime 2008-04-02 11:42:59 +0000
@@ -1,11 +1,32 @@
-application/vnd.oasis.opendocument.presentation; soffice -impress '%s';
edit=soffice -impress '%s'; test=test "$DISPLAY" != ""
;description="OpenDocument Presentation"; nametemplate=%s.odp
-application/vnd.oasis.opendocument.presentation-template; soffice -impress
'%s'; edit=soffice -impress '%s'; test=test "$DISPLAY" != ""
;description="OpenDocument Presentation Template"; nametemplate=%s.otp
-application/vnd.sun.xml.impress; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Presentation";
nametemplate=%s.sxi; priority=8
-application/vnd.sun.xml.impress.template; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org
Presentation Template"; nametemplate=%s.sti; priority=8
-application/mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
-application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
-application/x-mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.ppt; description="Microsoft
PowerPoint Document"; priority=3
-application/mspowerpoint; soffice -impress -show '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft
PowerPoint Document"; priority=3
-application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft
PowerPoint Document"; priority=3
-application/x-mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.pps; description="Microsoft
PowerPoint Document"; priority=3
-
+###
+# shared-mime-info
+
+# ECMA Office Open XML (Microsoft Office 2007)
+application/vnd.ms-powerpoint.presentation.macroEnabled.12; soffice -impress
'%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office
Open XML Presentation with Macros Enabled"; nametemplate=%s.pptm; priority=3
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12; soffice -impress
'%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office
Open XML Presentation Slide Show with Macros Enabled"; nametemplate=%s.ppsm;
priority=3
+application/vnd.ms-powerpoint.template.macroEnabled.12; soffice -impress '%s';
edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="Office Open
XML Presentation Template with Macros Enabled"; nametemplate=%s.potm; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.presentation;
soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY";
description="Office Open XML Presentation"; nametemplate=%s.pptx; priority=3
+application/vnd.openxmlformats-officedocument.presentationml.slideshow;
soffice -impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY";
description="Office Open XML Presentation Slide Show"; nametemplate=%s.ppsx;
priority=3
+application/vnd.openxmlformats-officedocument.presentationml.template; soffice
-impress '%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY";
description="Office Open XML Presentation Template"; nametemplate=%s.potx;
priority=3
+
+# Microsoft PowerPoint
+application/vnd.ms-powerpoint; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document";
nametemplate=%s.ppt; priority=3
+
+# OASIS OpenDocument Format
+application/vnd.oasis.opendocument.presentation; soffice -impress '%s';
edit=soffice -impress '%s'; test=test -n "$DISPLAY"; description="OpenDocument
Presentation"; nametemplate=%s.odp; priority=9
+application/vnd.oasis.opendocument.presentation-template; soffice -impress
'%s'; edit=soffice -impress '%s'; test=test -n "$DISPLAY";
description="OpenDocument Presentation Template"; nametemplate=%s.otp;
priority=9
+
+# OpenOffice.org 1.0
+application/vnd.sun.xml.impress; soffice -impress '%s'; edit=soffice -impress
'%s'; test=test -n "$DISPLAY"; description="OpenOffice.org Presentation";
nametemplate=%s.sxi; priority=8
+application/vnd.sun.xml.impress.template; soffice -impress '%s'; edit=soffice
-impress '%s'; test=test -n "$DISPLAY"; description="OpenOffice.org
Presentation Template"; nametemplate=%s.sti; priority=8
+
+#
+###
+
+###
+# KDE 3 (Obsolete)
+
+application/mspowerpoint; soffice -impress '%s'; edit=soffice -impress '%s';
test=test -n "$DISPLAY"; description="Microsoft PowerPoint Document";
nametemplate=%s.ppt; priority=3
+
+#
+###
=== modified file 'openoffice.org-math.mime'
--- a/openoffice.org-math.mime 2007-07-31 10:52:31 +0000
+++ b/openoffice.org-math.mime 2008-04-02 11:42:59 +0000
@@ -1,1 +1,14 @@
-application/vnd.oasis.opendocument.formula; soffice -math '%s'; edit=soffice
-math '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument Formula";
nametemplate=%s.odf
+###
+# shared-mime-info
+
+# Generic
+text/mathml; soffice -math '%s'; edit=soffice -math '%s'; test=test -n
"$DISPLAY"; description="MathML Formula"; nametemplate=%s.mml; priority=3
+
+# OASIS OpenDocument Format
+application/vnd.oasis.opendocument.formula; soffice -math '%s'; edit=soffice
-math '%s'; test=test -n "$DISPLAY"; description="OpenDocument Formula";
nametemplate=%s.odf; priority=9
+
+# OpenOffice.org 1.0
+application/vnd.sun.xml.math; soffice -math '%s'; edit=soffice -math '%s';
test=test -n "$DISPLAY"; description="OpenOffice.org Formula";
nametemplate=%s.sxm; priority=8
+
+#
+###
=== modified file 'openoffice.org-writer.mime'
--- a/openoffice.org-writer.mime 2007-07-31 10:52:31 +0000
+++ b/openoffice.org-writer.mime 2008-04-02 11:42:59 +0000
@@ -1,17 +1,46 @@
-application/vnd.oasis.opendocument.text; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ;description="OpenDocument Text";
nametemplate=%s.odt
-application/vnd.oasis.opendocument.text-template; soffice -writer '%s';
edit=soffice -writer '%s'; test=test "$DISPLAY" != ""
;description="OpenDocument Text Template"; nametemplate=%s.ott
-application/vnd.oasis.opendocument.text-web; ooweb '%s'; edit=ooweb '%s';
test=test "$DISPLAY" != "" ;description="OpenDocument HTML Document Template";
nametemplate=%s.oth
-application/vnd.oasis.opendocument.text-master; soffice -writer '%s';
edit=soffice -writer '%s'; test=test "$DISPLAY" != ""
;description="OpenDocument Master Document"; nametemplate=%s.odm
-application/vnd.sun.xml.writer; soffice -writer '%s'; edit=soffice -writer
'%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Text Document";
nametemplate=%s.sxw; priority=8
-application/vnd.sun.xml.writer.global; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Master
Document"; nametemplate=%s.sxg; priority=8
-application/vnd.sun.xml.writer.template; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test "$DISPLAY" != "" ; description="OpenOffice.org Text
Document Template"; nametemplate=%s.stw; priority=8
-application/msword; soffice -writer '%s'; edit=soffice -writer '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.doc; description="Microsoft Word Document";
priority=3
-application/vnd.ms-word; soffice -writer '%s'; edit=soffice -writer '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.doc; description="Microsoft Word
Document"; priority=3
-application/rtf; soffice -writer '%s'; edit=soffice -writer '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.rtf; description="Rich Text Format";
priority=3
-text/rtf; soffice -writer '%s'; edit=soffice -writer '%s'; test=test
"$DISPLAY" != ""; nametemplate=%s.rtf; description="Rich Text Format";
priority=3
-application/x-msword; soffice -writer '%s'; edit=soffice -writer '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.doc; description="Microsoft Word
Document"; priority=3
-application/wordperfect; soffice -writer '%s'; edit=soffice -writer '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.wpd; description="WordPerfect
Document"; priority=3
-application/wordperfect5.1; soffice -writer '%s'; edit=soffice -writer '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.wpd; description="WordPerfect
Document"; priority=3
-application/vnd.wordperfect; soffice -writer '%s'; edit=soffice -writer '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.wpd; description="WordPerfect
Document"; priority=3
-application/vnd.ms-works; soffice -writer '%s'; edit=soffice -writer '%s';
test=test "$DISPLAY" != ""; nametemplate=%s.wps^; description="Microsoft Works
Document"; priority=3
-
+###
+# shared-mime-info
+
+# Generic
+application/rtf; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n
"$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf; priority=3
+application/x-extension-txt; soffice -writer '%s'; edit=soffice -writer '%s';
test=test -n "$DISPLAY"; description="Plain Text Document";
nametemplate=%s.txt; priority=3
+application/x-t602; soffice -writer '%s'; edit=soffice -writer '%s'; test=test
-n "$DISPLAY"; description="T602 Document"; nametemplate=%s.602; priority=3
+
+# Corel WordPerfect
+application/vnd.wordperfect; soffice -writer '%s'; edit=soffice -writer '%s';
test=test -n "$DISPLAY"; description="WordPerfect Document";
nametemplate=%s.wp; priority=3
+
+# ECMA Office Open XML (Microsoft Office 2007)
+application/vnd.ms-word.document.macroEnabled.12; soffice -writer '%s';
edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Office Open
XML Document with Macros Enabled"; nametemplate=%s.docm; priority=3
+application/vnd.ms-word.template.macroEnabled.12; soffice -writer '%s';
edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="Office Open
XML Document Template with Macros Enabled"; nametemplate=%s.dotm; priority=3
+application/vnd.openxmlformats-officedocument.wordprocessingml.document;
soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY";
description="Office Open XML Document"; nametemplate=%s.docx; priority=3
+application/vnd.openxmlformats-officedocument.wordprocessingml.template;
soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n "$DISPLAY";
description="Office Open XML Document Template"; nametemplate=%s.dotx;
priority=3
+
+# Microsoft Word
+application/msword; soffice -writer '%s'; edit=soffice -writer '%s'; test=test
-n "$DISPLAY"; description="Microsoft Word Document"; nametemplate=%s.doc;
priority=3
+
+# Microsoft Works
+application/vnd.ms-works; soffice -writer '%s'; edit=soffice -writer '%s';
test=test -n "$DISPLAY"; description="Microsoft Works Document";
nametemplate=%s.wps; priority=3
+
+# OASIS OpenDocument Format
+application/vnd.oasis.opendocument.text; soffice -writer '%s'; edit=soffice
-writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument Text
Document"; nametemplate=%s.odt; priority=9
+application/vnd.oasis.opendocument.text-master; soffice -global '%s';
edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument
Master Document"; nametemplate=%s.odm; priority=9
+application/vnd.oasis.opendocument.text-template; soffice -writer '%s';
edit=soffice -writer '%s'; test=test -n "$DISPLAY"; description="OpenDocument
Text Document Template"; nametemplate=%s.ott; priority=9
+application/vnd.oasis.opendocument.text-web; soffice -web '%s'; edit=soffice
-web '%s'; test=test -n "$DISPLAY"; description="OpenDocument HTML Document
Template"; nametemplate=%s.oth; priority=9
+
+# OpenOffice.org 1.0
+application/vnd.sun.xml.writer; soffice -writer '%s'; edit=soffice -writer
'%s'; description="OpenOffice.org Text Document"; nametemplate=%s.sxw;
priority=8
+application/vnd.sun.xml.writer.global; soffice -global '%s'; edit=soffice
-writer '%s'; description="OpenOffice.org Master Document";
nametemplate=%s.sxg; priority=8
+application/vnd.sun.xml.writer.template; soffice -writer '%s'; edit=soffice
-writer '%s'; description="OpenOffice.org Text Document Template";
nametemplate=%s.stw; priority=8
+
+#
+###
+
+###
+# KDE 3 (Obsolete)
+
+application/wordperfect; soffice -writer '%s'; edit=soffice -writer '%s';
test=test -n "$DISPLAY"; description="WordPerfect Document";
nametemplate=%s.wp; priority=3
+text/plain; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n
"$DISPLAY"; description="Plain Text Document"; nametemplate=%s.txt; priority=3
+text/rtf; soffice -writer '%s'; edit=soffice -writer '%s'; test=test -n
"$DISPLAY"; description="Rich Text Format"; nametemplate=%s.rtf; priority=3
+
+#
+###
=== modified file 'rules'
--- a/rules 2008-04-10 11:22:15 +0000
+++ b/rules 2008-04-15 12:10:58 +0000
@@ -37,6 +37,9 @@
ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
DIST := $(shell lsb_release -is)
DISTREL := $(shell lsb_release -cs)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
# Figure out who's building this package.
OOO_VENDOR:=Debian
ifeq "$(DIST)" "Ubuntu"
@@ -91,7 +94,7 @@
ENABLE_JAVA=y
ENABLE_MONO=y
MONO_MINVER= (>= 1.2.3)
-USE_SYSTEM_HUNSPELL=n
+USE_SYSTEM_HUNSPELL=y
HUNSPELL_MIN_VER= (>= 1.1.5-2)
SYSTEM_ALTLINUXHYPH=y
USE_LIBHYPHEN=y
@@ -185,7 +188,8 @@
--enable-lockdown \
--enable-openxml \
--with-drink=coffee \
- --libdir=/usr/lib
+ --libdir=/usr/lib \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
# distro-configs is too late; it already gets searched in unpack
# when we don't do that here, too.
@@ -258,7 +262,7 @@
OOO_OGLTRANS_ARCHS+= ia64
endif
ifeq (,$(findstring $(ARCH),$(OOO_OGLTRANS_ARCHS)))
- ENABLE_OGLTRANS=n
+ ENABLE_OPENGL=n
endif
OOO_ARCHS= i386 powerpc sparc mips mipsel armel s390
@@ -272,7 +276,7 @@
OOO_ARCHS += ia64
endif
# Java...
-OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel armel s390
+OOO_JAVA_ARCHS = i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
OOO_JAVA_ARCHS+= amd64
endif
@@ -303,7 +307,7 @@
ENABLE_MONO=n
endif
# Mozilla plugin. Crashes on amd64
-OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel armel s390
+OOO_NPSOPLUGIN_ARCHS = i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
ifeq "$(ARCH)" "amd64"
PACKAGE_NPSOPLUGIN=n
@@ -342,7 +346,7 @@
endif
endif
-OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel armel s390
+OOO_MOZILLA_ARCHS=i386 powerpc sparc mips mipsel s390
ifeq "$(BUILD_AMD64)" "y"
OOO_MOZILLA_ARCHS += amd64
endif
@@ -352,6 +356,9 @@
ifeq "$(BUILD_IA64)" "y"
OOO_MOZILLA_ARCHS += ia64
endif
+ifeq (,$(findstring $(ARCH),$(OOO_MOZILLA_ARCHS)))
+ MOZILLA=
+endif
# We only build the main openoffice.org packages on those architectures where
it works
# all other architectures build libmythes-dev
@@ -557,7 +564,7 @@
# JAVA_RUNTIME_DEPENDS += | $(GCJ_JAWT_DEPENDS)
# endif
ifneq (,$(filter $(ARCH), amd64 i386 powerpc))
- JAVA_RUNTIME_DEPENDS += | icedtea-java7-jre
+ JAVA_RUNTIME_DEPENDS += | openjdk-6-jre
endif
ifneq (,$(filter $(ARCH), amd64 i386))
JAVA_RUNTIME_DEPENDS += | sun-java5-jre | sun-java6-jre
@@ -674,7 +681,7 @@
CONFIGURE_FLAGS += --without-stlport
else
ifeq "$(USE_SYSTEM_STLPORT)" "y"
- LIBSTLPORT_MINVER= (>= 4.6.2-3)
+ LIBSTLPORT_MINVER= (>= 4.6.2-3.1)
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
@@ -1819,8 +1826,12 @@
# Also the native jar build is MUCH faster with this. But it
# won't be accepted into the official java-gcj-compat package so this
# hack here is needed.
- cp /usr/share/pycentral/java-gcj-compat-dev/site-packages/aotcompile.py
\
- debian/scripts
+ if [ -e /usr/share/pyshared/aotcompile.py ]; then \
+ aotcompile_py=/usr/share/pyshared/aotcompile.py; \
+ else \
+
aotcompile_py=/usr/share/pycentral/java-gcj-compat-dev/site-packages/aotcompile.py;
\
+ fi && \
+ cp $$aotcompile_py debian/scripts
cd debian/scripts && \
patch -p0 < $(CURDIR)/debian/aotcompile-256M-default.diff
PYTHONPATH="debian/scripts:$(shell echo $(PYTHON_SITE) | sed -e
s,debian/python-uno,,)" \
@@ -2973,6 +2984,12 @@
debian/openoffice.org$(VER)-officebean/DEBIAN/control
endif
endif
+ifeq "$(SYSTEM_ALTLINUXHYPH)" "y"
+ ifeq "$(USE_LIBHYPHEN)" "y"
+ perl -pi -e "s/libhyphen0/libhyphen0 (>= 2.3.1-3)/" \
+ debian/openoffice.org$(VER)-core/DEBIAN/control
+ endif
+endif
ifeq "$(ENABLE_REPORTDESIGN)" "y"
dh_gencontrol -popenoffice.org$(VER)-report-builder -- \
-V'report-builder-jar-depends=$(REPORT_BUILDER_JAR_DEPENDS)' \
