[SCM] LibreOffice packaging repository branch, debian-experimental-3.4.0, updated. libreoffice_3.4.1-1-6-g601ad81
The following commit has been merged in the debian-experimental-3.4.0 branch:
commit 0f86c4db3001e462ebff694fceb1058602313548
Author: Rene Engelhard <rene@debian.org>
Date: Mon Jul 11 14:36:44 2011 +0000
also -Xlibreoffice-dbg on jh_depends...
diff --git a/changelog b/changelog
index cd6ac69..efc5efc 100644
--- a/changelog
+++ b/changelog
@@ -7,8 +7,10 @@ libreoffice (1:3.4.1-2) UNRELEASED; urgency=low
dpkg-trigger (thanks Jonathan Nieder)
* debian/control.in:
- make new -common break old -evolution/-filter-binfilter
+ * debian/rules:
+ - also -Xlibreoffice-dbg on jh_depends... (closes: #633540)
- -- Rene Engelhard <rene@debian.org> Sun, 10 Jul 2011 00:18:19 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 11 Jul 2011 14:36:16 +0000
libreoffice (1:3.4.1-1) experimental; urgency=low
diff --git a/rules b/rules
index 7c1dea7..30524a2 100755
--- a/rules
+++ b/rules
@@ -3294,7 +3294,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
@@ -3451,7 +3451,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 -Xlibreoffice$(VER)-gcj -Xliblucene2-java
+ jh_depends -i -Xlibreoffice$(VER)-gcj -Xlibreoffice$(VER)-dbg -Xliblucene2-java
endif
dh_gencontrol -i $(DEBHELPER_OPTIONS) \
-Nlibreoffice$(VER)-report-builder \
--
LibreOffice packaging repository
Reply to: