------------------------------------------------------------
revno: 1818
committer: Rene Engelhard <[email protected]>
branch nick: experimental
timestamp: Thu 2010-02-18 21:06:12 +0100
message:
update ooo-build; make make -base depend on -java-common (>= 1:3.2.0~)
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2010-02-16 18:32:13 +0000
+++ b/changelog 2010-02-18 20:06:12 +0000
@@ -1,3 +1,14 @@
+openoffice.org (1:3.2.0-2) UNRELEASED; urgency=low
+
+ * ooo-build:
+ - update (607aab092560ba5c267b825d91751262959ddebb)
+ - really localize the layout dialogs (closes: #570378)
+
+ * debian/control.in:
+ - make -base depend on -java-common (>= 1:3.2.0~) (closes: #570335)
+
+ -- Rene Engelhard <[email protected]> Thu, 18 Feb 2010 21:00:24 +0100
+
openoffice.org (1:3.2.0-1) experimental; urgency=low
* OpenOffice.org 3.2.0 final (same as RC5)
=== modified file 'rules'
--- a/rules 2010-02-12 01:00:40 +0000
+++ b/rules 2010-02-18 20:06:12 +0000
@@ -743,7 +743,7 @@
GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep
libjawt.so | head -n 1`)
export JAVA_HOME
CONFIGURE_FLAGS += --with-jdk-home=$(JAVA_HOME)
- JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common (>> 2.2.0-4)
+ JAVA_COMMON_DEPENDS= , openoffice.org$(VER)-java-common
ifeq "$(USE_SYSTEM_SAXON)" "y"
CONFIGURE_FLAGS += --with-system-saxon
--with-saxon-jar=/usr/share/java/saxonb.jar
BUILD_DEPS += , libsaxonb-java [$(OOO_JAVA_ARCHS)]
@@ -3412,7 +3412,7 @@
-V'help-l10n-virtual-version=$(HELP_L10N_VIRTUAL_VERSION)' \
-V'dev-stl-depends=$(DEV_STL_DEPENDS)' \
-V'base-hsqldb-depends=$(BASE_HSQLDB_DEPENDS)' \
- -V'java-common-depends=$(JAVA_COMMON_DEPENDS)' \
+ -V'java-common-depends=$(JAVA_COMMON_DEPENDS) (>=
$(BASE_VERSION)~)' \
-V'java-runtime-depends=$(JAVA_RUNTIME_DEPENDS)' \
-V'java-gcj-depends=$(JAVA_GCJ_DEPENDS)' \
-V'mozilla-nss-depends=$(MOZILLA_NSS_DEPENDS)' \
