--- whichman-2.4.orig/debian/changelog +++ whichman-2.4/debian/changelog @@ -0,0 +1,100 @@ +whichman (2.4-5) unstable; urgency=low + + * Add copyright notice (lintian), + + -- Robert Luberda Sat, 19 Apr 2008 16:04:29 +0200 + +whichman (2.4-4) unstable; urgency=low + + * Use quilt to manage patches, move old debian patch to 01_debian.patch. + * Build with debhelper v6. + * 10_skip_duplicates.patch: Avoid duplicated files from `ftwhich' and + `whichman' output (closes: #452068). + * Standards-Version: 3.7.3 (no changes). + * debian/control: Add Homepage URL. + + -- Robert Luberda Tue, 29 Jan 2008 22:39:17 +0100 + +whichman (2.4-3) unstable; urgency=low + + * Fix the `debian-rules-ignores-make-clean-error'. + and manpage-has-errors-from-man' lintian errors. + * Bump debhelper compat version to 6. + * Standards-Version: 3.7.2 (no changes). + + -- Robert Luberda Mon, 15 Oct 2007 21:37:39 +0200 + +whichman (2.4-2) unstable; urgency=low + + * Fix typos in ftwhich(1) and ftff(1) man pages. + (Closes: #306727,#306728). + * Add debian/watch file. + + -- Robert Luberda Fri, 29 Apr 2005 19:06:43 +0200 + +whichman (2.4-1) unstable; urgency=low + + * New upstream version. + + -- Robert Luberda Tue, 20 Apr 2004 19:48:32 +0200 + +whichman (2.3-2) unstable; urgency=low + + * Opps, man pages went to /usr/share/man/man1/man1. Fixed. + + -- Robert Luberda Sun, 28 Mar 2004 23:15:17 +0200 + +whichman (2.3-1) unstable; urgency=low + + * New upstream version. + * Standards-Version: 3.6.1 (no changes). + + -- Robert Luberda Wed, 24 Mar 2004 19:39:44 +0100 + +whichman (2.2-1) unstable; urgency=low + + * New upstream version. + * debian/control: remove ending dot from the first line of the description + field (lintian). + * debian/copyright: update URLs. + * Standards-Version: 3.5.8 (no changes). + + -- Robert Luberda Thu, 9 Jan 2003 00:01:13 +0100 + +whichman (2.0-3) unstable; urgency=low + + * Upgrade to Standards: 3.5.7 + * Build in debhelper in v4 mode. + + -- Robert Luberda Tue, 22 Oct 2002 22:20:23 +0200 + +whichman (2.0-2) unstable; urgency=low + + * Corrected spelling error in description (closes: #125481) and upstream + README file. Thanks to Matt Ziemmerman. + * Standards-Version: 3.5.6 (no changes). + + -- Robert Luberda Sat, 22 Dec 2001 22:22:00 +0100 + +whichman (2.0-1) unstable; urgency=low + + * New upstream version. + * Fixed gcc 3.0 warnings. + + -- Robert Luberda Fri, 6 Jul 2001 22:49:21 +0200 + +whichman (1.9-2) unstable; urgency=low + + * Some fixes in manpages. + * Updated debian/rules to the newest debhelper. + * Standards-Version: 3.5.5. + + -- Robert Luberda Wed, 4 Jul 2001 22:58:46 +0200 + +whichman (1.9-1) unstable; urgency=low + + * Initial release (closes: #83624). + * Use default Debian manpath if environment variable MANPATH + is not set. + + -- Robert Luberda Mon, 29 Jan 2001 20:30:47 +0100 --- whichman-2.4.orig/debian/control +++ whichman-2.4/debian/control @@ -0,0 +1,25 @@ +Source: whichman +Section: utils +Priority: optional +Maintainer: Robert Luberda +Build-Depends: debhelper (>= 6), quilt (>= 0.46) +Standards-Version: 3.7.3 + +Package: whichman +Architecture: any +Depends: ${shlibs:Depends} +Description: Fault tolerant search utilities: whichman, ftff, ftwhich + whichman uses a fault tolerant approximate matching algorithm to search + for man-pages that match approximately the specified name. + The fault tolerant matching is very useful in cases where you remember only + roughly the name of a command. + . + Example: whichman netwhat + This finds netstat.8: /usr/share/man/man8/netstat.8 + . + ftff searches the directory tree. This is a case in-sensitive and fault + tolerant way of 'find . -name xxxx -print'. + . + ftwhich finds files which are in one of the directories in your PATH + and uses a fault tolerant search algorithm. +Homepage: http://linuxfocus.org/~guido/#whichman --- whichman-2.4.orig/debian/rules +++ whichman-2.4/debian/rules @@ -0,0 +1,81 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# This file is public domain software, originally written by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS = -Wall -g -O0 +else + CFLAGS = -Wall -g -O2 +endif + +include /usr/share/quilt/quilt.make + +build: patch build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) CFLAGS="$(CFLAGS)" STRIP=":" + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + $(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/ + $(MAKE) install CFLAGS="$(CFLAGS)" STRIP=":" \ + DESTDIR=$(CURDIR)/debian/$(shell dh_listpackages) + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs +# dh_installexamples +# dh_install +# dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo +# dh_undocumented +# dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_makeshlibs + dh_installdeb +# dh_perl + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- whichman-2.4.orig/debian/compat +++ whichman-2.4/debian/compat @@ -0,0 +1 @@ +6 --- whichman-2.4.orig/debian/docs +++ whichman-2.4/debian/docs @@ -0,0 +1 @@ +README --- whichman-2.4.orig/debian/copyright +++ whichman-2.4/debian/copyright @@ -0,0 +1,19 @@ +whichman was debianized by Robert Luberda +on Thu, 25 Jan 2001 22:29:16 +0100. + +whichman's home is ftp://www.ibiblio.org/pub/Linux/apps/doctools/ +or http://www.ibiblio.org/pub/Linux/apps/doctools/ +or http://linuxfocus.org/~guido/ + +Upstream Author: Guido Socher + +© 1998-2004 Guido Socher + +Copyright: + + This utility set is free software and comes without any warrenty. + It falls under the terms of the Gnu Public License (GPL). You can + get a copy of the GPL at sunsite.unc.edu /pub/Linux/LICENSES/gpl.license + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in file /usr/share/common-licenses/GPL. --- whichman-2.4.orig/debian/watch +++ whichman-2.4/debian/watch @@ -0,0 +1,3 @@ +version=2 +http://linuxfocus.org/~guido/whichman-([\d\.]+)\.tar\.gz + --- whichman-2.4.orig/debian/patches/series +++ whichman-2.4/debian/patches/series @@ -0,0 +1,2 @@ +01_debian.patch +10_skip_duplicates.patch --- whichman-2.4.orig/debian/patches/10_skip_duplicates.patch +++ whichman-2.4/debian/patches/10_skip_duplicates.patch @@ -0,0 +1,195 @@ +Patch for #452068: wanted: 'ftwhich' option to not print links or symlinks + +diff -Nur whichman-2.4.old/ftwhich.c whichman-2.4/ftwhich.c +--- whichman-2.4.old/ftwhich.c 2001-05-04 22:56:04.000000000 +0200 ++++ whichman-2.4/ftwhich.c 2008-01-27 14:46:54.000000000 +0100 +@@ -11,6 +11,7 @@ + #include + #include + #include "levdist.h" ++#include "statduplcheck.h" + + static void help(); + static char **splitpath(); +@@ -125,6 +126,9 @@ + matchfilename(*pathcomp, searchkey); + pathcomp++; + } ++ ++ free_statduplicates(); ++ + return (nomatchfound); + } + /*__END OF MAIN__*/ +@@ -161,8 +165,9 @@ + if ((stbuf.st_mode & S_IFREG)==0) return(0); + /* test if executable for user or grp or others */ + if ((stbuf.st_mode & S_IXUSR) || (stbuf.st_mode & S_IXGRP)\ +- ||(stbuf.st_mode & S_IXOTH)) return(1); +- return(0); ++ ||(stbuf.st_mode & S_IXOTH)) ++ if (is_statduplicate(&stbuf)) return(0); ++ return(1); + } + /* + * match all entries in the directory variable path points to +diff -Nur whichman-2.4.old/Makefile whichman-2.4/Makefile +--- whichman-2.4.old/Makefile 2008-01-27 14:45:55.000000000 +0100 ++++ whichman-2.4/Makefile 2008-01-27 14:46:54.000000000 +0100 +@@ -14,11 +14,11 @@ + + all:whichman ftff ftwhich + +-whichman: whichman.o levdist.o +- $(CC) -o $@ whichman.o levdist.o ++whichman: whichman.o levdist.o statduplcheck.o ++ $(CC) -o $@ whichman.o levdist.o statduplcheck.o + +-ftwhich: ftwhich.o levdist.o +- $(CC) -o $@ ftwhich.o levdist.o ++ftwhich: ftwhich.o levdist.o statduplcheck.o ++ $(CC) -o $@ ftwhich.o levdist.o statduplcheck.o + + ftff: ftff.o levdist.o + $(CC) -o $@ ftff.o levdist.o +@@ -31,6 +31,8 @@ + $(CC) $(CFLAGS) -c ftff.c + levdist.o: levdist.c levdist.h + $(CC) $(CFLAGS) -c levdist.c ++statduplcheck.o: statduplcheck.c statduplcheck.h ++ $(CC) $(CFLAGS) -c statduplcheck.c + + install: whichman ftff ftwhich $(MANP) + $(STRIP) whichman +diff -Nur whichman-2.4.old/statduplcheck.c whichman-2.4/statduplcheck.c +--- whichman-2.4.old/statduplcheck.c 1970-01-01 01:00:00.000000000 +0100 ++++ whichman-2.4/statduplcheck.c 2008-01-27 14:46:54.000000000 +0100 +@@ -0,0 +1,84 @@ ++#define _GNU_SOURCE /* for tdestroy */ ++#include "statduplcheck.h" ++#include ++#include ++#include ++#include ++#include ++ ++struct stat_info { ++ dev_t st_dev; ++ ino_t st_ino; ++}; ++ ++static void * info_root = NULL; ++ ++/* compare function passed to tsearch */ ++static int stat_info_compare(const void *si1, const void * si2) ++{ ++ int res; ++ ++ res = ((struct stat_info*)si1)->st_dev - ((struct stat_info*)si2)->st_dev; ++ if (!res) ++ res = ((struct stat_info*)si1)->st_ino - ((struct stat_info*)si2)->st_ino; ++ return res; ++} ++ ++int is_statduplicate(const struct stat *st) { ++ static struct stat_info * stinfo = NULL; ++ struct stat_info ** res; ++ ++ if (!stinfo) { ++ stinfo = (struct stat_info*) malloc (sizeof(*stinfo)); ++ ++ if (!stinfo) { ++ fprintf(stderr, "cannot allocate memory\n"); ++ exit(1); ++ } ++ ++ } ++ ++ stinfo->st_dev = st->st_dev; ++ stinfo->st_ino = st->st_ino; ++ ++ if (!(res = tsearch(stinfo, &info_root, stat_info_compare))) { ++ fprintf(stderr, "cannot allocate memory\n"); ++ exit(1); ++ } ++ ++ if (*res == stinfo) { ++ // new record ++ stinfo = NULL; ++ return 0; ++ } ++ ++ return 1; ++} ++ ++int is_fileduplicate(const char *dir, const char *name) { ++ static struct stat stbuf; ++ static char fullpath[255]; ++ ++ if (strlen(dir) + strlen(name) + 2 > sizeof(fullpath)) return (-1); ++ strcpy(fullpath, dir); ++ strcat(fullpath, "/"); ++ strcat(fullpath, name); ++ ++ if (stat(fullpath,&stbuf)!=0) return(-1); /* file does not exists */ ++ ++ return is_statduplicate(&stbuf); ++ ++} ++ ++void free_statduplicates(void) { ++ ++ if (!info_root) return; ++ ++ tdestroy(info_root, free); ++ info_root = NULL; ++ ++} ++ ++ ++ ++ +diff -Nur whichman-2.4.old/statduplcheck.h whichman-2.4/statduplcheck.h +--- whichman-2.4.old/statduplcheck.h 1970-01-01 01:00:00.000000000 +0100 ++++ whichman-2.4/statduplcheck.h 2008-01-27 14:46:54.000000000 +0100 +@@ -0,0 +1,11 @@ ++#ifndef STATDUPLCHECK_H ++#define STATDUPLCHECK_H ++ ++#include ++ ++extern int is_statduplicate(const struct stat *st); ++extern int is_fileduplicate(const char *dir, const char *name); ++extern void free_statduplicates(void); ++ ++ ++#endif +diff -Nur whichman-2.4.old/whichman.c whichman-2.4/whichman.c +--- whichman-2.4.old/whichman.c 2008-01-27 14:45:55.000000000 +0100 ++++ whichman-2.4/whichman.c 2008-01-27 14:46:54.000000000 +0100 +@@ -11,6 +11,7 @@ + #include + #include + #include "levdist.h" ++#include "statduplcheck.h" + + static void help(); + static char **splitman(); +@@ -143,6 +144,8 @@ + findmandir(*pathcomp, searchkey); + pathcomp++; + } ++ ++ free_statduplicates(); + return (nomanfilefound); + } + /*__END OF MAIN__*/ +@@ -249,7 +252,7 @@ + /* xxxxx.1.gz ->xxxxx :*/ + manname=removemanextesions(entry->d_name); + d=stringmatch(manname,key); +- if (d != -1){ ++ if (d != -1 && !is_fileduplicate(path, entry->d_name) ){ + if (printdist) printf("%03d ",d); + printf("%s/%s\n", path, entry->d_name); + nomanfilefound = 0; --- whichman-2.4.orig/debian/patches/01_debian.patch +++ whichman-2.4/debian/patches/01_debian.patch @@ -0,0 +1,215 @@ +diff -Nur whichman-2.4.old/Makefile whichman-2.4/Makefile +--- whichman-2.4.old/Makefile 2004-04-15 04:19:10.000000000 +0200 ++++ whichman-2.4/Makefile 2008-01-27 14:45:55.000000000 +0100 +@@ -9,6 +9,8 @@ + #sun c/c++-compiler: + #CC=CC + #CFLAGS= -O ++STRIP=strip ++ + + all:whichman ftff ftwhich + +@@ -31,9 +33,9 @@ + $(CC) $(CFLAGS) -c levdist.c + + install: whichman ftff ftwhich $(MANP) +- strip whichman +- strip ftwhich +- strip ftff ++ $(STRIP) whichman ++ $(STRIP) ftwhich ++ $(STRIP) ftff + [ -d "$(prefix)/bin" ] || $(INSTALL) -d $(prefix)/bin + [ -d "$(mandir)/man1" ] || $(INSTALL) -d $(mandir)/man1 + $(INSTALL) -m 755 whichman $(prefix)/bin +diff -Nur whichman-2.4.old/man1/ftff.1 whichman-2.4/man1/ftff.1 +--- whichman-2.4.old/man1/ftff.1 2001-05-04 23:02:59.000000000 +0200 ++++ whichman-2.4/man1/ftff.1 2008-01-27 14:45:55.000000000 +0100 +@@ -4,7 +4,7 @@ + .\" + .TH FTFF 1 "August 1998" "Search utilities" \" -*- nroff -*- + .SH NAME +-ftff \- fault tolerant file find utiltiy ++ftff \- fault tolerant file find utility + .SH SYNOPSIS + .B ftff + [\-#fFhIpq][\-t#][start_directory] file_to_find +@@ -110,8 +110,8 @@ + .PP + The last argument to ftff is not parsed for options as the program needs + at least one file-name argument. This means that +-.I ftff -x +-will not complain about a wrong option but search for the file named -x. ++.I ftff \-x ++will not complain about a wrong option but search for the file named \-x. + .SH EXAMPLE + .I ftff + .RB samething +@@ -139,5 +139,5 @@ + .SH AUTHOR + Guido Socher (guido@linuxfocus.org) + .SH SEE ALSO +-whichman(1) find(1) ++.BR whichman "(1), " find (1) + +diff -Nur whichman-2.4.old/man1/ftwhich.1 whichman-2.4/man1/ftwhich.1 +--- whichman-2.4.old/man1/ftwhich.1 2001-05-04 23:03:06.000000000 +0200 ++++ whichman-2.4/man1/ftwhich.1 2008-01-27 14:45:55.000000000 +0100 +@@ -2,7 +2,7 @@ + .\" This is free software and distributed under the + .\" terms of the Gnu Public License. + .\" +-.TH ftwhich 15 "January 1999" "Search utilities" \" -*- nroff -*- ++.TH FTWHICH 1 "January 1999" "Search utilities" \" -*- nroff -*- + .SH NAME + ftwhich \- fault tolerant search for a command name + .SH SYNOPSIS +@@ -15,7 +15,7 @@ + searches for a given program in all directories included in your + PATH environment variable and reports all files with a name that approximately + matches the given +-.B program_name. ++.I program_name. + .PP + .B ftwhich + achieves fault tolerance by calculating the so called +@@ -27,9 +27,9 @@ + into a string + .I B. + .PP +-.I ftwhich ++.B ftwhich + is similar to the +-.I which ++.B which + command with the following differences: + .TP + \- +@@ -40,15 +40,15 @@ + .TP + \- + Some shells have a build in +-.I which ++.B which + command that will also search aliases. +-.I ftwhich +-can naturaly not search for aliases as it does not know ++.B ftwhich ++can naturally not search for aliases as it does not know + about alias definitions. + .TP + \- + .B ftwhich +-lists all files that approximatly match. The files first ++lists all files that approximately match. The files first + shown take preference over files of the same name printed later as + they are from directories listed earlier in the PATH. + .TP +@@ -93,8 +93,8 @@ + .PP + The last argument to ftwhich is not parsed for options as the program needs + at least one program_name argument. This means that +-.I ftwhich -x +-will not complain about a wrong option but search for the program named -x. ++.I ftwhich \-x ++will not complain about a wrong option but search for the program named \-x. + .SH EXAMPLE + Search for all programs like gcc in your PATH: + .br +@@ -131,5 +131,5 @@ + .SH AUTHOR + Guido Socher (guido@linuxfocus.org) + .SH SEE ALSO +-whichman(1) ftff(1) ++.BR whichman "(1), " ftff (1) + +diff -Nur whichman-2.4.old/man1/whichman.1 whichman-2.4/man1/whichman.1 +--- whichman-2.4.old/man1/whichman.1 2001-05-04 23:03:23.000000000 +0200 ++++ whichman-2.4/man1/whichman.1 2008-01-27 14:45:55.000000000 +0100 +@@ -2,7 +2,7 @@ + .\" This is free software and only distributed under the + .\" terms of the Gnu Public License. Author: Guido Socher + .\" +-.TH whichman 1 "April 1998" "Search utilities" \" -*- nroff -*- ++.TH WHICHMAN 1 "April 1998" "Search utilities" \" -*- nroff -*- + .SH NAME + whichman \- show the location of a man page using a fault tolerant approximate matching algorithm + .SH SYNOPSIS +@@ -15,6 +15,10 @@ + searches the + .B MANPATH + environment variable. ++If this variable is not defined, then it uses ++.I "/usr/share/man:/usr/man:/usr/X11R6/man:" ++.I "/usr/local/share/man:/usr/local/man" ++by default. + .PP + Unlike "which" this program does not stop on the first match. The name + should probably have been something like whereman as this is not a +@@ -51,7 +55,7 @@ + permitted in finding the approximate match. A tolerance_level of zero + allows exact matches only but does NOT disable the wildcards * and ?. + .PP +-The search key may contain the wildcards * and ? (but see -e option): ++The search key may contain the wildcards * and ? (but see \-e option): + .TP + .BR '*' + any arbitrary number of character +@@ -61,19 +65,19 @@ + .PP + The last argument to whichman is not parsed for options as the program needs + at least one man-page-name argument. This means that +-.I whichman -x +-will not complain about a wrong option but search for the man-page named -x. ++.I whichman \-x ++will not complain about a wrong option but search for the man-page named \-x. + .SH EXAMPLE + .I whichman + .RB print + .PP + This will e.g. find the man-pages: + .br +-/usr/man/man1/printf.1.gz ++/usr/share/man/man1/printf.1.gz + .br +-/usr/man/man3/printf.3.gz ++/usr/share/man/man3/printf.3.gz + .br +-/usr/man/man3/rint.3.gz ++/usr/share/man/man3/rint.3.gz + .SH BUGS + The wildcards + .BR '?' +@@ -85,4 +89,4 @@ + .SH AUTHOR + Guido Socher (guido@linuxfocus.org) + .SH SEE ALSO +-ftff(1) man(1) ++.BR ftff "(1), " man (1) +diff -Nur whichman-2.4.old/README whichman-2.4/README +--- whichman-2.4.old/README 2004-04-15 04:21:05.000000000 +0200 ++++ whichman-2.4/README 2008-01-27 14:45:55.000000000 +0100 +@@ -44,7 +44,7 @@ + ftwhich -- a fault tolerant "which" command + + ftwhich finds files (programs) which are in one of the directories in +-your PATH and uses a fault tolerant search algorithem. ++your PATH and uses a fault tolerant search algorithm. + + Example, search all clocks: + > ftwhich -0 '*clock*' +diff -Nur whichman-2.4.old/whichman.c whichman-2.4/whichman.c +--- whichman-2.4.old/whichman.c 2003-01-04 22:39:47.000000000 +0100 ++++ whichman-2.4/whichman.c 2008-01-27 14:45:55.000000000 +0100 +@@ -399,8 +399,8 @@ + + mpath = (char *) getenv("MANPATH"); + if (mpath == NULL || *mpath == '\0') { +- fprintf(stderr,"Warning: MANPATH not defined, using /usr/man:/usr/share/man\n"); +- mpath="/usr/man:/usr/share/man"; ++/* fprintf(stderr,"Warning: MANPATH not defined, using /usr/man:/usr/share/man\n"); */ ++ mpath="/usr/share/man:/usr/man:/usr/X11R6/man:/usr/local/man"; + } + /* make a copy that is static */ + cmpath = (char *)malloc(sizeof(char)*(strlen(mpath) + 2));