------------------------------------------------------------
revno: 2083 [merge]
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Tue 2010-08-24 13:40:27 +0200
message:
merge from 3.2.1 branch
modified:
changelog
control
control.in
rules
=== modified file 'changelog'
--- a/changelog 2010-08-23 18:36:54 +0000
+++ b/changelog 2010-08-24 11:40:27 +0000
@@ -8,6 +8,7 @@
- back to master
- use git (for now) again: 28d2a4e7af25256f2919b81d6fe03426ab2c7454
+ * debian/control.in:
* debian/rules:
- add and rework target(s) for new external sources handling upstream
- temporarily disable mono
@@ -18,6 +19,8 @@
- adapt jar locations to actually match Java policy: public jars
inside /usr/share/java (and /usr/lib/ure/...) and "internal" ones
to /usr/share/java/basisX.Y/program/classes. Keep the symlinks there
+ - change Class-Path: of jurt.jar to contain /usr/lib/ure/lib hardcoded
+ as otherwise libjpipe.so is not found...
* debian/control.in, debian/rules: adapt for "Test Cleanup". Build-depend
on libcppunit-dev and junit4. Remove xvfb.
* debian/*.{pre,post},{inst,rm}.in, debian/shell-lib-{components,extensions}:
@@ -32,6 +35,7 @@
* debian/control.in:
- move binfilter to suggests (and remove from openoffice.orgs
Description), it is not in the default install anymore
+ - we use bc in debian/rules, we probably should build-dep on it
* debian/uno-libs3.symbols: update
* debian/icons: remove again
* debian/broffice.org*: update diversions
=== modified file 'control'
--- a/control 2010-08-23 11:15:26 +0000
+++ b/control 2010-08-24 11:40:27 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <ha...@debian.org>, Rene Engelhard <r...@debian.org>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev,
libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev,
libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl,
libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc,
imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, , g++ (>> 4.3.0)
[s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev (>=
1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64
kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc
powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] ,
libpo
ppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central
(>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12)
, tcsh , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64
s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x
sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>=
1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips
mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-a
md64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel
powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org [i386
mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386 mips mipsel
powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64
ppc64 s390x sparc], libpentaho-reporting-flow-engine-java-openoffice.org [i386
mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
hppa ia64 ppc64 s390x sparc], liblayout-java-openoffice.org [i386 mips mipsel
powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64
ppc64 s390x sparc], libloader-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc power
pcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>=
1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) ,
libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev ,
libvigraimpex-dev ,
libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev , libwpg-dev
, libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev (>=
4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev (>=
1.1.0~r791) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha
amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev
[!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) ,
libgstreamer-plugi
ns-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a), flex | flex-old,
libpam0g-dev, libxaw7-dev, unzip, zip, autoconf, sharutils, pkg-config,
libfontconfig1-dev, binutils (>= 2.14.90.0.6-3) [sparc], libc6 (>= 2.3.2)
[powerpc], libc0.1 (>= 2.10.2-7) [kfreebsd-i386 kfreebsd-amd64], zlib1g-dev,
libfreetype6-dev, libx11-dev, libsm-dev, libxt-dev, libxext-dev, libxtst-dev,
libice-dev, libsane-dev, libxrender-dev, libcups2-dev, libarchive-zip-perl,
libpng12-dev, libjpeg-dev, libxml2-dev, libexpat1-dev, fastjar, xsltproc,
imagemagick, libxkbfile-dev, libxinerama-dev, x11proto-render-dev, unixodbc-dev
(>= 2.2.11), libxml-parser-perl, gperf, libpq-dev, po-debconf, bc, , g++ (>>
4.3.0) [s390], gcc (>> 4.3.0) [s390] , g++-4.4 (>= 4.4.2-5) [armel] , dpkg-dev
(>= 1.15.1) , libgl1-mesa-dev [i386 powerpc powerpcspe s390 kfreebsd-i386 amd64
kfreebsd-amd64 ia64 ppc64 s390x sparc], libglu1-mesa-dev [i386 powerpc
powerpcspe s390 kfreebsd-i386 amd64 kfreebsd-amd64 ia64 ppc64 s390x sparc] , l
ibpoppler-dev (>= 0.8.0) , libgraphite-dev [i386 m68k mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , libcurl4-gnutls-dev , libssl-dev , libdb-dev , python-central
(>= 0.5) , python-dev , debhelper (>= 7.2.3~) , epm , libcppunit-dev (>= 1.12)
, tcsh , openjdk-6-jdk [i386 powerpc powerpcspe s390 alpha amd64 armel ppc64
s390x sparc] , gcj-jdk [i386 mips mipsel s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 s390x sparc], libgcj-common (>= 1:4.4.1) [i386
mips mipsel s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 s390x
sparc] , ant (>= 1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc], ant-optional (>=
1.7.0) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , gcc-mingw32 [i386 mips
mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreeb
sd-amd64 armel hppa ia64 ppc64 s390x sparc], mingw32-runtime [i386 mips mipsel
powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa
ia64 ppc64 s390x sparc] , libcommons-codec-java [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc], libcommons-httpclient-java [i386 mips mipsel powerpc powerpcspe
s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x
sparc], libcommons-lang-java [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , libbase-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libsac-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha a
md64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libxml-java-openoffice.org
[i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64
kfreebsd-amd64 hppa ia64 ppc64 s390x sparc], libflute-java-openoffice.org [i386
mips mipsel powerpc powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64
hppa ia64 ppc64 s390x sparc],
libpentaho-reporting-flow-engine-java-openoffice.org [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], liblayout-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libloader-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libformula-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
librepository-java-openoffice.org [i386 mips mipsel powerpc p
owerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x
sparc], libfonts-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc],
libserializer-java-openoffice.org [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 hppa ia64 ppc64 s390x sparc] ,
libcommons-logging-java [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
libservlet2.5-java , xulrunner-dev [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc],
libnss3-dev (>= 3.12.3) [i386 mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , dmake (>=
1:4.11) , libhunspell-dev (>= 1.1.5-2) , libhyphen-dev (>= 2.4) ,
libstlport4.6-dev (>= 4.6.2-3) [i386] , libboost-dev (>= 1.38) , libmdds-dev ,
libvigraimpex-de
v , libwpd8-dev (>= 0.8.3-3) , libmythes-dev (>= 2:1.2) , libwps-dev ,
libwpg-dev , libicu-dev (>= 4.0) , libxslt1-dev , libcairo2-dev , kdelibs5-dev
(>= 4:4.3.4) , libqt4-dev (>= 4.5) , libmysqlclient-dev , libmysqlcppconn-dev
(>= 1.1.0~r791) [i386 m68k mips mipsel powerpc powerpcspe s390 kfreebsd-i386
alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] , libebook1.2-dev
[!armel] , libxrandr-dev , liblucene2-java (>= 2.3.2) [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , libhsqldb-java (>> 1.8.0.10) [i386 mips mipsel powerpc
powerpcspe s390 kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64
s390x sparc] , bsh (>= 2.0b4) [i386 mips mipsel powerpc powerpcspe s390
kfreebsd-i386 alpha amd64 kfreebsd-amd64 armel hppa ia64 ppc64 s390x sparc] ,
liblpsolve55-dev (>= 5.5.0.13-5+b1), lp-solve (>= 5.5.0.13-5+b1) ,
libsuitesparse-dev (>= 1:3.4.0) , libdbus-glib-1-dev (>= 0.60) , libgstreamer-p
lugins-base0.10-dev , libneon27-gnutls-dev , librdf0-dev (>= 1.0.8) ,
libgtk2.0-dev (>= 2.10) , libgnomevfs2-dev , libgconf2-dev , libldap2-dev
Build-Depends-Indep: fdupes, xml-core, netpbm, , libtextcat-data-utf8
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, 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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel],
ant (= 1.8.0-2) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], ant (=
1.8.0-3) [hppa ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel], base-files (=
5), libhsqldb-java (>= 1.8.1~)
Standards-Version: 3.8.4
=== modified file 'control.in'
--- a/control.in 2010-08-02 15:29:48 +0000
+++ b/control.in 2010-08-24 11:40:27 +0000
@@ -45,6 +45,7 @@
gperf,
libpq-dev,
po-debconf,
+ bc,
%BUILD_DEPS%
Build-Depends-Indep: fdupes, xml-core, netpbm, %BUILD_DEPS_INDEP%
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, 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),
libmono-dev (= 2.4+dfsg-2) [sparc], gcj-4.2 (= 4.2.2-6), flex (= 2.5.34-1)
[amd64], libboost1.39-dev (<< 1.39.0-2), graphicsmagick-imagemagick-compat (<<
1.3.9~), ant (= 1.8.0-1) [%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-2)
[%OOO_GCJ_JDK_ARCHS%], ant (= 1.8.0-3) [%OOO_GCJ_JDK_ARCHS%]
=== modified file 'rules'
--- a/rules 2010-08-23 20:04:38 +0000
+++ b/rules 2010-08-24 11:40:27 +0000
@@ -2504,6 +2504,17 @@
for i in $(CURDIR)/debian/ure/usr/share/java/*.jar; do \
ln -sf `echo $$i | sed -e 's,$(CURDIR)/debian/ure,,'`
`basename $$i`; \
done
+ # fix up Class-Path of jurt.jar to be able to find libjpipe.so.
+ # See http://www.openoffice.org/servlets/ReadMsg?list=dev&msgNo=27765
+ t=`mktemp -q -d`; \
+ mkdir -p $$t && cd $$t && \
+ unzip $(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/jurt.jar \
+ META-INF/MANIFEST.MF && \
+ perl -pi -e 's#../../lib/#../../lib/ /$(OOUREDIR)/lib/#g' \
+ META-INF/MANIFEST.MF && \
+ zip -r $(CURDIR)/debian/ure/usr/share/java/$(OODIRNAME)/jurt.jar \
+ META-INF/MANIFEST.MF && \
+ cd $(CURDIR) && rm -rf $$t
endif
# and the public libs to uno-libs3
mkdir -p debian/uno-libs3/$(OOUREDIR)/lib
@@ -3495,7 +3506,7 @@
# three-layer symlinks also for /usr/share
ln -s basis$(OOVER) \
$(PKGDIR)-common/$(shell echo $(OOBRANDDIR) | sed -e
s/lib/share/)/basis-link
- ln -s /usr/lib/ure \
+ ln -s /$(OOUREDIR) \
$(PKGDIR)-common/$(shell echo $(OODIR) | sed -e
s/lib/share/)/ure-link
ifeq "$(USE_SYSTEM_TEXTCAT_DATA)" "y"
