r820 ./packages/openofficeorg/2.3/experimental: m224, update ooo-build, fix testtoolrc (non)installation, we don't need libdbX.Y-java
------------------------------------------------------------
revno: 820
committer: Rene Engelhard <rene@debian.org>
branch nick: experimental
timestamp: Fri 2007-08-03 20:39:30 +0200
message:
m224, update ooo-build, fix testtoolrc (non)installation, we don't need libdbX.Y-java
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2007-08-02 12:59:31 +0000
+++ b/changelog 2007-08-03 18:39:30 +0000
@@ -1,6 +1,6 @@
-openoffice.org (2.3.0~src680m222-0.1pre) experimental; urgency=low
+openoffice.org (2.3.0~src680m224-0.1pre) experimental; urgency=low
- * new upstream snapshot (SRC680_m222)
+ * new upstream snapshot (SRC680_m224)
- fixes joining cells in writer tables (closes: #218281)
- fixes text width in PDF export (closes: #408209)
- adds fy_NL localedata (closes: #413205)
@@ -9,7 +9,7 @@
(closes: #386250)
* ooo-build:
- use trunk again
- - update (r9988)
+ - update (r10001)
+ apply Split section. Fixes the binfilter split so that StarWriter
3.0-5.0 etc. do not appear anymore when -filter-binfilter is not
installed (indirectly closes: #421274)
@@ -51,6 +51,7 @@
- wrap ooo-build pruning with PRUNE_OOOBUILD [CC]
- simplify uuencode/uudecode code [CC]
- add DBVER substition [CC]
+ - fix testtoolrc (non)installation [RE]
* debian/control.in:
- build-depend on libxml-parser-perl [RE]
- Add XS-Vcs-{Bzr,Svn} fields [RE]
=== modified file 'rules'
--- a/rules 2007-08-02 21:37:54 +0000
+++ b/rules 2007-08-03 18:39:30 +0000
@@ -330,6 +330,8 @@
BUILD_DEPS += , libcurl3-gnutls-dev [$(OOO_ARCHS)]
endif
+ BUILD_DEPS += , libdb$(DBVER)-dev [$(OOO_JAVA_ARCHS)]
+
ifneq "$(BUILD_DBG_PACKAGE)" "y"
SMALL_SYMBOLS = y
else
@@ -475,9 +477,6 @@
CONFIGURE_FLAGS += --with-system-xml-apis
# xml-apis.jar is already a link in xalan, see above
endif
- CONFIGURE_FLAGS += --with-db-jar=/usr/share/java/libdb$(DBVER)-java.jar
- BUILD_DEPS += , libdb$(DBVER)-dev [$(OOO_JAVA_ARCHS)]
- BUILD_DEPS += , libdb$(DBVER)-java [$(OOO_JAVA_ARCHS)]
ifeq "$(DIST)" "Debian"
BUILD_DEPS += , mingw32 [$(OOO_JAVA_ARCHS)]
CONFIGURE_FLAGS += --with-mingwin=i586-mingw32msvc-g++
@@ -489,7 +488,7 @@
endif
ifeq "$(USE_FIREFOX)" "y"
- CONFIGURE_FLAGS+= --with-firefox
+ CONFIGURE_FLAGS+= --with-system-mozilla=firefox
BUILD_DEPS+= , firefox-dev [$(OOO_ARCHS)]
else
ifeq "$(USE_XULRUNNER)" "y"
@@ -1001,8 +1000,8 @@
fi ; \
done
+ifeq "$(DIST)" "Ubuntu"
# uuencode ubuntu binary files
-ifeq "$(DIST)" "Ubuntu"
set -e; \
cd ubuntu ; \
for f in \
@@ -1450,11 +1449,10 @@
cd debian/tmp/pkg; \
mv openoffice.org-common/$(OODIR)/program/testtoolrc \
openoffice.org-core/$(OODIR)/program
+endif
# remove eventually sneaked in .testtoolrc
cd debian/tmp/pkg; \
rm -f openoffice.org-common/$(OODIR)/program/.testtoolrc
-
-endif
ifeq "$(PACKAGE_QUICKSTART)" "y"
# ooqstart should go into -core; we have just a glib dependency
@@ -1815,7 +1813,7 @@
rm -f $(PKGDIR)-core/$(OODIR)/program/testtool.bin
rm -f $(PKGDIR)-core/$(OODIR)/program/libcommuni*
rm -f $(PKGDIR)-core/$(OODIR)/program/libsimplecm*
- rm -f $(PKGDIR)-core/$(OODIR)/program/testtoolrc
+ rm -f $(PKGDIR)-common/$(OODIR)/program/testtoolrc
endif
ifeq "$(USE_OOO_BUILD_DESKTOPS)" "n"
Reply to: