[SCM] LibreOffice packaging repository branch, master, updated. libreoffice_3.3.3-1-16-g6340469
The following commit has been merged in the master branch:
commit 6340469fce4eb07ae1163b01034891d2626618b6
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jun 29 08:56:58 2011 +0200
fix jh_depends call; doesn't support -s...
diff --git a/rules b/rules
index da5461b..1360503 100755
--- a/rules
+++ b/rules
@@ -3272,8 +3272,8 @@ ifeq "$(ENABLE_MONO)" "y"
dh_clideps -s
endif
ifeq "$(ENABLE_JAVA)" "y"
- jh_depends -s -Xlibreoffice$(VER)-gcj
- perl -pi -e "s/libhsqldb-java/libhsqldb-java $(HSQLDB_MINVER), libhsqldb-java (<< $(HSQLDB_TOONEWVER)~)/" \,
+ jh_depends -a -Xlibreoffice$(VER)-gcj
+ perl -pi -e "s/libhsqldb-java/$(BASE_HSQLDB_DEPENDS)/" \
debian/libreoffice$(VER)-base.substvars
endif
# This switch to dh_shlibdeps reduces the 'libXXX not found' warnings but
--
LibreOffice packaging repository
Reply to: