diff -Nru snowball-0+svn527/compiler/analyser.c snowball-0+svn546/compiler/analyser.c --- snowball-0+svn527/compiler/analyser.c 2007-02-12 13:01:36.000000000 +0000 +++ snowball-0+svn546/compiler/analyser.c 2011-06-29 12:13:11.000000000 +0000 @@ -16,7 +16,7 @@ static void print_node_(struct node * p, int n, char * s) { int i; - for (i = 0; i < n; i++) printf(i == n - 1 ? s : " "); + for (i = 0; i < n; i++) fputs(i == n - 1 ? s : " ", stdout); printf("%s ", name_of_token(p->type)); unless (p->name == 0) report_b(stdout, p->name->b); unless (p->literalstring == 0) { @@ -79,9 +79,7 @@ static void error2(struct analyser * a, int n, int x) { struct tokeniser * t = a->tokeniser; count_error(a); - fprintf(stderr, "Line %d", t->line_number); - if (t->get_depth > 0) fprintf(stderr, " (of included file)"); - fprintf(stderr, ": "); + fprintf(stderr, "%s:%d: ", t->file, t->line_number); if (n >= 30) report_b(stderr, t->b); switch (n) { case 0: diff -Nru snowball-0+svn527/compiler/driver.c snowball-0+svn546/compiler/driver.c --- snowball-0+svn527/compiler/driver.c 2008-03-03 19:57:09.000000000 +0000 +++ snowball-0+svn546/compiler/driver.c 2011-06-29 12:13:11.000000000 +0000 @@ -184,13 +184,14 @@ read_options(o, argc, argv); { symbol * filename = add_s_to_b(0, argv[1]); - symbol * u = get_input(filename); + char * file; + symbol * u = get_input(filename, &file); if (u == 0) { fprintf(stderr, "Can't open input %s\n", argv[1]); exit(1); } { - struct tokeniser * t = create_tokeniser(u); + struct tokeniser * t = create_tokeniser(u, file); struct analyser * a = create_analyser(t); t->widechars = o->widechars; t->includes = o->includes; diff -Nru snowball-0+svn527/compiler/header.h snowball-0+svn546/compiler/header.h --- snowball-0+svn527/compiler/header.h 2008-03-03 19:57:09.000000000 +0000 +++ snowball-0+svn546/compiler/header.h 2011-06-29 12:13:11.000000000 +0000 @@ -53,11 +53,13 @@ }; +/* struct input must be a prefix of struct tokeniser. */ struct input { struct input * next; symbol * p; int c; + char * file; int line_number; }; @@ -69,11 +71,13 @@ }; +/* struct input must be a prefix of struct tokeniser. */ struct tokeniser { struct input * next; symbol * p; int c; + char * file; int line_number; symbol * b; symbol * b2; @@ -94,8 +98,8 @@ }; -extern symbol * get_input(symbol * p); -extern struct tokeniser * create_tokeniser(symbol * b); +extern symbol * get_input(symbol * p, char ** p_file); +extern struct tokeniser * create_tokeniser(symbol * b, char * file); extern int read_token(struct tokeniser * t); extern byte * name_of_token(int code); extern void close_tokeniser(struct tokeniser * t); diff -Nru snowball-0+svn527/compiler/tokeniser.c snowball-0+svn546/compiler/tokeniser.c --- snowball-0+svn527/compiler/tokeniser.c 2007-02-11 17:56:25.000000000 +0000 +++ snowball-0+svn546/compiler/tokeniser.c 2011-06-29 12:13:11.000000000 +0000 @@ -18,13 +18,13 @@ static int smaller(int a, int b) { return a < b ? a : b; } -extern symbol * get_input(symbol * p) { +extern symbol * get_input(symbol * p, char ** p_file) { char * s = b_to_s(p); { FILE * input = fopen(s, "r"); - free(s); - if (input == 0) return 0; + if (input == 0) { free(s); return 0; } + *p_file = s; { symbol * u = create_b(STARTSIZE); int size = 0; @@ -42,9 +42,7 @@ static void error(struct tokeniser * t, char * s1, int n, symbol * p, char * s2) { if (t->error_count == 20) { fprintf(stderr, "... etc\n"); exit(1); } - fprintf(stderr, "Line %d", t->line_number); - if (t->get_depth > 0) fprintf(stderr, " (of included file)"); - fprintf(stderr, ": "); + fprintf(stderr, "%s:%d: ", t->file, t->line_number); unless (s1 == 0) fprintf(stderr, "%s", s1); unless (p == 0) { int i; @@ -361,14 +359,15 @@ exit(1); } { + char * file; NEW(input, q); - symbol * u = get_input(t->b); + symbol * u = get_input(t->b, &file); if (u == 0) { struct include * r = t->includes; until (r == 0) { symbol * b = copy_b(r->b); b = add_to_b(b, SIZE(t->b), t->b); - u = get_input(b); + u = get_input(b, &file); lose_b(b); unless (u == 0) break; r = r->next; @@ -382,6 +381,7 @@ t->next = q; t->p = u; t->c = 0; + t->file = file; t->line_number = 1; } p = t->p; @@ -425,11 +425,12 @@ } } -extern struct tokeniser * create_tokeniser(symbol * p) { +extern struct tokeniser * create_tokeniser(symbol * p, char * file) { NEW(tokeniser, t); t->next = 0; t->p = p; t->c = 0; + t->file = file; t->line_number = 1; t->b = create_b(0); t->b2 = create_b(0); @@ -464,6 +465,6 @@ q = q_next; } } + free(t->file); FREE(t); } - diff -Nru snowball-0+svn527/debian/README.Debian snowball-0+svn546/debian/README.Debian --- snowball-0+svn527/debian/README.Debian 2010-03-12 18:09:32.000000000 +0000 +++ snowball-0+svn546/debian/README.Debian 2011-09-25 23:49:05.000000000 +0000 @@ -3,4 +3,4 @@ Snowball upstream doesn't build shared libraries, so they are Debian-specific. - -- Stefano Rivera Fri, 12 Mar 2010 20:04:32 +0200 + -- Stefano Rivera Fri, 12 Mar 2010 20:04:32 +0200 diff -Nru snowball-0+svn527/debian/changelog snowball-0+svn546/debian/changelog --- snowball-0+svn527/debian/changelog 2010-03-12 22:53:18.000000000 +0000 +++ snowball-0+svn546/debian/changelog 2012-12-09 23:43:21.000000000 +0000 @@ -1,3 +1,41 @@ +snowball (0+svn546-2chl1~natty1) natty; urgency=low + + * Build for natty. + + -- Chris Lea Sun, 09 Dec 2012 15:40:06 -0800 + +snowball (0+svn546-2) unstable; urgency=low + + * Pass dpkg-buildflags CFLAGS and LDFLAGS to dh_auto_build + - No need to check for noopt in build-options.diff any more. + * Drop unnecessary dh_auto_test override + + -- Stefano Rivera Mon, 26 Sep 2011 01:48:59 +0200 + +snowball (0+svn546-1) unstable; urgency=low + + * New upstream snapshot. + * Binary package descriptions: + - Provide the full description for all except -dbg. + - Mention that -dev contains static library. + * Patches: + - Renamed shared-module.diff -> shared-library.diff. + Removed explicit ranlib call. + - Moved all compile options changes into build-options.diff. + * Bump Standards-Version to 3.9.2, no changes needed. + * Bump debhelper compat to 8. + * Updated my e-mail address. + * Update copyright format. + * Sort *Depends and debhelper install file contents. + * Convert for multi-arch: + - libstemmer0d: Pre-Depend on ${misc:Pre-Depends} + - libstemmer0d{,-dbg}: Multi-Arch: same + - libstemmer-tools: Multi-Arch: foreign + - Install shared and static library to multi-arch location. + - Build-Depend on dpkg-dev >= 1.16. + + -- Stefano Rivera Sat, 10 Sep 2011 21:34:47 +0200 + snowball (0+svn527-1) unstable; urgency=low [ Stefano Rivera ] diff -Nru snowball-0+svn527/debian/control snowball-0+svn546/debian/control --- snowball-0+svn527/debian/control 2010-03-12 18:07:39.000000000 +0000 +++ snowball-0+svn546/debian/control 2012-12-09 23:41:55.000000000 +0000 @@ -1,17 +1,19 @@ Source: snowball Section: libs Priority: optional -Maintainer: Stefano Rivera +Maintainer: Stefano Rivera Uploaders: Jakub Wilk -Build-Depends: debhelper (>= 7.0.50~) -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7.0.50~), dpkg-dev (>= 1.15) +Standards-Version: 3.9.2 Homepage: http://snowball.tartarus.org/ -Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/snowball/trunk/ -Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/snowball/trunk/ +Vcs-Bzr: http://bzr.debian.org/bzr/collab-maint/snowball/trunk/ +Vcs-Browser: http://bzr.debian.org/loggerhead/collab-maint/snowball/trunk/ Package: libstemmer0d Architecture: any +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same Description: Snowball stemming algorithms for use in Information Retrieval Snowball provides access to efficient algorithms for calculating a "stemmed" form of a word. This is a form with most of the common @@ -32,6 +34,7 @@ Priority: extra Architecture: any Depends: libstemmer0d (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends} +Multi-Arch: same Description: Snowball stemming algorithms, debugging symbols Snowball provides access to efficient algorithms for calculating a "stemmed" form of a word. @@ -46,17 +49,39 @@ Depends: libstemmer0d (= ${binary:Version}), ${misc:Depends} Description: Snowball stemming algorithms, development kit Snowball provides access to efficient algorithms for calculating a - "stemmed" form of a word. + "stemmed" form of a word. This is a form with most of the common + morphological endings removed; hopefully representing a common + linguistic base form. This is most useful in building search engines + and information retrieval software; for example, a search with stemming + enabled should be able to find a document containing "cycling" given the + query "cycles". . - This package contains the header files used in development. + Snowball provides algorithms for several (mainly European) languages. + It also provides access to the classic Porter stemming algorithm for + English: although this has been superseded by an improved algorithm, the + original algorithm may be of interest to information retrieval + researchers wishing to reproduce results of earlier experiments. + . + This package contains the static library and header files used in development. Package: libstemmer-tools Section: text Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: foreign +Depends: ${misc:Depends}, ${shlibs:Depends} Description: Simple word stemming utility using Snowball Snowball provides access to efficient algorithms for calculating a - "stemmed" form of a word. + "stemmed" form of a word. This is a form with most of the common + morphological endings removed; hopefully representing a common + linguistic base form. This is most useful in building search engines + and information retrieval software; for example, a search with stemming + enabled should be able to find a document containing "cycling" given the + query "cycles". + . + Snowball provides algorithms for several (mainly European) languages. + It also provides access to the classic Porter stemming algorithm for + English: although this has been superseded by an improved algorithm, the + original algorithm may be of interest to information retrieval + researchers wishing to reproduce results of earlier experiments. . - This package contains "stemwords", a simple utility function for stemming - words. + This package contains "stemwords", a simple utility for stemming words. diff -Nru snowball-0+svn527/debian/copyright snowball-0+svn546/debian/copyright --- snowball-0+svn527/debian/copyright 2010-03-12 17:51:38.000000000 +0000 +++ snowball-0+svn546/debian/copyright 2011-09-25 23:49:05.000000000 +0000 @@ -1,11 +1,17 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135 -Name: snowball -Maintainer: Martin Porter +Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174 +Upstream-Name: snowball +Upstream-Contact: Martin Porter Source: http://snowball.tartarus.org/ +Comment: + Upstream doesn't include a COPYING file, as described here: + http://snowball.tartarus.org/license.php + Copyright information obtained from the above link, and license text from + the LICENSE file in pystemmer: + http://svn.tartarus.org/snowball/trunk/pystemmer/LICENSE Files: * -Copyright: 2001-2006, Dr Martin Porter and Richard Boulton -License: BSD +Copyright: 2001-2011, Dr Martin Porter and Richard Boulton +License: Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this @@ -28,17 +34,9 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: COPYING -X-Source: - Upstream doesn't include a COPYING file, as described here: - http://snowball.tartarus.org/license.php - Copyright information obtained from the above link, and license text from - the LICENSE file in pystemmer: - http://svn.tartarus.org/snowball/trunk/pystemmer/LICENSE - Files: debian/* Copyright: - 2010, Stefano Rivera + 2010-2011, Stefano Rivera License: GPL-2+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru snowball-0+svn527/debian/libstemmer-dev.install snowball-0+svn546/debian/libstemmer-dev.install --- snowball-0+svn527/debian/libstemmer-dev.install 2010-03-12 17:17:11.000000000 +0000 +++ snowball-0+svn546/debian/libstemmer-dev.install 2011-09-25 23:49:05.000000000 +0000 @@ -1,3 +1 @@ -libstemmer.so /usr/lib -libstemmer.a /usr/lib include/libstemmer.h /usr/include diff -Nru snowball-0+svn527/debian/libstemmer0d.install snowball-0+svn546/debian/libstemmer0d.install --- snowball-0+svn527/debian/libstemmer0d.install 2010-03-12 17:17:11.000000000 +0000 +++ snowball-0+svn546/debian/libstemmer0d.install 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -libstemmer*.so.* /usr/lib diff -Nru snowball-0+svn527/debian/patches/build-options.diff snowball-0+svn546/debian/patches/build-options.diff --- snowball-0+svn527/debian/patches/build-options.diff 1970-01-01 00:00:00.000000000 +0000 +++ snowball-0+svn546/debian/patches/build-options.diff 2011-09-25 23:49:05.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Move -Iinclude to CPPFLAGS +Author: Stefano Rivera +Forwarded: http://news.gmane.org/find-root.php?message_id=%3c20110821220427.GC1738%40bach.rivera.co.za%3e +Last-Update: 2011-09-25 + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -69,8 +69,8 @@ + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) + +-CFLAGS=-Iinclude -O2 +-CPPFLAGS=-W -Wall -Wmissing-prototypes -Wmissing-declarations ++CFLAGS=-O2 ++CPPFLAGS=-W -Wall -Wmissing-prototypes -Wmissing-declarations -Iinclude + + all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + diff -Nru snowball-0+svn527/debian/patches/noopt-build-option.diff snowball-0+svn546/debian/patches/noopt-build-option.diff --- snowball-0+svn527/debian/patches/noopt-build-option.diff 2010-03-12 18:21:16.000000000 +0000 +++ snowball-0+svn546/debian/patches/noopt-build-option.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Description: Respect noopt in DEB_BUILD_OPTIONS. -Author: Stefano Rivera -Forwarded: not-needed -Last-Update: 2010-03-12 - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -69,7 +69,11 @@ - JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) - JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) - --CFLAGS=-Iinclude -O2 -g -+CFLAGS=-Iinclude -g -+ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -+CFLAGS+=-O2 -+endif -+ - CPPFLAGS=-W -Wall -Wmissing-prototypes -Wmissing-declarations - - all: snowball libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) diff -Nru snowball-0+svn527/debian/patches/series snowball-0+svn546/debian/patches/series --- snowball-0+svn527/debian/patches/series 2010-03-12 18:21:16.000000000 +0000 +++ snowball-0+svn546/debian/patches/series 2011-09-25 23:49:05.000000000 +0000 @@ -1,3 +1,3 @@ -shared-module.diff +build-options.diff +shared-library.diff testdata-location.diff -noopt-build-option.diff diff -Nru snowball-0+svn527/debian/patches/shared-library.diff snowball-0+svn546/debian/patches/shared-library.diff --- snowball-0+svn527/debian/patches/shared-library.diff 1970-01-01 00:00:00.000000000 +0000 +++ snowball-0+svn546/debian/patches/shared-library.diff 2011-09-25 23:49:05.000000000 +0000 @@ -0,0 +1,105 @@ +Description: Build libstemmer as a shared library. +Author: Stefano Rivera +Forwarded: http://news.gmane.org/find-root.php?message_id=%3c20110821220427.GC1738%40bach.rivera.co.za%3e +Last-Update: 2011-09-25 + +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -72,12 +72,13 @@ + CFLAGS=-O2 + CPPFLAGS=-W -Wall -Wmissing-prototypes -Wmissing-declarations -Iinclude + +-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + + clean: + rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ + $(LIBSTEMMER_OBJECTS) $(LIBSTEMMER_UTF8_OBJECTS) $(STEMWORDS_OBJECTS) snowball \ +- libstemmer.o stemwords \ ++ $(wildcard libstemmer.so*) libstemmer.a \ ++ stemwords \ + libstemmer/modules.h \ + libstemmer/modules_utf8.h \ + snowball.splint \ +@@ -86,7 +87,7 @@ + $(JAVA_SOURCES) $(JAVA_CLASSES) $(JAVA_RUNTIME_CLASSES) \ + libstemmer/mkinc.mak libstemmer/mkinc_utf8.mak \ + libstemmer/libstemmer.c libstemmer/libstemmer_utf8.c +- rm -rf dist ++ rm -rf dist .shared + rmdir $(c_src_dir) || true + + snowball: $(COMPILER_OBJECTS) +@@ -108,11 +109,16 @@ + + libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) + +-libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) +- $(AR) -cru $@ $^ ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) \ ++ -Wl,--version-script=debian/libstemmer.ver,-soname,libstemmer.so.0d \ ++ -o $@.0d.0.0 ${^:%=.shared/%} ++ ln -s $@.0d.0.0 $@.0d ++ ln -s $@.0d.0.0 $@ ++ $(AR) -crs ${@:.so=.a} $^ + +-stemwords: $(STEMWORDS_OBJECTS) libstemmer.o +- $(CC) -o $@ $^ ++stemwords: $(STEMWORDS_OBJECTS) libstemmer.so ++ $(CC) -g -o $@ $(STEMWORDS_OBJECTS) -L. -lstemmer + + algorithms/%/stem_Unicode.sbl: algorithms/%/stem_ISO_8859_1.sbl + cp $^ $@ +@@ -146,7 +152,6 @@ + ./snowball $< -o $${o} -eprefix $${l}_ISO_8859_2_ -r ../runtime + + $(c_src_dir)/stem_%.o: $(c_src_dir)/stem_%.c $(c_src_dir)/stem_%.h +- $(CC) $(CFLAGS) -O2 -c -o $@ $< -Wall + + $(java_src_dir)/%Stemmer.java: algorithms/%/stem_Unicode.sbl snowball + @mkdir -p $(java_src_dir) +@@ -261,31 +266,38 @@ + + check_koi8r: $(KOI8_R_algorithms:%=check_koi8r_%) + ++STEMWORDS=LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./stemwords ++ + check_utf8_%: ../data/% stemwords + @echo "Checking output of `echo $<|sed 's!.*/!!'` stemmer with UTF-8" +- @./stemwords -c UTF_8 -l `echo $<|sed 's!.*/!!'` -i $ -Forwarded: no -Last-Update: 2010-03-08 - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -69,15 +69,16 @@ - JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) - JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) - --CFLAGS=-Iinclude -O2 -+CFLAGS=-Iinclude -O2 -g - CPPFLAGS=-W -Wall -Wmissing-prototypes -Wmissing-declarations - --all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) -+all: snowball libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) - - clean: - rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ - $(LIBSTEMMER_OBJECTS) $(LIBSTEMMER_UTF8_OBJECTS) $(STEMWORDS_OBJECTS) snowball \ -- libstemmer.o stemwords \ -+ $(wildcard libstemmer.so*) libstemmer.a \ -+ stemwords \ - libstemmer/modules.h \ - libstemmer/modules_utf8.h \ - snowball.splint \ -@@ -86,7 +87,7 @@ - $(JAVA_SOURCES) $(JAVA_CLASSES) $(JAVA_RUNTIME_CLASSES) \ - libstemmer/mkinc.mak libstemmer/mkinc_utf8.mak \ - libstemmer/libstemmer.c libstemmer/libstemmer_utf8.c -- rm -rf dist -+ rm -rf dist .shared - rmdir $(c_src_dir) || true - - snowball: $(COMPILER_OBJECTS) -@@ -108,11 +109,16 @@ - - libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) - --libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) -- $(AR) -cru $@ $^ -+libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) -+ $(CC) -g -shared -Wl,--version-script=debian/libstemmer.ver,-soname,libstemmer.so.0d \ -+ -o $@.0d.0.0 ${^:%=.shared/%} -+ ln -s $@.0d.0.0 $@.0d -+ ln -s $@.0d.0.0 $@ -+ $(AR) cru ${@:.so=.a} $^ -+ ranlib ${@:.so=.a} - --stemwords: $(STEMWORDS_OBJECTS) libstemmer.o -- $(CC) -o $@ $^ -+stemwords: $(STEMWORDS_OBJECTS) libstemmer.so -+ $(CC) -g -o $@ $(STEMWORDS_OBJECTS) -L. -lstemmer - - algorithms/%/stem_Unicode.sbl: algorithms/%/stem_ISO_8859_1.sbl - cp $^ $@ -@@ -146,7 +152,6 @@ - ./snowball $< -o $${o} -eprefix $${l}_ISO_8859_2_ -r ../runtime - - $(c_src_dir)/stem_%.o: $(c_src_dir)/stem_%.c $(c_src_dir)/stem_%.h -- $(CC) $(CFLAGS) -O2 -c -o $@ $< -Wall - - $(java_src_dir)/%Stemmer.java: algorithms/%/stem_Unicode.sbl snowball - @mkdir -p $(java_src_dir) -@@ -261,31 +266,38 @@ - - check_koi8r: $(KOI8_R_algorithms:%=check_koi8r_%) - -+STEMWORDS=LD_LIBRARY_PATH=.:$(LD_LIBRARY_PATH) ./stemwords -+ - check_utf8_%: ../data/% stemwords - @echo "Checking output of `echo $<|sed 's!.*/!!'` stemmer with UTF-8" -- @./stemwords -c UTF_8 -l `echo $<|sed 's!.*/!!'` -i $ +Author: Stefano Rivera Forwarded: not-needed -Last-Update: 2010-03-08 +Last-Update: 2011-02-05 --- a/GNUmakefile +++ b/GNUmakefile diff -Nru snowball-0+svn527/debian/rules snowball-0+svn546/debian/rules --- snowball-0+svn527/debian/rules 2010-03-12 17:40:58.000000000 +0000 +++ snowball-0+svn546/debian/rules 2011-09-25 23:49:05.000000000 +0000 @@ -1,8 +1,14 @@ #!/usr/bin/make -f +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh $@ +override_dh_auto_build: + dh_auto_build -- CFLAGS="$(shell dpkg-buildflags --get CFLAGS)" \ + LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS)" + override_dh_installdocs: dh_installdocs --link-doc=libstemmer0d @@ -10,10 +16,10 @@ dh_strip --dbg-package=libstemmer0d-dbg rm -rf debian/libstemmer0d-dbg/usr/lib/debug/usr/bin/ -override_dh_auto_test: -ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS))) - $(MAKE) check -endif +override_dh_install: + dh_install -plibstemmer0d libstemmer*.so.* /usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -plibstemmer-dev libstemmer.a libstemmer.so /usr/lib/$(DEB_HOST_MULTIARCH) + dh_install get-orig-source: set -e; \