The following commit has been merged in the master branch:
commit 8f693b3cb2415c01d9efa21513535d8dad5fcd8e
Author: Rene Engelhard <[email protected]>
Date: Tue Jul 5 08:14:50 2011 +0000
don't try to change libreoffice-base when we don't built it
diff --git a/changelog b/changelog
index 9fe5071..9aa7b72 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,8 @@ libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
* debian/control.in:
- fix description: s/libreoffice-hyphenation/hyphen/,
s/libreoffice-thesaurus/mythes/
+ * debian/rules:
+ - don't try to change libreoffice-base when we don't built it
-- Rene Engelhard <[email protected]> Tue, 05 Jul 2011 08:14:16 +0000
diff --git a/rules b/rules
index ee89d1d..4ebdf4f 100755
--- a/rules
+++ b/rules
@@ -3275,8 +3275,10 @@ ifeq "$(ENABLE_MONO)" "y"
endif
ifeq "$(ENABLE_JAVA)" "y"
jh_depends -a -Xlibreoffice$(VER)-gcj -Xure
+ ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice$(VER)-base.substvars
+ endif
# jh_depends adds ure (${source:Version}) entries. They are overly
strict
# and do not fit anyway given ure has a different versioning scheme.
Excluded
# above, readd here unversioned
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
