------------------------------------------------------------
revno: 981
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: debian
timestamp: Mon 2008-01-28 19:51:36 +0100
message:
disable --with-max-jobs= for now, improve comment, symlink libstlport_gcc.so
only with USE_STLPORT=y
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2008-01-27 11:17:11 +0000
+++ b/changelog 2008-01-28 18:51:36 +0000
@@ -1,4 +1,4 @@
-openoffice.org (1:2.4.0~ooh680m4-0.1pre) experimental; urgency=low
+openoffice.org (1:2.4.0~ooh680m4-0.1pre) experimental; urgency=high
* new upstream snapshot (OOH680_m4)
- adds https support for WebDAV (closes: #244280)
@@ -8,7 +8,7 @@
not only on startup (closes: #290016)
- doesn't link libofficebean.so with -lgcj anymore (closes: #441202)
* ooo-build:
- - use trunk again (r11421)
+ - use trunk again (r11431)
- src:
+ use (new) OOH680 GSIs from ftp.linux.cz
. new: ro, gd
@@ -44,11 +44,12 @@
- fix SYSTEM_XALAN conditional to not reset SYSTEM_XML_APIS
bogusly
- enable eu and ro langpacks, enable eu help
- - specify --with-max-jobs=$(NUM_CPUS) in addition to --with-num-cpus
- s/libjfreereport-java/libpentaho-reporting-flow-engine-java/
- update for gcj 4.3; detect libgcj package name/libjawt dir automatically
- add icedtea-java7-jre to JVM alternatives for JVM recommends/depends.
Place it before sun-java?-jre
+ - don't try to create a libstlport_gcc.so symlink if we don't build
+ with stlport and the readlink will fail :)
* debian/control.in:
- remove Provides: writer2latex from -writer, bogus (we only provide
libwriter2latex-java at all, and that with an old version). Depend
@@ -76,7 +77,7 @@
+ make -gcj depend on libhsqldb-java-gcj
+ some minor parallel build conditional improvements
- -- Rene Engelhard <[EMAIL PROTECTED]> Sun, 27 Jan 2008 12:16:11 +0100
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 28 Jan 2008 18:02:35 +0100
openoffice.org (1:2.3.1-3) unstable; urgency=low
=== modified file 'rules'
--- a/rules 2008-01-27 11:17:11 +0000
+++ b/rules 2008-01-28 18:51:36 +0000
@@ -825,7 +825,8 @@
endif
endif
CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
- CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS)
+ # breaks. At least with 2
+# CONFIGURE_FLAGS += --with-max-jobs=$(NUM_CPUS)
# Build python depends from current python version
PYMAJOR:=$(shell python -c "import sys; print sys.version_info[0]")
@@ -1760,8 +1761,8 @@
# the Debian i386 buildd, although having much ram still OOMs without
# this (at unoil.jar).
# Also the native jar build is MUCH faster with this. But it
- # won't be accepted into the official java-gcj-compat so this hack
- # here is needed.
+ # 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
cd debian/scripts && \
@@ -2160,10 +2161,12 @@
echo "libstdc++ $$LIBSTDCPP_SOVER" > debian/shlibs.override.stdlibs; \
echo "libgcc_s $$LIBGCC_SOVER" >> debian/shlibs.override.stdlibs
endif
-ifeq "$(USE_SYSTEM_STLPORT)" "y"
+ifeq "$(USE_STLPORT)" "y"
+ ifeq "$(USE_SYSTEM_STLPORT)" "y"
rm -f $(PKGDIR)-core/$(OODIR)/program/libstlport*
ln -s `readlink /usr/lib/libstlport_gcc.so` \
debian/openoffice.org$(VER)-core/$(OODIR)/program/libstlport_gcc.so
+ endif
endif
ifeq "$(ENABLE_JAVA)" "y"
