Commit 7ba68c01 authored by Jeremy Bicha's avatar Jeremy Bicha

New upstream release

* New upstream release
* Update packages from link-grammar4 to 5
* Modernize packaging
  - Switch from cdbs to dh7
  - Use quilt (3.0)
  - Set d/compat to 9
  - Enable all hardening flags
* Run dh-autoreconf.
  - Build-depend on dh-autoreconf, pkg-config and
  - Add 0001-fix-configure.patch to facilitate this.
* Build for hunspell not aspell as recommended upstream
* Disable tests since they weren't working
parent 66794cf2
link-grammar (5.3.7-1) UNRELEASED; urgency=medium
* QA upload
* New upstream release
* Update packages from link-grammar4 to 5
* Modernize packaging
- Switch from cdbs to dh7
- Use quilt (3.0)
- Set d/compat to 9
- Enable all hardening flags
* Run dh-autoreconf.
- Build-depend on dh-autoreconf, pkg-config and
- Add 0001-fix-configure.patch to facilitate this.
* Build for hunspell not aspell as recommended upstream
* Disable tests since they weren't working
-- Jeremy Bicha <jbicha@linux.com> Sun, 29 May 2016 03:13:54 -0400
link-grammar (4.7.4-3) unstable; urgency=medium
* Use autotools-dev to support newer architectures (Closes: 765232)
......
......@@ -2,7 +2,7 @@ Source: link-grammar
Section: text
Priority: optional
Maintainer: Debian QA Group <packages@qa.debian.org>
Build-Depends: debhelper (>= 7.0.0), cdbs, autotools-dev, default-jdk [!hppa !alpha], fastjar [!hppa !alpha], ant [!hppa !alpha], libaspell-dev, libhunspell-dev
Build-Depends: debhelper (>= 7.0.0), dh-autoreconf, autotools-dev, default-jdk [!hppa !alpha], fastjar [!hppa !alpha], ant [!hppa !alpha], libhunspell-dev, pkg-config, swig
Standards-Version: 3.9.2
Homepage: http://www.abisource.com/projects/link-grammar/
Vcs-Browser: http://git.debian.org/?p=collab-maint/link-grammar.git
......
debian/tmp/usr/include/link-grammar
debian/tmp/usr/lib/liblink-grammar.{so,a}
debian/tmp/usr/lib/pkgconfig
usr/include/link-grammar
usr/lib/*/liblink-grammar.{so,a}
usr/lib/*/libminisat.{so,a}
usr/lib/*/pkgconfig
debian/tmp/usr/lib/jni/*.so*
debian/tmp/usr/share/java/*
usr/share/java/*
debian/tmp/usr/lib/liblink-grammar.so.*
usr/lib/*/liblink-grammar.so.*
usr/lib/*/libminisat.so.*
liblink-grammar.so.4 liblink-grammar4 #MINVER#
analyze_fat_linkage@Base 4.3.9
analyze_thin_linkage@Base 4.3.9
build_deletable@Base 4.3.9
build_disjuncts_for_X_node@Base 4.6.5
build_disjuncts_for_dict_node@Base 4.6.5
build_effective_dist@Base 4.3.9
liblink-grammar.so.5 liblink-grammar5 #MINVER#
build_disjuncts_for_exp@Base 5.3.7
catenate_disjuncts@Base 4.6.5
connector_new@Base 4.7.4
count_disjuncts@Base 4.6.5
count_set_effective_distance@Base 4.3.9
dictionary_create@Base 4.2.2
dict_display_word_expr@Base 5.3.7
dict_display_word_info@Base 5.3.7
dictionary_create_default_lang@Base 4.2.2
dictionary_create_from_utf8@Base 5.3.7
dictionary_create_lang@Base 4.2.2
dictionary_delete@Base 4.2.2
dictionary_get_data_dir@Base 4.6.5
dictionary_get_max_cost@Base 4.2.2
dictionary_is_entity@Base 4.6.5
dictionary_is_past_tense_form@Base 4.6.5
dictionary_get_lang@Base 5.3.7
dictionary_lookup_list@Base 4.6.5
dictionary_set_data_dir@Base 4.6.5
do_match@Base 4.6.5
eliminate_duplicate_disjuncts@Base 4.6.5
exalloc@Base 4.3.9
extract_fat_linkage@Base 4.3.9
extract_thin_linkage@Base 4.3.9
free_connectors@Base 4.7.4
free_disjuncts@Base 4.6.5
free_parse_info@Base 4.7.4
init_connector@Base 4.3.9
init_count@Base 4.7.4
intersect_strings@Base 4.3.9
#MISSING: 4.6.5-1# is_entity@Base 4.3.5
#MISSING: 4.6.5-1# is_past_tense_form@Base 4.3.5
issue_special_command@Base 4.2.2
free_lookup_list@Base 5.3.7
left_print_string@Base 5.3.7
lg_compute_disjunct_strings@Base 4.6.5
lg_expand_disjunct_list@Base 4.6.5
lg_strlcpy@Base 4.6.5
linkage_and_cost@Base 4.2.2
linkage_compute_union@Base 4.2.2
linkage_constituent_node_get_child@Base 4.2.5
linkage_constituent_node_get_end@Base 4.2.5
linkage_constituent_node_get_label@Base 4.2.5
linkage_constituent_node_get_next@Base 4.2.5
linkage_constituent_node_get_start@Base 4.2.5
linkage_constituent_tree@Base 4.2.5
linkage_corpus_cost@Base 4.6.5
linkage_create@Base 4.2.2
linkage_delete@Base 4.2.2
linkage_disjunct_cost@Base 4.2.2
linkage_free_constituent_tree@Base 4.2.5
linkage_free_constituent_tree_str@Base 4.3.5
linkage_free_diagram@Base 4.3.5
linkage_free_disjuncts@Base 4.6.5
linkage_free_links_and_domains@Base 4.3.9
linkage_free_postscript@Base 4.3.5
linkage_free_pp_msgs@Base 5.3.7
linkage_free_senses@Base 4.6.5
linkage_get_current_sublinkage@Base 4.6.5
linkage_get_disjunct_corpus_score@Base 4.6.5
linkage_get_disjunct_cost@Base 4.6.5
linkage_get_disjunct_str@Base 4.6.5
......@@ -68,16 +41,10 @@ liblink-grammar.so.4 liblink-grammar4 #MINVER#
linkage_get_link_rlabel@Base 4.2.2
linkage_get_link_rword@Base 4.2.2
linkage_get_num_links@Base 4.2.2
linkage_get_num_sublinkages@Base 4.2.2
linkage_get_num_words@Base 4.2.2
linkage_get_sentence@Base 4.2.2
linkage_get_violation_name@Base 4.2.2
linkage_get_word@Base 4.2.2
linkage_get_words@Base 4.2.2
linkage_has_inconsistent_domains@Base 4.2.2
linkage_is_canonical@Base 4.2.2
linkage_is_fat@Base 4.7.0
linkage_is_improper@Base 4.2.2
linkage_link_cost@Base 4.2.2
linkage_post_process@Base 4.2.2
linkage_print_constituent_tree@Base 4.2.2
......@@ -85,115 +52,72 @@ liblink-grammar.so.4 liblink-grammar4 #MINVER#
linkage_print_disjuncts@Base 4.6.5
linkage_print_links_and_domains@Base 4.2.2
linkage_print_postscript@Base 4.2.2
linkage_print_pp_msgs@Base 5.3.7
linkage_print_senses@Base 4.6.5
linkage_set_current_sublinkage@Base 4.2.2
linkage_unused_word_cost@Base 4.2.2
linkgrammar_get_dict_version@Base 4.6.7
linkgrammar_get_version@Base 4.6.5
lperrmsg@Base 4.2.2
lperrno@Base 4.2.2
lperror_clear@Base 4.3.9
#MISSING: 4.6.5-1# match@Base 4.3.9
match_in_connector_set@Base 4.3.9
object_open@Base 4.6.5
parse_info_new@Base 4.7.4
parse_options_create@Base 4.2.2
parse_options_delete@Base 4.2.2
parse_options_get_all_short_connectors@Base 4.2.2
parse_options_get_allow_null@Base 4.2.2
parse_options_get_batch_mode@Base 4.2.2
parse_options_get_cost_model_type@Base 4.6.5
parse_options_get_debug@Base 5.3.7
parse_options_get_disjunct_cost@Base 4.2.2
parse_options_get_disjunct_costf@Base 4.6.5
parse_options_get_display_bad@Base 4.2.2
parse_options_get_display_constituents@Base 4.2.2
parse_options_get_display_disjuncts@Base 4.6.5
parse_options_get_display_links@Base 4.2.2
parse_options_get_display_on@Base 4.2.2
parse_options_get_display_postscript@Base 4.2.2
parse_options_get_display_senses@Base 4.6.5
parse_options_get_display_union@Base 4.2.2
parse_options_get_display_walls@Base 4.2.2
parse_options_get_echo_on@Base 4.2.2
parse_options_get_display_morphology@Base 5.3.7
parse_options_get_islands_ok@Base 4.2.2
parse_options_get_linkage_limit@Base 4.2.2
parse_options_get_max_memory@Base 4.2.2
parse_options_get_max_null_count@Base 4.2.2
parse_options_get_max_parse_time@Base 4.2.2
parse_options_get_max_sentence_length@Base 4.2.2
parse_options_get_min_null_count@Base 4.2.2
parse_options_get_null_block@Base 4.2.2
parse_options_get_panic_mode@Base 4.2.2
parse_options_get_screen_width@Base 4.2.2
parse_options_get_repeatable_rand@Base 5.3.7
parse_options_get_short_length@Base 4.2.2
parse_options_get_spell_guess@Base 4.6.5
parse_options_get_test@Base 5.3.7
parse_options_get_use_cluster_disjuncts@Base 4.6.5
parse_options_get_use_fat_links@Base 4.7.0
parse_options_get_use_sat_parser@Base 4.6.5
parse_options_get_use_viterbi@Base 5.3.7
parse_options_get_verbosity@Base 4.2.2
parse_options_memory_exhausted@Base 4.2.2
parse_options_print_total_time@Base 4.6.5
parse_options_reset_resources@Base 4.2.2
parse_options_resources_exhausted@Base 4.2.2
parse_options_set_all_short_connectors@Base 4.2.2
parse_options_set_allow_null@Base 4.2.2
parse_options_set_batch_mode@Base 4.2.2
parse_options_set_cost_model_type@Base 4.2.2
parse_options_set_debug@Base 5.3.7
parse_options_set_disjunct_cost@Base 4.2.2
parse_options_set_disjunct_costf@Base 4.6.5
parse_options_set_display_bad@Base 4.2.2
parse_options_set_display_constituents@Base 4.2.2
parse_options_set_display_disjuncts@Base 4.6.5
parse_options_set_display_links@Base 4.2.2
parse_options_set_display_on@Base 4.2.2
parse_options_set_display_postscript@Base 4.2.2
parse_options_set_display_senses@Base 4.6.5
parse_options_set_display_union@Base 4.2.2
parse_options_set_display_walls@Base 4.2.2
parse_options_set_echo_on@Base 4.2.2
parse_options_set_display_morphology@Base 5.3.7
parse_options_set_islands_ok@Base 4.2.2
parse_options_set_linkage_limit@Base 4.2.2
parse_options_set_max_memory@Base 4.2.2
parse_options_set_max_null_count@Base 4.2.2
parse_options_set_max_parse_time@Base 4.2.2
parse_options_set_max_sentence_length@Base 4.2.2
parse_options_set_min_null_count@Base 4.2.2
parse_options_set_null_block@Base 4.2.2
parse_options_set_panic_mode@Base 4.2.2
parse_options_set_screen_width@Base 4.2.2
parse_options_set_repeatable_rand@Base 5.3.7
parse_options_set_short_length@Base 4.2.2
parse_options_set_spell_guess@Base 4.6.5
parse_options_set_test@Base 5.3.7
parse_options_set_use_cluster_disjuncts@Base 4.6.5
parse_options_set_use_fat_links@Base 4.7.0
parse_options_set_use_sat_parser@Base 4.6.5
parse_options_set_use_viterbi@Base 5.3.7
parse_options_set_verbosity@Base 4.2.2
parse_options_timer_expired@Base 4.2.2
post_process_close@Base 4.2.2
post_process_match@Base 4.3.9
post_process_open@Base 4.2.2
print_dictionary_data@Base 5.3.7
print_one_disjunct@Base 4.6.5
#MISSING: 4.6.5-1# print_total_time@Base 4.3.5
prt_error@Base 4.3.9
prune_match@Base 4.3.9
sentence_and_cost@Base 4.3.5
sentence_contains_conjunction@Base 4.3.9
regex_tokenizer_test@Base 5.3.7
sentence_create@Base 4.2.2
sentence_delete@Base 4.2.2
sentence_disjunct_cost@Base 4.2.2
sentence_get_nth_word@Base 4.2.2
sentence_get_word@Base 4.2.2
sentence_length@Base 4.2.2
sentence_link_cost@Base 4.3.5
sentence_nth_word_has_disjunction@Base 4.2.2
sentence_null_count@Base 4.2.2
sentence_num_linkages_found@Base 4.2.2
sentence_num_linkages_post_processed@Base 4.2.2
sentence_num_thin_linkages@Base 4.7.0
sentence_num_valid_linkages@Base 4.2.2
sentence_num_violations@Base 4.2.2
sentence_parse@Base 4.2.2
sentence_split@Base 4.6.5
#MISSING: 4.6.5-1# set_data_dir@Base 4.3.5
set_has_fat_down@Base 4.3.9
xalloc@Base 4.3.9
xfree@Base 4.3.9
debian/tmp/usr/share/link-grammar/en/
usr/share/link-grammar/en/
debian/tmp/usr/share/link-grammar/lt/
usr/share/link-grammar/lt/
From: Jeremy Bicha <jbicha@linux.com>
Date: Sun, 29 May 2016 15:38:38 -0400
Subject: fix configure.ac
Turn off a few things that don't work right when I run autoreconf
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9f84eb2..baafcff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_HEADER_STDC
LT_INIT([win32-dll])
-AM_BINRELOC
+#AM_BINRELOC
PKG_PROG_PKG_CONFIG
# The below says "use the C compiler for all remaining tests".
@@ -610,7 +610,7 @@ fi
# to actually install it. However, swig is needed to create the package,
# and also needed to build from a github pull. Hmmm. What to do ...
-AX_PKG_SWIG(2.0.0, [SwigF=yes], [SwigF=no])
+#AX_PKG_SWIG(3.0.0, [SwigF=yes], [SwigF=no])
AC_CHECK_PROG(SWIGfound, swig, yes, no)
if test "x$SwigFound" = "xyes"; then
AX_SWIG_ENABLE_CXX
0001-fix-configure.ac.patch
#!/usr/bin/make -f
# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
# This file is public domain.
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND= -Wl,-O1 -Wl,--as-needed
# doesn't build with -Wl,-z,defs
DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS=-Wl,--as-needed
ifneq (,$(shell dh_listpackages -s | grep liblink-grammar4-java))
WITH_JAVA := yes
ifneq (,$(shell dh_listpackages -s | grep liblink-grammar5-java))
WITH_JAVA := yes
JAVA_HOME := /usr/lib/jvm/default-java
#DEB_DH_MAKESHLIBS_ARGS_liblink-grammar5-java := --no-act
else
WITH_JAVA := no
endif
ifeq (yes,$(WITH_JAVA))
DEB_CONFIGURE_SCRIPT_ENV += JAVA_HOME=/usr/lib/jvm/default-java
DEB_DH_MAKESHLIBS_ARGS_liblink-grammar4-java := --no-act
WITH_JAVA := no
endif
DEB_INSTALL_MANPAGES_link-grammar := man/link-parser.1
%:
dh $@ --parallel --with autoreconf
clean::
override_dh_auto-clean:
$(RM) -r bin/org
$(RM) linkgrammar-*.jar
common-install-impl::
if [ $(WITH_JAVA) = yes ]; then \
install -d debian/tmp/usr/lib/jni; \
mv debian/tmp/usr/lib/liblink-grammar-java* debian/tmp/usr/lib/jni; \
install -d debian/tmp/usr/share/java; \
fi;
override_dh_auto_configure:
dh_auto_configure -- \
--disable-static --enable-pthreads \
--without-binreloc --disable-viterbi
override_dh_auto_install:
dh_auto_install
dh_install -pliblink-grammar5-java \
usr/lib/$(DEB_HOST_MULTIARCH)/liblink-grammar-java.so* \
usr/lib/$(DEB_HOST_MULTIARCH)/jni
dh_install --list-missing
override_dh_auto_test:
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