------------------------------------------------------------
revno: 1658
committer: Rail Aliev <r...@i-rs.ru>
branch nick: debian
timestamp: Sun 2009-08-30 16:15:24 +0400
message:
Minor fixes
* debian/rules:
- prevent empty GCJ_JAWT_DIR when libgcj10-awt is installed
- remove ooo-build directory before "git clone"
modified:
changelog
rules
=== modified file 'changelog'
--- a/changelog 2009-08-29 16:43:14 +0000
+++ b/changelog 2009-08-30 12:15:24 +0000
@@ -1,11 +1,17 @@
openoffice.org (1:3.1.1-2) UNRELEASED; urgency=low
+ [ Rene Engelhard ]
* ooo-build:
- update (9c418d97049f8f3380518cf6cac166d518cae388)
* debian/rules:
- bump libmysqlcppconn-dev builddep for new snapshot of mysqlnative
* debian/control.mysql.in:
- remove conflicts against OOo >= 3.3
+
+ [ Rail Aliev ]
+ * debian/rules:
+ - prevent empty GCJ_JAWT_DIR when libgcj10-awt is installed
+ - remove ooo-build directory before "git clone"
-- Rene Engelhard <r...@debian.org> Fri, 28 Aug 2009 09:06:36 +0200
=== modified file 'rules'
--- a/rules 2009-08-29 17:11:33 +0000
+++ b/rules 2009-08-30 12:15:24 +0000
@@ -678,7 +678,7 @@
JAVA_RUNTIME_DEPENDS += | java5-runtime
# Suns Java "packages"
JAVA_RUNTIME_DEPENDS += | jre
- GCJ_JAWT_DIR=$(shell dirname `dpkg -L $(GCJ_JAWT_DEPENDS) | grep
libjawt.so`)
+ 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)
@@ -3388,6 +3388,7 @@
# Get ooo-build
get-ooo-build:
+ rm -rf ooo-build
git clone git://anongit.freedesktop.org/git/ooo-build/ooo-build
ifneq "$(OOO_BUILD_BRANCH)" ""
cd ooo-build && \
