------------------------------------------------------------
revno: 774
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Wed 2007-07-04 01:15:39 +0200
message:
some m219 updates, m219 is not yet released, but...
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-07-03 22:26:03 +0000
+++ b/changelog 2007-07-03 23:15:39 +0000
@@ -1,18 +1,23 @@
-openoffice.org (2.3.0~src680m216-0.1pre) experimental; urgency=low
+openoffice.org (2.3.0~src680m219-0.1pre) experimental; urgency=low
- * new upstream snapshot (SRC680_m216)
+ * new upstream snapshot (SRC680_m219)
- fixes joining cells in writer tables (closes: #218281)
- - fixes text width in PDF export (closes: 408209)
+ - fixes text width in PDF export (closes: #408209)
+ - adds fy_NL localedata (closes: #413205)
* debian/rules, debian/Adobe-Core35_AFMs-314.tar.gz.uu: remove, unneeded
* debian/rules:
- update for 2.3
+ - add ppc64 test-wise
+ - reenable mr-IN since now reported to be fixed
+ - build-depend on libneon26 again, got fixed and is the only supported
+ version since m219 anyway
* debian/control.in:
- build-depend on libxml-parser-perl
* ooo-build:
- use trunk again
- - update (r9698)
+ - update (r9702)
- -- Rene Engelhard <[EMAIL PROTECTED]> Tue, 3 Jul 2007 17:36:32 +0200
+ -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 4 Jul 2007 00:38:31 +0200
openoffice.org (2.2.1-4) unstable; urgency=low
=== modified file 'control'
--- a/control 2007-07-03 22:26:03 +0000
+++ b/control 2007-07-03 23:15:39 +0000
@@ -3,13 +3,13 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc
amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc
amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64],
sharutils [i386 powerpc sparc amd64], pkg-config [i386 powerpc sparc amd64],
xutils [i386 powerpc sparc amd64], libfontconfig1-dev [i386 powerpc sparc
amd64], binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc],
zlib1g-dev [i386 powerpc sparc amd64], libfreetype6-dev [i386 powerpc sparc
amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc
amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc
amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc
amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc
sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64],
libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386
powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev
[i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64],
libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc
amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc
sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386
powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386
powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], libxkbfile-dev [i386
powerpc sparc amd64], libxinerama-dev [i386 powerpc sparc amd64],
x11proto-render-dev [i386 powerpc sparc amd64], unixodbc-dev (>= 2.2.11) [i386
powerpc sparc amd64], libdb4.4-dev [i386 powerpc sparc amd64],
libxml-parser-perl [i386 powerpc sparc amd64] , libcurl3-gnutls-dev [i386
powerpc sparc amd64] , python-central (>= 0.5) [i386 powerpc sparc amd64],
debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386 powerpc sparc amd64] ,
dpkg-dev (>= 1.13.19) , xvfb [i386 powerpc sparc amd64], xbase-clients [i386
powerpc sparc amd64], xfonts-base [i386 powerpc sparc amd64] ,
java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5)
[i386 powerpc sparc amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc
amd64] , libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>=
2.6.0-1) [i386 powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64]
, mingw32 [i386 powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64],
libnss3-dev [i386 powerpc sparc amd64] , 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] , libaltlinuxhyph-dev
(>= 0.1.1-11) [i386 powerpc sparc amd64] , libstlport5.1-dev (>= 5.0.99rc2-5)
[i386 powerpc sparc amd64] , portaudio19-dev [i386 powerpc sparc amd64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libwps-dev [i386 powerpc
sparc amd64] , libicu36-dev [i386 powerpc sparc amd64] , libxslt1-dev [i386
powerpc sparc amd64] , libcairo2-dev [i386 powerpc sparc amd64],
libglitz-glx1-dev [i386 powerpc sparc amd64] , kdelibs4-dev (>= 4:3.4.3-2)
[i386 powerpc sparc amd64] , libhsqldb-java (>= 1.8.0.0-2) [i386 powerpc sparc
amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc amd64] , liblpsolve55-dev (>=
5.5.0.10-2) [i386 powerpc sparc amd64], lp-solve (>= 5.5.0.10-2) [i386 powerpc
sparc amd64] , libufsparse-dev [i386 powerpc sparc amd64] , libdbus-glib-1-dev
(>= 0.60) [i386 powerpc sparc amd64] , libgstreamer-plugins-base0.10-dev [i386
powerpc sparc amd64] , libneon25-dev [i386 powerpc sparc amd64] , libgtk2.0-dev
(>= 2.10) [i386 powerpc sparc 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], dmake (>= 1:4.6) [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],
imagemagick [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], libdb4.4-dev [i386 powerpc sparc amd64 ppc64]
libxml-parser-perl [i386 powerpc sparc amd64 ppc64], , libcurl3-gnutls-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] , dpkg-dev (>= 1.13.19) , xvfb [i386 powerpc sparc amd64 ppc64],
xbase-clients [i386 powerpc sparc amd64 ppc64], xfonts-base [i386 powerpc sparc
amd64 ppc64] , java-gcj-compat-dev (>= 1.0.65-4) [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] , libdb4.4-java [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] , 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] , libstlport5.1-dev (>= 5.0.99rc2-5)
[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] , libicu36-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.0-2) [i386 powerpc sparc amd64 ppc64] , bsh (>= 2.0b4-1) [i386
powerpc sparc amd64 ppc64] , liblpsolve55-dev (>= 5.5.0.10-2) [i386 powerpc
sparc amd64 ppc64], lp-solve (>= 5.5.0.10-2) [i386 powerpc sparc amd64 ppc64] ,
libufsparse-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] , libneon26-dev [i386 powerpc sparc amd64 ppc64] ,
libgtk2.0-dev (>= 2.10) [i386 powerpc sparc amd64 ppc64]
Build-Conflicts: libcairo2 (= 1.4.8-1)
Standards-Version: 3.7.2
XS-Python-Version: current
Package: openoffice.org
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
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-binfilter-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 | ttf-bitstream-vera, openoffice.org-hyphenation,
openoffice.org2-thesaurus, libxrender1, libgl1, msttcorefonts,
openoffice.org-gnome | openoffice.org-kde, iceweasel | firefox | icedove |
thunderbird | iceape-browser | mozilla-browser, openoffice.org-officebean,
java-gcj-compat | j2re1.4 | java2-runtime, openclipart-openoffice.org,
pstoedit, imagemagick, libpaper-utils, ${gstreamer-plugins-suggests}
Conflicts: openoffice.org2 (<< ${Source-Version})
@@ -97,7 +97,7 @@
indic languages.
Package: openoffice.org-core
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-common (>> ${base-version}), ttf-opensymbol,
${shlibs:Depends}, fontconfig, debconf (>= 1.2.0) | debconf-2.0,
${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)
@@ -138,7 +138,7 @@
the Java support for OpenOffice.org (Java classes, scripts, config snippets).
Package: openoffice.org-writer
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${writer-pyuno-dep}
Recommends: ${ooo-binfilter-dep}, gij | java-gcj-compat | j2re1.4 |
java2-runtime ${java-common-depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-writer (<< ${Source-Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
@@ -152,7 +152,7 @@
This package contains the wordprocessor component for OpenOffice.org.
Package: openoffice.org-calc
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${lpsolve-dep}
Replaces: openoffice.org2-core (<< 1.9.113-0pre1), openoffice.org (<< 1.9),
openoffice.org-debian-files, openoffice.org-core (<= 2.2.0-4),
openoffice.org2-calc (<< ${Source-Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-calc (<< ${Source-Version})
@@ -164,7 +164,7 @@
This package contains the spreadsheet component for OpenOffice.org.
Package: openoffice.org-impress
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-draw (=
${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-impress (<< ${Source-Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Provides: openoffice.org2-impress
@@ -176,7 +176,7 @@
This package contains the presentation component for OpenOffice.org.
Package: openoffice.org-draw
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-draw (<< ${Source-Version}), openoffice.org-core (<<
2.2.1~rc3-3), openoffice.org-common (<< 2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-draw (<<
${Source-Version})
@@ -188,7 +188,7 @@
This package contains the drawing component for OpenOffice.org.
Package: openoffice.org-math
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org (<< 1.9), openoffice.org-debian-files,
openoffice.org2-math (<< ${Source-Version}), openoffice.org-common (<<
2.0.3+2.0.4m179)
Conflicts: openoffice.org-debian-files, openoffice.org2-math (<<
${Source-Version})
@@ -200,7 +200,7 @@
This package contains the equation editor component for OpenOffice.org.
Package: openoffice.org-base
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}, gij |
java-gcj-compat | j2re1.4 | java2-runtime, ${base-hsqldb-depends},
${java-common-depends} (>> 2.2.0-4)
Suggests: unixodbc, libmyodbc | odbc-postgresql | libsqliteodbc | tdsodbc |
mdbtools, libmysql-java | libpg-java | libsapdbc-java, openoffice.org-gcj
Replaces: openoffice.org-core (<< 2.0.1), openoffice.org-common (<<
1.9.113-0pre1), openoffice.org-bin (<< 1.9), openoffice.org-debian-files,
openoffice.org2-base (<< ${Source-Version}), openoffice.org-java
@@ -290,7 +290,7 @@
enabled in the OpenOffice.org option menu.
Package: openoffice.org-kde
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}),
openoffice.org-style-crystal, ${shlibs:Depends}
Suggests: konqueror, kmail, kaddressbook
Section: kde
@@ -312,7 +312,7 @@
Package: openoffice.org-gtk
Conflicts: ooqstart-gnome, oooqs-kde
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}),
openoffice.org-style-tango, ${shlibs:Depends}
Section: gnome
Enhances: openoffice.org
@@ -326,7 +326,7 @@
contains a QuickStarter for the "notification area".
Package: openoffice.org-gnome
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-gtk,
${shlibs:Depends}, gconf2
Suggests: openoffice.org-evolution
Section: gnome
@@ -346,7 +346,7 @@
* evolution
Package: openoffice.org-evolution
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Section: gnome
Depends: openoffice.org-core (= ${Source-Version}), openoffice.org-base,
${shlibs:Depends}
Recommends: evolution
@@ -364,7 +364,7 @@
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Section: python
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Enhances: openoffice.org
Depends: openoffice.org-core (= ${Source-Version}), ${python:Depends},
${shlibs:Depends}
Replaces: openoffice.org-common (<< 1.9.82)
@@ -379,7 +379,7 @@
http://udk.openoffice.org/python/python-bridge.html
Package: openoffice.org-officebean
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Section: misc
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${jawt-depends}, ${java-common-depends} (>> 2.2.0-4)
Replaces: openoffice.org-common (<< 1.9.113-0pre1), openoffice.org2-officebean
@@ -394,7 +394,7 @@
Package: openoffice.org-filter-binfilter
Section: misc
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends}
Replaces: openoffice.org2-core (<= 1.9.108-1), openoffice.org-math (<<
1.9.113-0pre1), openoffice.org-calc (<< 1.9.113-0pre1),
openoffice.org2-filter-so52, openoffice.org-filter-so52
Provides: openoffice.org2-filter-so52, openoffice.org-filter-so52
@@ -1623,6 +1623,36 @@
For latest news on OpenOffice.org in Debian, see
http://openoffice.debian.net
+Package: openoffice.org-l10n-mr-in
+Architecture: all
+Depends: locales | belocs-locales-data | locales-all
+Recommends: openoffice.org-core (>> ${base-version}) | language-support-mr ,
ttf-devanagari-fonts
+Provides: openoffice.org-l10n-${help-l10n-virtual-version},
openoffice.org2-l10n-mr-in
+Suggests: hunspell-dictionary-mr-in | myspell-dictionary-mr-in,
openoffice.org-hyphenation-mr-in, openoffice.org2-thesaurus-mr-in,
openoffice.org-help-mr-in
+Conflicts: openoffice.org-core (<< ${base-version}), openoffice.org-core (>=
${base-version}.1), openoffice.org2-l10n-mr-in
+Replaces: openoffice.org2-l10n-mr-in
+Description: Marathi language package for OpenOffice.org
+ OpenOffice.org is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the localization of OpenOffice.org in
+ Marathi.
+ It contains the user interface, the templates and the autotext features.
+ (please note that not all this is available for all possible languages).
+ You can switch user interface language using the locales system.
+ .
+ Spelling dictionaries, hyphenation patterns, thesauri and help are not
+ included in this package. There are some available in separate packages
+ (myspell-*, openoffice.org-hyphenation-*, openoffice.org-thesaurus-*,
+ openoffice.org-help-*)
+ .
+ If you just want to be able to spellcheck etc. in other languages, you can
+ install extra dictionaries/hyphenation patterns/thesauri independently of
+ the language packs.
+ .
+ For latest news on OpenOffice.org in Debian, see
+ http://openoffice.debian.net
+
Package: openoffice.org-l10n-nb
Architecture: all
Depends: locales | belocs-locales-data | locales-all
@@ -3023,7 +3053,7 @@
Package: openoffice.org-gcj
Section: libs
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: ${shlibs:Depends}, gij | java-gcj-compat, openoffice.org-core (=
${Source-Version}), openoffice.org-java-common (= ${source:Version}),
${java-gcj-depends}
Enhances: openoffice.org-writer, openoffice.org-base
Description: OpenOffice.orgs Java libraries (native for use with GIJ)
@@ -3054,7 +3084,7 @@
Depends: openoffice.org (>> ${base-version}), openoffice.org-filter-so52,
openoffice.org-java-common
Recommends: openoffice.org-qa-api-tests, openoffice.org-qa-ui-tests
Replaces: openoffice.org-common (<< 2.0.4~ood680m2)
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Description: OpenOffice.org Automatic Test Programs
OpenOffice.org is a full-featured office productivity suite that provides
a near drop-in replacement for Microsoft(R) Office.
@@ -3080,7 +3110,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
@@ -3108,7 +3138,7 @@
Package: openoffice.org-dbg
Section: devel
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Priority: extra
Suggests: ${dbg-dbg-suggests}
Description: OpenOffice.org debug symbols
@@ -3120,7 +3150,7 @@
Package: openoffice.org-dev
Section: devel
-Architecture: i386 powerpc sparc amd64
+Architecture: i386 powerpc sparc amd64 ppc64
Depends: openoffice.org-core (= ${Source-Version}), ${shlibs:Depends},
${dev-stl-depends}
Recommends: dmake, g++, java-gcj-compat-dev, ${java-common-depends}
Suggests: openoffice.org-dev-doc, libmythes-dev, c-shell
=== modified file 'rules'
--- a/rules 2007-07-03 22:26:03 +0000
+++ b/rules 2007-07-03 23:15:39 +0000
@@ -54,7 +54,7 @@
SRCNUM=680
MWS=SRC680
#MILESTONE:=$(shell echo "$(UPSTREAM_VERSION)" | cut -d~ -f2 | sed -e
s/$(shell echo $(MWS) | tr A-Z a-z)//)
-MILESTONE=m216
+MILESTONE=m219
TAG=$(shell echo $(MWS) | tr A-Z a-z)-$(MILESTONE)
#TAG=$(MWS)_$(MILESTONE)
#OOO_BUILD_BRANCH=ooo-build-2-2
@@ -74,6 +74,7 @@
# Default package configuration
#
BUILD_AMD64=y
+BUILD_PPC64=y
PATCHSET=$(DIST)
BUILD_DEPS=
BUILD_PYUNO=y
@@ -197,11 +198,17 @@
ifeq "$(BUILD_AMD64)" "y"
OOO_ARCHS += amd64
endif
+ifeq "$(BUILD_PPC64)" "y"
+ OOO_ARCHS += ppc64
+endif
# Java...
OOO_JAVA_ARCHS = i386 powerpc sparc
ifeq "$(BUILD_AMD64)" "y"
OOO_JAVA_ARCHS+= amd64
endif
+ifeq "$(BUILD_PPC64)" "y"
+ OOO_JAVA_ARCHS+= ppc64
+endif
ifeq (,$(findstring $(ARCH),$(OOO_JAVA_ARCHS)))
ENABLE_JAVA=n
endif
@@ -219,6 +226,9 @@
ifeq "$(ARCH)" "amd64"
PATCHSET:=$(PATCHSET)64
endif
+ifeq "$(ARCH)" "ppc64"
+ PATCHSET:=$(PATCHSET)64
+endif
ifeq "$(ARCH)-linux-gnu" "sparc-linux-gnu"
# use 32-bit compiler
@@ -236,6 +246,11 @@
BUILD_ONLY_LIBMYTHES=y
endif
endif
+ ifeq "$(ARCH)" "ppc64"
+ ifneq "$(BUILD_AMD64)" "y"
+ BUILD_ONLY_LIBMYTHES=y
+ endif
+ endif
endif
endif
@@ -296,7 +311,7 @@
#ISOS=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
ISOS:=en-US af as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
- ka ko ku lo lt lv mk ml-IN nb ne nl nn nr ns or-IN pa-IN \
+ ka ko ku lo lt lv mk ml-IN mr-IN nb ne nl nn nr ns or-IN pa-IN \
pl pt pt-BR ru rw sk sl sr-CS ss st sv \
ta-IN te-IN tg th tn tr ts uk ve vi xh zh-CN zh-TW zu
#HELPISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
@@ -305,7 +320,7 @@
#LANGPACKISOS:=$(shell ooo-build/bin/openoffice-xlate-lang -i all')
LANGPACKISOS:=en-US af as-IN be-BY bg bn br bs ca cs cy da de dz el \
en-GB en-ZA eo es et fa fi fr ga gl gu-IN he hi-IN hr hu it ja \
- ka ko ku lo lt lv mk ml-IN nb ne nl nn nr ns or-IN pa-IN \
+ ka ko ku lo lt lv mk ml-IN mr-IN nb ne nl nn nr ns or-IN pa-IN \
pl pt pt-BR ru rw sk sl sr-CS ss st sv \
ta-IN te-IN tg th tn tr ts uk ve vi xh zh-CN zh-TW zu
endif
@@ -585,8 +600,8 @@
endif
ifeq "$(USE_SYSTEM_NEON)" "y"
- BUILD_DEPS += , libneon25-dev [$(OOO_ARCHS)]
- DBG_DBG_SUGGESTS+= , libneon25-dbg
+ BUILD_DEPS += , libneon26-dev [$(OOO_ARCHS)]
+ DBG_DBG_SUGGESTS+= , libneon26-dbg
CONFIGURE_FLAGS += --with-system-neon
endif
@@ -2312,14 +2327,6 @@
rm -f $(PKGDIR)-core/$(OODIR)/program/*updchk*
- # add iceape/icedove/iceweasel to senddoc and open-url
- perl -pi -e 's,mozilla \| netscape \| seamonkey \| thunderbird,iceape |
seamonkey | mozilla | netscape | icedove | thunderbird,' \
- $(PKGDIR)-common/$(OODIR)/program/senddoc
- perl -pi -e 's/firefox mozilla netscape/iceweasel firefox iceape
mozilla netscape/' \
- $(PKGDIR)-common/$(OODIR)/program/open-url
- perl -pi -e 's/thunderbird mozilla netscape/icedove thunderbird iceape
mozilla netscape/' \
- $(PKGDIR)-common/$(OODIR)/program/open-url
-
ifneq "$(DIST)" "Ubuntu"
perl -pi -e "s/Ubuntu helper/helper/"
$(PKGDIR)-common/$(OODIR)/program/soffice
perl -pi -e "s/Ubuntu config/config/"
$(PKGDIR)-common/$(OODIR)/program/soffice
