[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.4.5-2-16-gd826c50
The following commit has been merged in the master branch:
commit dd9fe737c5c9bacc9b427ae839687e733f4fe3a6
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jan 29 17:29:00 2012 +0100
backport from 3.5: don't add unversioned base-files dependency in base
diff --git a/changelog b/changelog
index 2df129b..5e45ae5 100644
--- a/changelog
+++ b/changelog
@@ -4,12 +4,13 @@ libreoffice (1:3.4.5-3) UNRELEASED; urgency=low
- install full changelog only for packages with the same name in OOo
times; strip pre-libreoffice entries otherwise.
- enable ca-XV, put into -{l10n,help}-ca
+ - backport from 3.5: don't add unversioned base-files dependency in base
* ext-sources/ext-sources/3bf481ca95109b14435125c0dd1f2217-graphite2-1.0.3.tgz:
add missing file which should have been in updated .orig-ext-sources..
* debian/libreoffice-sdbc-postgresql.preinst.in: cleanup to avoid dpkg
warnings, thanks Julian Gilbey (closes: #657530)
- -- Rene Engelhard <rene@debian.org> Sun, 29 Jan 2012 17:06:31 +0100
+ -- Rene Engelhard <rene@debian.org> Sun, 29 Jan 2012 17:28:30 +0100
libreoffice (1:3.4.5-2) unstable; urgency=low
diff --git a/rules b/rules
index 0457590..45f25f3 100755
--- a/rules
+++ b/rules
@@ -3427,6 +3427,8 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice$(VER)-base.substvars
+ perl -pi -e "s/base-files,//" \
+ 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
--
LibreOffice packaging repository
Reply to: