Commit 3612766e authored by Ken Bloom's avatar Ken Bloom

Minor changes all around

link-grammar-*.jar has been renamed linkgrammar-*.jar, so update the
clean: target in debian/rules
likewise, installation into /usr/share/java is handled in Makefile.am,
so I don't need to do that in debian/rules anymore

fix a line continuation issue in debian/control so that the java package
builds on all architectures indicated in the debian/control
get the package name right when determining whether to build the java
stuff in the first place
parent 448b51a1
......@@ -67,8 +67,7 @@ Description: Carnegie Mellon University's link grammar parser for English
This package contains the header files and static libraries
Package: liblink-grammar4-java
Architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386
m68k mips mipsel powerpc s390 sparc
Architecture: amd64 armel hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc s390 sparc
Section: libs
Depends: ${shlibs:Depends}, liblink-grammar4
Description: Carnegie Mellon University's link grammar parser for English
......
......@@ -6,7 +6,7 @@
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
ifneq (,$(shell dh_listpackages -s | grep liblink-grammar-java))
ifneq (,$(shell dh_listpackages -s | grep liblink-grammar4-java))
WITH_JAVA := yes
else
WITH_JAVA := no
......@@ -22,7 +22,7 @@ DEB_INSTALL_MANPAGES_link-grammar := debian/link-parser.1
clean::
$(RM) -r bin/org
$(RM) link-grammar-*.jar
$(RM) linkgrammar-*.jar
common-install-impl::
if [ $(WITH_JAVA) == yes ]; then \
......@@ -30,6 +30,5 @@ common-install-impl::
mv debian/tmp/usr/lib/liblink-grammar-java* debian/tmp/usr/lib/jni; \
install -d debian/tmp/usr/share/java; \
mv link-grammar-*.jar debian/tmp/usr/share/java; \
(cd debian/tmp/usr/share/java && ln -s link-grammar-*.jar link-grammar.jar); \
fi;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment