tags 615787 + pending tags 626359 + patch tags 626359 + pending thanks Dear maintainers,
I've prepared an NMU for tokyotyrant (versioned as 1.1.40-4.1) and uploaded it to the archive. Attached is the patch with the changes. Ana
diff -Nru tokyotyrant-1.1.40/debian/changelog tokyotyrant-1.1.40/debian/changelog --- tokyotyrant-1.1.40/debian/changelog 2010-05-16 18:46:23.000000000 +0200 +++ tokyotyrant-1.1.40/debian/changelog 2011-09-10 16:45:16.000000000 +0200 @@ -1,3 +1,15 @@ +tokyotyrant (1.1.40-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Add patch to add all libraries needed to linker commandline. + Patch by Andreas Moog. (LP: #756048) (Closes: #615787) + * Fix FTBFS since start-stop-daemon resides under /sbin, and this path isn't + included in the standard path when building as non-root. This needs to + update the patch 003-run-service-make-check to add /sbin/ + Patch by Moritz Muehlenhoff. (Closes: #626359) + + -- Ana Beatriz Guerrero Lopez <a...@debian.org> Sat, 10 Sep 2011 16:45:01 +0200 + tokyotyrant (1.1.40-4) unstable; urgency=low * Fixed bashism in init script (Closes: #581141). diff -Nru tokyotyrant-1.1.40/debian/patches/003-run-service-make-check tokyotyrant-1.1.40/debian/patches/003-run-service-make-check --- tokyotyrant-1.1.40/debian/patches/003-run-service-make-check 2010-05-16 18:46:23.000000000 +0200 +++ tokyotyrant-1.1.40/debian/patches/003-run-service-make-check 2011-09-10 16:42:01.000000000 +0200 @@ -71,11 +71,11 @@ + if [ $(test_start_stop) -eq 1 ]; then \ + $(RUNENV); \ + export LD_LIBRARY_PATH; \ -+ start-stop-daemon -v -S -p $(test_pid) -d `pwd` --exec `pwd`/ttserver \ ++ /sbin/start-stop-daemon -v -S -p $(test_pid) -d `pwd` --exec `pwd`/ttserver \ + -- -host $(test_host) -port $(test_port) \ + -ld -dmn -pid $(test_pid) || exit 1; \ + \ -+ trap "start-stop-daemon -v -K -R TERM/30/KILL/5 -p $(test_pid) && rm -f $(test_pid)" 0; \ ++ trap "/sbin/start-stop-daemon -v -K -R TERM/30/KILL/5 -p $(test_pid) && rm -f $(test_pid)" 0; \ + fi; \ + \ + for i in `seq 5`; do \ diff -Nru tokyotyrant-1.1.40/debian/patches/006-no-add-needed tokyotyrant-1.1.40/debian/patches/006-no-add-needed --- tokyotyrant-1.1.40/debian/patches/006-no-add-needed 1970-01-01 01:00:00.000000000 +0100 +++ tokyotyrant-1.1.40/debian/patches/006-no-add-needed 2011-09-10 16:13:27.000000000 +0200 @@ -0,0 +1,51 @@ +Description: Add all needed libs to linker + with --no-add-needed you need to specify all libraries needed to link + the binaries, as the DT_NEEDED entries aren't copied anymore. +Author: Andreas Moog <am...@ubuntu.com> +Last-Update: 2011-07-09 + +--- tokyotyrant-1.1.40.orig/Makefile.in ++++ tokyotyrant-1.1.40/Makefile.in +@@ -57,7 +57,7 @@ CPPFLAGS = @MYCPPFLAGS@ \ + CFLAGS = @MYCFLAGS@ + LDFLAGS = @MYLDFLAGS@ + CMDLDFLAGS = @MYCMDLDFLAGS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -llua5.1 -ltokyocabinet + RUNENV = @MYLDLIBPATHENV@=. + POSTCMD = @MYPOSTCMD@ + +@@ -342,27 +342,27 @@ ttskelnull.bundle : ttskelnull.o + + + ttserver : ttserver.o scrext.o $(LIBRARYFILES) +- $(LDENV) $(CC) $(CFLAGS) -o $@ $< scrext.o $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant ++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< scrext.o $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS) + + + ttulmgr : ttulmgr.o $(LIBRARYFILES) +- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant ++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS) + + + ttultest : ttultest.o $(LIBRARYFILES) +- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant ++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS) + + + tcrtest : tcrtest.o $(LIBRARYFILES) +- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant ++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS) + + + tcrmttest : tcrmttest.o $(LIBRARYFILES) +- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant ++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS) + + + tcrmgr : tcrmgr.o $(LIBRARYFILES) +- $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant ++ $(LDENV) $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) $(CMDLDFLAGS) -ltokyotyrant $(LIBS) + + + myconf.o scrext.o : myconf.h diff -Nru tokyotyrant-1.1.40/debian/patches/series tokyotyrant-1.1.40/debian/patches/series --- tokyotyrant-1.1.40/debian/patches/series 2010-05-16 18:46:23.000000000 +0200 +++ tokyotyrant-1.1.40/debian/patches/series 2011-09-10 16:38:07.000000000 +0200 @@ -4,3 +4,4 @@ 003-run-service-make-check 004-kfreebsd-fix 005-change-default-port +006-no-add-needed
