------------------------------------------------------------
revno: 1010
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Sat 2008-02-23 09:28:02 +0100
message:
Replace non-working link to license.html with link to
http://www.gnu.org/licenses/lgpl.html
- openoffice$(VER) -> $(OODIRNAME)
- build against libsuitesparse-3.1.0; adapt build-depends to require
the new version (and the lp-solve built against libsuitesparse-3.1.0)
- update ooo-build
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2008-02-20 23:16:47 +0000
+++ b/changelog 2008-02-23 08:28:02 +0000
@@ -1,7 +1,7 @@
openoffice.org (1:2.4.0~rc1-2.3pre) unstable; urgency=low
* ooo-build:
- - update (r11619)
+ - update (r11680)
+ cws-ia64port01.diff: backport ia64 port
* debian/rules:
- use readlink -f for determining libstlport_gcc.so.4.6s location
@@ -14,13 +14,18 @@
- build with libdb4.6 (closes: #464754)
- add symlink /usr/share/doc/openoffice.org-dev/index.html ->
/usr/lib/openoffice/sdk/index.html. Is the other way around like
- the submitter suggested but still closes: #420803 AFAIS
+ the submitter suggested but still closes: #420803 AFAIS.
+ Replace non-working link to license.html with link to
+ http://www.gnu.org/licenses/lgpl.html
+ - openoffice$(VER) -> $(OODIRNAME)
+ - build against libsuitesparse-3.1.0; adapt build-depends to require
+ the new version (and the lp-solve built against libsuitesparse-3.1.0)
* debian/control.in:
- only recommend openoffice.org-writer2latex at -writer. Add it
to the "openoffice.org" metapackage as Depends (closes: #466170)
- only suggest -style-{hicontrast,industrial} (closes: #466494)
- -- Rene Engelhard <[EMAIL PROTECTED]> Thu, 21 Feb 2008 00:13:55 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Fri, 22 Feb 2008 11:51:19 +0100
openoffice.org (1:2.4.0~rc1-2) unstable; urgency=low
=== modified file 'control'
--- a/control 2008-02-20 21:25:19 +0000
+++ b/control 2008-02-23 08:28:02 +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 arm armel amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], autoconf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
sharutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
pkg-config [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xutils
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libfontconfig1-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], libstartup-notification0-dev [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], libsndfile1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], xsltproc [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], fdupes [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
xml-core [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64] , libgl1-mesa-dev [i386 powerpc sparc amd64 ppc64 ia64], libglu1-mesa-dev
[i386 powerpc sparc amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64] , python-dev (>= 2.4) [i386
powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , debhelper (>= 5.0.51~)
, java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel amd64
ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64]
, ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] ,
libxerces2-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] ,
libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64] , mingw32 [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] ,
libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], libsac-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64],
libxml-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel armel
amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel armel amd64
ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64
ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel
amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel 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 arm armel
amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libvigraimpex-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwpd8-dev (>=
0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libicu-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libxslt1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libcairo2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel
armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel
armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-4) [i386 powerpc sparc
mips mipsel arm amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-4) [i386 powerpc sparc
mips mipsel arm amd64 ppc64 ia64] , libsuitesparse-dev [i386 powerpc sparc mips
mipsel arm amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64 ia64] , libgstreamer-plugins-base0.10-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libneon27-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libgtk2.0-dev (>=
2.10) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64 ia64], flex-old [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64], libpam0g-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64], libxaw7-dev [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64 ia64], unzip [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], zip [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], autoconf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
sharutils [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
pkg-config [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], xutils
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], libfontconfig1-dev
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64], binutils (>=
2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64], libfreetype6-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64], libx11-dev [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64 ia64], libsm-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64], libxt-dev [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64 ia64], libxext-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64 ia64], libice-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], libsane-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libxrender-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libcupsys2-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libarchive-zip-perl [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], libstartup-notification0-dev [i386 powerpc sparc mips mipsel
arm armel amd64 ppc64 ia64], libpng12-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64 ia64], libjpeg62-dev [i386 powerpc sparc mips mipsel arm
armel amd64 ppc64 ia64], libxml2-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], libldap2-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libexpat1-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libgnomevfs2-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], fastjar [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], libsndfile1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], xsltproc [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
graphicsmagick-imagemagick-compat [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64], netpbm [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], fdupes [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
xml-core [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
libxkbfile-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
libxinerama-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
x11proto-render-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64], unixodbc-dev (>= 2.2.11) [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libxml-parser-perl [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], gperf [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64],
libpq-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
dpkg-dev (>= 1.14.11) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64] , libgl1-mesa-dev [i386 powerpc sparc amd64 ppc64 ia64], libglu1-mesa-dev
[i386 powerpc sparc amd64 ppc64 ia64] , libcurl4-openssl-dev [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64] , libssl-dev [i386 powerpc sparc
mips mipsel arm armel amd64 ppc64 ia64] , libdb4.6-dev [i386 powerpc sparc mips
mipsel arm armel amd64 ppc64 ia64] , python-central (>= 0.5) [i386 powerpc
sparc mips mipsel arm armel amd64 ppc64 ia64] , python-dev (>= 2.4) [i386
powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , debhelper (>= 5.0.51~)
, java-gcj-compat-dev (>= 1.0.65-4) [i386 powerpc sparc mips mipsel armel amd64
ppc64 ia64], libgcj-bc [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64]
, ant (>= 1.6.5) [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] ,
libxerces2-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] ,
libxalan2-java (>= 2.6.0-1) [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64] , mingw32 [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64] ,
libjcommon-java (>= 1.0.10) [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], libsac-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64],
libxml-java [i386 powerpc sparc mips mipsel armel amd64 ppc64 ia64],
libflute-1.3-jfree-java [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], libpentaho-reporting-flow-engine-java [i386 powerpc sparc mips mipsel
armel amd64 ppc64 ia64], liblayout-java [i386 powerpc sparc mips mipsel armel
amd64 ppc64 ia64], libloader-java [i386 powerpc sparc mips mipsel armel amd64
ppc64 ia64], libformula-java [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], librepository-java [i386 powerpc sparc mips mipsel armel amd64 ppc64
ia64], libfonts-java (>= 0.2.6) [i386 powerpc sparc mips mipsel armel amd64
ppc64 ia64], libjcommon-serializer-java [i386 powerpc sparc mips mipsel armel
amd64 ppc64 ia64] , libxul-dev [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64], libnss3-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64
ia64] , dmake (>= 1:4.11) [i386 powerpc sparc mips mipsel arm armel 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 arm armel
amd64 ppc64 ia64] , libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libvigraimpex-dev [i386
powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] , libwpd8-dev (>=
0.8.3-3) [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libwps-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libwpg-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libicu-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libxslt1-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libcairo2-dev [i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc mips mipsel arm armel amd64
ppc64 ia64] , libhsqldb-java (>= 1.8.0.9-1) [i386 powerpc sparc mips mipsel
armel amd64 ppc64 ia64] , bsh (>= 2.0b4-1) [i386 powerpc sparc mips mipsel
armel amd64 ppc64 ia64] , liblpsolve55-dev (>= 5.5.0.10-10) [i386 powerpc sparc
mips mipsel arm amd64 ppc64 ia64], lp-solve (>= 5.5.0.10-10) [i386 powerpc
sparc mips mipsel arm amd64 ppc64 ia64] , libsuitesparse-dev (>> 3.1.0) [i386
powerpc sparc mips mipsel arm amd64 ppc64 ia64] , libdbus-glib-1-dev (>= 0.60)
[i386 powerpc sparc mips mipsel arm armel amd64 ppc64 ia64] ,
libgstreamer-plugins-base0.10-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64] , libneon27-dev [i386 powerpc sparc mips mipsel arm armel
amd64 ppc64 ia64] , libgtk2.0-dev (>= 2.10) [i386 powerpc sparc mips mipsel arm
armel 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, 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
=== modified file 'rules'
--- a/rules 2008-02-20 23:16:47 +0000
+++ b/rules 2008-02-23 08:28:02 +0000
@@ -16,7 +16,8 @@
#VER:=2
SHELL:=/bin/bash
PKGDIR:=debian/openoffice.org$(VER)
-OODIR:=usr/lib/openoffice$(VER)
+OODIRNAME=openoffice$(VER)
+OODIR:=usr/lib/$(OODIRNAME)
PKGSOURCE := $(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2;exit 0}')
SOURCE_VERSION:=$(shell head -1 debian/changelog | cut -d\( -f2 | cut -d\) -f1)
@@ -125,7 +126,7 @@
ENABLE_SCSOLVER=y
USE_SYSTEM_LPSOLVE=y
USE_SHARED_LPSOLVE=y
-LPSOLVE_MIN_VERSION= (>= 5.5.0.10-4)
+LPSOLVE_MIN_VERSION= (>= 5.5.0.10-10)
USE_DBUS=y
USE_GSTREAMER=y
USE_SYSTEM_NEON=y
@@ -168,7 +169,7 @@
--with-distro=$(PATCHSET) \
--with-vendor='$(OOO_VENDOR)' \
--enable-package-directories \
- --with-installed-ooo-dirname=openoffice$(VER) \
+ --with-installed-ooo-dirname=$(OODIRNAME) \
--mandir=/usr/share/man \
--with-docdir=/usr/share/doc/openoffice.org \
--with-lang="$(BUILD_ISOS)" \
@@ -748,14 +749,14 @@
ifeq "$(USE_SYSTEM_LPSOLVE)" "y"
ifeq "$(USE_SHARED_LPSOLVE)" "y"
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION)
[$(OOO_SCSOLVER_ARCHS)], lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)]
- LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION)
+ LPSOLVE_DEP = lp-solve $(LPSOLVE_MIN_VERSION) [$(OOO_SCSOLVER_ARCHS)]
else
BUILD_DEPS += , liblpsolve55-dev $(LPSOLVE_MIN_VERSION)
[$(OOO_SCSOLVER_ARCHS)]
endif
CONFIGURE_FLAGS += --with-system-lpsolve
ifeq "$(USE_LIBSUITESPARSE)" "y"
DBG_DBG_SUGGESTS+= , libsuitesparse-dbg
- BUILD_DEPS += , libsuitesparse-dev [$(OOO_SCSOLVER_ARCHS)]
+ BUILD_DEPS += , libsuitesparse-dev (>> 3.1.0) [$(OOO_SCSOLVER_ARCHS)]
else
DBG_DBG_SUGGESTS+= , libufsparse-dbg
BUILD_DEPS += , libufsparse-dev [$(OOO_SCSOLVER_ARCHS)]
@@ -1514,7 +1515,7 @@
# these have to go to -core, otherwise we get problems with the new
# dpkg-shibdeps...
- for i in `find in
debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/*.so.*`; do \
+ for i in `find
debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/*.so.*`; do \
mv $$i `echo $$i | sed -e s/common/core/`; \
done
@@ -1556,19 +1557,19 @@
# move officebean.jar into -officebean (They will be moved out of -core
# in the install-arch target). Do the /usr/share/java move here already
cd debian/tmp/pkg; \
- mkdir -p openoffice.org-core/usr/share/java/openoffice$(VER); \
+ mkdir -p openoffice.org-core/usr/share/java/$(OODIRNAME); \
mv
openoffice.org-common/$(OODIR)/program/classes/officebean.jar \
- openoffice.org-core/usr/share/java/openoffice$(VER)
+ openoffice.org-core/usr/share/java/$(OODIRNAME)
# move sdbc_hsqldb.jar into -base (do the move
# to /usr/share/java here directly, we do it for the "rest"
# later
cd debian/tmp/pkg; \
- mkdir -p openoffice.org-base/usr/share/java/openoffice$(VER); \
+ mkdir -p openoffice.org-base/usr/share/java/$(OODIRNAME); \
mkdir -p openoffice.org-base/$(OODIR)/program/classes; \
mv
openoffice.org-common/$(OODIR)/program/classes/sdbc_hsqldb.jar \
- openoffice.org-base/usr/share/java/openoffice$(VER); \
- ln -s /usr/share/java/openoffice$(VER)/sdbc_hsqldb.jar \
+ openoffice.org-base/usr/share/java/$(OODIRNAME); \
+ ln -s /usr/share/java/$(OODIRNAME)/sdbc_hsqldb.jar \
openoffice.org-base/$(OODIR)/program/classes/sdbc_hsqldb.jar
endif
@@ -1754,10 +1755,10 @@
debian/tmp/pkg/openoffice.org-common/$(OODIR)/program/classes/*.jar
\
debian/tmp/native-jars/
cp -a \
-
debian/tmp/pkg/openoffice.org-core/usr/share/java/openoffice$(VER)/*.jar \
+
debian/tmp/pkg/openoffice.org-core/usr/share/java/$(OODIRNAME)/*.jar \
debian/tmp/native-jars/
cp -a \
-
debian/tmp/pkg/openoffice.org-base/usr/share/java/openoffice$(VER)/*.jar \
+
debian/tmp/pkg/openoffice.org-base/usr/share/java/$(OODIRNAME)/*.jar \
debian/tmp/native-jars/
ifeq "$(PACKAGE_WRITER2LATEX)" "y"
cp -a \
@@ -1940,9 +1941,9 @@
rm -rf $(PKGDIR)-officebean
mkdir -p -m755 $(PKGDIR)-officebean/$(OODIR)/program/classes
mkdir -p -m755 $(PKGDIR)-officebean/usr/share/java
- mv $(PKGDIR)-core/usr/share/java/openoffice$(VER) \
+ mv $(PKGDIR)-core/usr/share/java/$(OODIRNAME) \
$(PKGDIR)-officebean/usr/share/java
- ln -s /usr/share/java/openoffice$(VER)/officebean.jar \
+ ln -s /usr/share/java/$(OODIRNAME)/officebean.jar \
$(PKGDIR)-officebean/$(OODIR)/program/classes/officebean.jar
mv $(PKGDIR)-core/$(OODIR)/program/libofficebean.so \
$(PKGDIR)-officebean/$(OODIR)/program
@@ -1963,9 +1964,9 @@
done
ifeq "$(ENABLE_JAVA)" "y"
- mkdir -p -m755 $(PKGDIR)-qa-tools/usr/share/java/openoffice$(VER)
+ mkdir -p -m755 $(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
cp $(SOURCE_TREE)/qadevOOo/$(shell . $(SOURCE_TREE)/*.sh; echo
$$OUTPATH$$PROEXT)/class/OOoRunnerLight.jar \
- $(PKGDIR)-qa-tools/usr/share/java/openoffice$(VER)
+ $(PKGDIR)-qa-tools/usr/share/java/$(OODIRNAME)
endif
mkdir -p -m755 $(PKGDIR)-qa-tools/$(OODIR)/smoketest
@@ -2091,31 +2092,31 @@
debian/libuno-cil/$(OODIR)/program
mkdir -p debian/libuno-cil/usr/lib/mono
mkdir -p debian/libuno-cil/usr/lib/pkgconfig
- cat debian/tmp/usr/lib/pkgconfig/mono-openoffice$(VER).pc \
+ cat debian/tmp/usr/lib/pkgconfig/mono-$(OODIRNAME).pc \
| sed -e s,/usr/lib/mono/openoffice,/$(OODIR)/program,g \
- > debian/libuno-cil/usr/lib/pkgconfig/mono-openoffice$(VER).pc
+ > debian/libuno-cil/usr/lib/pkgconfig/mono-$(OODIRNAME).pc
endif
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(USE_SYSTEM_STLPORT)" "y"
# when we use external stlport, we just can and should do a symlink
# for the SDK includes
- cd $(PKGDIR)-dev/usr/include/openoffice$(VER) && \
+ cd $(PKGDIR)-dev/usr/include/$(OODIRNAME) && \
rm -rf stl && ln -s /usr/include/stlport stl
endif
ifeq "$(ENABLE_JAVA)" "y"
# move SDK Java stuff into /usr/share/java/openoffice
rm -f $(PKGDIR)-dev/$(OODIR)/sdk/classes
- mkdir -p $(PKGDIR)-dev/usr/share/java/openoffice$(VER)/win
- mkdir -p
$(PKGDIR)-dev/usr/share/java/openoffice$(VER)/com/sun/star/lib/loader
+ mkdir -p $(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/win
+ mkdir -p
$(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/com/sun/star/lib/loader
mkdir -p $(PKGDIR)-dev/$(OODIR)/sdk/classes/com/sun/star/lib/loader
mv
$(PKGDIR)-dev/usr/share/openoffice/sdk/classes/com/sun/star/lib/loader/* \
-
$(PKGDIR)-dev/usr/share/java/openoffice$(VER)/com/sun/star/lib/loader && \
+
$(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/com/sun/star/lib/loader && \
mv $(PKGDIR)-dev/usr/share/openoffice/sdk/classes/win \
$(PKGDIR)-dev/$(OODIR)/sdk/classes
chmod 644 $(PKGDIR)-dev/$(OODIR)/sdk/classes/win/unowinreg.dll
cd $(PKGDIR)-dev/$(OODIR)/sdk/classes/com/sun/star/lib/loader && \
- for i in
$(CURDIR)/$(PKGDIR)-dev/usr/share/java/openoffice$(VER)/com/sun/star/lib/loader/*.class;
do \
+ for i in
$(CURDIR)/$(PKGDIR)-dev/usr/share/java/$(OODIRNAME)/com/sun/star/lib/loader/*.class;
do \
ln -s `echo $$i | sed -e 's,$(CURDIR)/$(PKGDIR)-dev,,'`
`basename $$i`; \
done
rm -rf $(PKGDIR)-dev/usr/share/openoffice/sdk
@@ -2224,7 +2225,7 @@
ifeq "$(PACKAGE_SDK)" "y"
ifeq "$(ENABLE_JAVA)" "y"
# install the UNO Java sources for e.g. eclipse
- mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java/openoffice$(VER)
+ mkdir -p $(CURDIR)/$(PKGDIR)-dev/usr/share/java/$(OODIRNAME)
cd $(SOURCE_TREE)/solver/$(shell . $(SOURCE_TREE)/*.sh; echo
$$UPD)/$(shell . $(SOURCE_TREE)/*.sh; echo $$OUTPATH$$PROEXT)/bin && \
for i in juh jurt jut ridl unoloader; do \
cp $${i}_src.zip \
@@ -2250,10 +2251,10 @@
ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(PACKAGE_WRITER2LATEX)" "y"
# move writer2latex.jar into the right dir
- mkdir -p $(PKGDIR)-writer/usr/share/java/openoffice$(VER)
+ mkdir -p $(PKGDIR)-writer/usr/share/java/$(OODIRNAME)
mv $(PKGDIR)-writer/$(OODIR)/program/classes/writer2latex.jar \
- $(PKGDIR)-writer/usr/share/java/openoffice$(VER) && \
- ln -s /usr/share/java/openoffice$(VER)/writer2latex.jar \
+ $(PKGDIR)-writer/usr/share/java/$(OODIRNAME) && \
+ ln -s /usr/share/java/$(OODIRNAME)/writer2latex.jar \
$(PKGDIR)-writer/$(OODIR)/program/classes/writer2latex.jar
endif
endif
@@ -2424,9 +2425,9 @@
> $(PKGDIR)-common/usr/share/applications/ooo-template.desktop
# install openoffice-xlate-lang
- install -d -m755 $(PKGDIR)-common/usr/share/openoffice$(VER)/bin
+ install -d -m755 $(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
install -m755 ooo-build/bin/openoffice-xlate-lang \
- $(PKGDIR)-common/usr/share/openoffice$(VER)/bin
+ $(PKGDIR)-common/usr/share/$(OODIRNAME)/bin
ifeq "$(HELPISOS)" ""
# when we don't build helpcontent2 here we are missing helpxsl.zip so
@@ -2444,6 +2445,8 @@
chmod 644 `find $(PKGDIR)-dev-doc/$(OODIR)/sdk/examples/java/Inspector
-type f | xargs`
chmod 644 `find
$(PKGDIR)-dev-doc/$(OODIR)/sdk/examples/java/EmbedDocument -type f | xargs`
rm -f $(PKGDIR)-dev-doc/usr/share/doc/openoffice.org-dev-doc/LICENSE
+ perl -pi -e 's,license.html,http://www.gnu.org/licenses/lgpl.html,' \
+ $(PKGDIR)-dev-doc/$(OODIR)/sdk/index.html
ifeq "$(ENABLE_JAVA)" "y"
# fix links
@@ -2459,15 +2462,15 @@
# move common Java stuff to -java-common
mkdir -p $(PKGDIR)-java-common/$(OODIR)/program/classes
mkdir -p $(PKGDIR)-java-common/$(OODIR)/share/Scripts
- mkdir -p $(PKGDIR)-java-common/usr/share/java/openoffice$(VER)
+ mkdir -p $(PKGDIR)-java-common/usr/share/java/$(OODIRNAME)
mv $(PKGDIR)-common/$(OODIR)/program/JREProperties.class \
$(PKGDIR)-java-common/$(OODIR)/program
mv $(PKGDIR)-common/$(OODIR)/share/Scripts/java \
$(PKGDIR)-java-common/$(OODIR)/share/Scripts
mv $(PKGDIR)-common/$(OODIR)/program/classes/* \
- $(PKGDIR)-java-common/usr/share/java/openoffice$(VER)
+ $(PKGDIR)-java-common/usr/share/java/$(OODIRNAME)
cd $(PKGDIR)-java-common/$(OODIR)/program/classes && \
- for i in
$(CURDIR)/$(PKGDIR)-java-common/usr/share/java/openoffice$(VER)/*; do \
+ for i in
$(CURDIR)/$(PKGDIR)-java-common/usr/share/java/$(OODIRNAME)/*; do \
case "`basename $$i`" in
aportisdoc.jar|pexcel.jar|pocketword.jar) continue ;; \
*) ln -s `echo $$i | sed -e
's,$(CURDIR)/$(PKGDIR)-java-common,,'` `basename $$i` ;; esac; \
done
@@ -2476,7 +2479,7 @@
rm -rf $(PKGDIR)-filter-mobiledev
mkdir -p
$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry/modules/org/openoffice/TypeDetection/Filter
mkdir -p
$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry/modules/org/openoffice/TypeDetection/Types
- mkdir -p $(PKGDIR)-filter-mobiledev/usr/share/java/openoffice$(VER)
+ mkdir -p $(PKGDIR)-filter-mobiledev/usr/share/java/$(OODIRNAME)
mkdir -p $(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes
for i in palm pocketexcel pocketword; do \
mv
$(PKGDIR)-common/$(OODIR)/share/registry/modules/org/openoffice/TypeDetection/Filter/fcfg_$${i}_filters.xcu
\
@@ -2485,9 +2488,9 @@
$(PKGDIR)-filter-mobiledev/$(OODIR)/share/registry/modules/org/openoffice/TypeDetection/Types;
\
done
for i in aportisdoc pexcel pocketword; do \
- mv $(PKGDIR)-java-common/usr/share/java/openoffice$(VER)/$$i.jar \
- $(PKGDIR)-filter-mobiledev/usr/share/java/openoffice$(VER); \
- ln -s /usr/share/java/openoffice$(VER)/$$i.jar \
+ mv $(PKGDIR)-java-common/usr/share/java/$(OODIRNAME)/$$i.jar \
+ $(PKGDIR)-filter-mobiledev/usr/share/java/$(OODIRNAME); \
+ ln -s /usr/share/java/$(OODIRNAME)/$$i.jar \
$(PKGDIR)-filter-mobiledev/$(OODIR)/program/classes; \
done
endif
@@ -2505,11 +2508,11 @@
# move uno_packages/cache to /var and create symlink for for
# documentation referencing it...
rm -rf $(PKGDIR)-common/$(OODIR)/share/uno_packages/cache
- mkdir -p $(PKGDIR)-common/var/spool/openoffice$(VER)/uno_packages/cache
- ln -s /var/spool/openoffice$(VER)/uno_packages/cache \
+ mkdir -p $(PKGDIR)-common/var/spool/$(OODIRNAME)/uno_packages/cache
+ ln -s /var/spool/$(OODIRNAME)/uno_packages/cache \
$(PKGDIR)-common/$(OODIR)/share/uno_packages/cache
perl -pi -e \
-
's,\$$UNO_SHARED_PACKAGES/cache,file:///var/spool/openoffice$(VER)/uno_packages/cache,g'
\
+
's,\$$UNO_SHARED_PACKAGES/cache,file:///var/spool/$(OODIRNAME)/uno_packages/cache,g'
\
$(PKGDIR)-common/$(OODIR)/program/unorc
# install DicOOo; we need to do this manually; the
@@ -2585,30 +2588,30 @@
mv $$TMP $(PKGDIR)-common/$(OODIR)/program/jvmfwk3rc
# move psprint.conf into /etc
- mkdir -p $(PKGDIR)-common/etc/openoffice$(VER)
+ mkdir -p $(PKGDIR)-common/etc/$(OODIRNAME)
mv $(PKGDIR)-common/$(OODIR)/share/psprint/psprint.conf \
- $(PKGDIR)-common/etc/openoffice$(VER)
- ln -s /etc/openoffice$(VER)/psprint.conf \
+ $(PKGDIR)-common/etc/$(OODIRNAME)
+ ln -s /etc/$(OODIRNAME)/psprint.conf \
$(PKGDIR)-common/$(OODIR)/share/psprint/psprint.conf
# prepare a fake sofficerc in the place where OOo expects it
# which does nothing except reference the "normal" one
# which we put into /etc
mv $(PKGDIR)-common/$(OODIR)/program/sofficerc \
- $(PKGDIR)-common/etc/openoffice$(VER)/sofficerc
+ $(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc
( \
echo "# *DO NOT* CHANGE THIS FILE. IT ONLY TAKES THE SETTINGS FROM"; \
- echo "# /etc/openoffice$(VER)/sofficerc. CHANGE THAT FILE IF YOU"; \
+ echo "# /etc/$(OODIRNAME)/sofficerc. CHANGE THAT FILE IF YOU"; \
echo "# REALLY WANT TO CHANGE SOMETHING."; \
- echo "FHS_CONFIG_FILE=file:///etc/openoffice$(VER)/sofficerc"; \
+ echo "FHS_CONFIG_FILE=file:///etc/$(OODIRNAME)/sofficerc"; \
echo "" >> $(PKGDIR)-common/$(OODIR)/program/sofficerc; \
) > $(PKGDIR)-common/$(OODIR)/program/sofficerc
- cat $(PKGDIR)-common/etc/openoffice$(VER)/sofficerc \
+ cat $(PKGDIR)-common/etc/$(OODIRNAME)/sofficerc \
| perl -p -e
's/(.*)=(.*)/$$1=\$${\$$FHS_CONFIG_FILE:Bootstrap:$$1}/' \
>> $(PKGDIR)-common/$(OODIR)/program/sofficerc
install -m 644 debian/soffice.sh \
- $(PKGDIR)-common/etc/openoffice$(VER)/soffice.sh
+ $(PKGDIR)-common/etc/$(OODIRNAME)/soffice.sh
ifeq "$(HELPISOS)" ""
# the helpimgs are not included when we don't build with help here.
