The following commit has been merged in the debian-experimental-3.5 branch:
commit 23b4eaac17a9190c4ceab1f5f2d7f059b0702b34
Author: Rene Engelhard <r...@debian.org>
Date: Sat Oct 20 18:13:12 2012 +0200
fix typo in finding gcj dir detection, thanks Rico Tzschichholz
diff --git a/changelog b/changelog
index 3c40e6a..1057a80 100644
--- a/changelog
+++ b/changelog
@@ -15,6 +15,7 @@ libreoffice (1:3.5.7-1) UNRELEASED; urgency=low
- hack around broken "*" directory in debian/tmp/pkg on kfreebsd-*
extremely slowing down the install target...
- document truth and remove alpha from supported architectures
+ - fix typo in finding gcj dir detection, thanks Rico Tzschichholz
* debian/control.in:
- remove obsolete sharutils, po-debconf and wget | curl build-deps
diff --git a/rules b/rules
index 40d14b7..b83e4f3 100755
--- a/rules
+++ b/rules
@@ -755,7 +755,7 @@ ifeq "$(ENABLE_JAVA)" "y"
ifeq "$(SQUEEZE_BACKPORT)" "y"
GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`readlink
/usr/lib/libgcj_bc.so.1` | cut -d: -f1 | sed -e s/$$/-awt/)
else
- GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture
-qDEB_HOST_MULTIARCH`/gcj-$(GCJ_JDK_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 |
sed -e s/$$/-awt/)
+ GCJ_JAWT_DEPENDS= $(shell dpkg -S /usr/lib/`dpkg-architecture
-qDEB_HOST_MULTIARCH`/gcj-$(GCJ_VERSION)-*/libgcj_bc.so.1 | cut -d: -f1 | sed
-e s/$$/-awt/)
endif
DBG_DBG_SUGGESTS+= , $(shell echo $(GCJ_AWT_DEPENDS) | sed -e
s/awt/dbg/)
JAVA_RUNTIME_DEPENDS = default-jre | gcj-jre | java-gcj-compat
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tpwgd-0004gb...@vasks.debian.org
