The following commit has been merged in the master branch:
commit c661e1670c2ea781df9d7bb45f89d360b5eacf1b
Author: Rene Engelhard <[email protected]>
Date: Mon Jul 11 14:36:44 2011 +0000
also -Xlibreoffice-dbg on jh_depends...
diff --git a/changelog b/changelog
index 269041e..c9282af 100644
--- a/changelog
+++ b/changelog
@@ -1,19 +1,16 @@
libreoffice (1:3.3.3-5) UNRELEASED; urgency=low
- * debian/patches/update-debian-opt.diff: call dpkg-buildflags correctly
-
- * debian/changelog: mention VU#953183 in 1:3.3.3-1
+ * debian/libreoffice-common.postinst.in, libreoffice-core.postinst.in,
+ debian/shell-lib-components.sh:
+ check for /@OOBASISDIR@/program/.services.rdb before uisng it
+ (closes: #633396) and replace manual call of the function by
+ dpkg-trigger (thanks Jonathan Nieder)
* debian/control.in:
- - fix description: s/libreoffice-hyphenation/hyphen/,
- s/libreoffice-thesaurus/mythes/
+ - make new -common break old -evolution/-filter-binfilter
* debian/rules:
- - don't try to change libreoffice-base when we don't built it
- - build-depend on javahelper (>= 0.37) and use -s
- * debian/source.lintian-overrides:
- - override new libreoffice source: dh_pycentral-is-obsolete line 3214
- and libreoffice source: dh_python-is-obsolete line 3223
+ - also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
- -- Rene Engelhard <[email protected]> Wed, 06 Jul 2011 15:35:00 +0200
+ -- Rene Engelhard <[email protected]> Mon, 11 Jul 2011 14:36:16 +0000
libreoffice (1:3.3.3-4) unstable; urgency=low
diff --git a/rules b/rules
index bcc098c..204967d 100755
--- a/rules
+++ b/rules
@@ -3273,7 +3273,7 @@ ifeq "$(ENABLE_MONO)" "y"
dh_clideps -s
endif
ifeq "$(ENABLE_JAVA)" "y"
- jh_depends -s -Xlibreoffice$(VER)-gcj -Xure
+ jh_depends -s -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xure
ifeq "$(PACKAGE_BASE)" "y"
perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice$(VER)-base.substvars
@@ -3431,7 +3431,7 @@ endif
ifeq "$(ENABLE_JAVA)" "y"
# the help recommends lucene. this is enough. no need for a hard depend
in
# -common, IMHO
- jh_depends -i -Xbsh -Xlibreoffice$(VER)-gcj -Xliblucene2-java
+ jh_depends -i -Xbsh -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg
-Xliblucene2-java
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
--
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]
