diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/NEWS | 41 | ||||
| -rw-r--r-- | debian/README.build-system | 2 | ||||
| -rw-r--r-- | debian/changelog | 43 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rw-r--r-- | debian/copyright | 41 | ||||
| -rw-r--r-- | debian/librules-manual.txt | 8 | ||||
| -rw-r--r-- | debian/librules.mk | 9 |
7 files changed, 133 insertions, 12 deletions
diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..e75e0e1 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,41 @@ +grep-dctrl (1.103) unstable; urgency=low + + The annoying banner which was added in version 1.100 and which asked + for testing has been removed. The banner logic used the dotfile + ~/.grep-dctrl-banner-shown, which can now be safely removed from all + home directories. The banner logic only ever existed in unstable; it + was never in any version of grep-dctrl that was released with Debian + stable. + + Grep-dctrl now adheres to the same exit value conventions as grep(1). + It also supports grep's -q option. + + -- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 1 Jan 2004 20:44:10 +0200 + +grep-dctrl (1.100) unstable; urgency=low + + This version was a total rewrite of grep-dctrl. This added several + new features, made it run generally faster and, of course, added some + bugs and regressions. + + The big new feature is support for boolean queries. The new feature + allows combining searches arbitrarily using propositional connectives + (and, or and not). The command line syntax has been extended to + support this feature, but all old invocations work the same (modulo + bugs and regressions). See the manual page for more information. + + There are also several known regressions (presented here in order + of severity): + - The -Ffoo,bar,baz feature that allows searching in multiple fields + is not supported. However, this is not that bad, as the same effect + can be obtained by using the new boolean query syntax (ie. instead of + saying -FPackage,Description foo, say -FPackage foo -o -FDescription + foo). + - There is no longer any internationalization support and hence no + translations of messages. + + This version added an annoying banner asking for testing. It has been + later removed. + + -- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 1 Jan 2004 20:37:52 +0200 + diff --git a/debian/README.build-system b/debian/README.build-system index 3dd5cb9..8e7108e 100644 --- a/debian/README.build-system +++ b/debian/README.build-system @@ -1,5 +1,5 @@ -$Id: README.build-system,v 1.4 2003/08/10 16:43:16 ajk Exp $ +$Id: README.build-system,v 1.2 2000/04/25 21:58:52 ajk Exp $ This package uses a new experimental debian/rules helper, librules.mk, written by Antti-Juhani Kaijanaho <ajk@debian.org>. Documentation for diff --git a/debian/changelog b/debian/changelog index 35a666b..ef4fd12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +grep-dctrl (1.103) unstable; urgency=low + + * grep_dctrl.c (banner, main, parse_option): Disable the banner. + * predicate.c (predicate_finish_atom): Don't bail out if the field name + is missing; instead, just don't add the missing field name to the + trie. Thanks to Jeff King for diagnosis and patch. + Closes: #205998 (regex/eregex support produces no results) + * grep-dctrl.c (main): Track whether any matches were found and choose + exit status based on that. + Closes: #216549 (Return 0 for success, 1 for failure, like grep does) + * grep-dctrl.1.cp: Add grep-available and grep-status to NAME section + and mention them in the SYNOPSIS. + Closes: #199762 (mention grep-available in synopsys) + * grep-dctrl.1.cp: Add dpkg available and status files to FILES section. + Closes: #204781 (Add available and status file to FILES section on the + man page) + * Use the grep return value 2 for errors: + - msg.h (fail, errors_reported, record_error): New function. + - msg.h (line_message), msg.c (errors): Record any use of L_IMPORTANT + or above + - Change exit(EXIT_FAILURE) to fail() everywhere. + - Add record_error invocations where appropriate. + Closes: #225806 (Return 2 for error, like grep does) + * grep-dctrl.c (main): Check the file type and fail if necessary. + Thanks to Tuomas Jormola. + Closes: #212939 (Segfaults if there are directories in the input file list) + Closes: #222461 (segfaults if given .* as the predicator) + * grep-dctrl.c (parse_option): Replace the multiple -F/-P assert with a + helpful error message. + Closes: #215182 (some man page examples fail) + * grep-dctrl.1.cp (SEE ALSO): dpkg(1) -> dpkg(8), thanks to Frank + Lichtenheld. + Closes: #213297 (there is no dpkg(1) manpage, it's dpkg(8)) + * debian/copyright: Added 2004 to copyright years and recoded to UTF-8. + * grep.dctrl.1.cp: Document the new -q | --quiet | --silent option + and the exit value semantics. + * debian/NEWS.Debian: New file. + * Get rid of the build-time dependency to publib-dev by incorporating + the required functions in grep-dctrl. This is by request from Lars + Wirzenius, who wants to get rid of publib-dev. + + -- Antti-Juhani Kaijanaho <ajk@debian.org> Thu, 1 Jan 2004 23:19:54 +0200 + grep-dctrl (1.102) unstable; urgency=low * paragraph.c (para_parse_next) [case BODY_NEWLINE]: Do not declare eof diff --git a/debian/control b/debian/control index 2b2684d..3531777 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: utils Priority: optional Maintainer: Antti-Juhani Kaijanaho <ajk@debian.org> Standards-Version: 3.6.0 -Build-Depends: publib-dev Package: grep-dctrl Architecture: any diff --git a/debian/copyright b/debian/copyright index e193d9c..16d9332 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,10 @@ This package and the program in it were written and debianized by -Antti-Juhani Kaijanaho <ajk@debian.org>. +Antti-Juhani Kaijanaho <ajk@debian.org>. The program contains code by +Lars Wirzenius. Copyright: - Copyright (C) 1999, 2000, 2001, 2002, 2003 Antti-Juhani Kaijanaho + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Antti-Juhani Kaijanaho 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 @@ -20,10 +21,10 @@ Copyright: the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - The author can be reached via mail at (ISO 8859-1 charset for the city) + The author can be reached via mail at (UTF-8 charset for the city) Antti-Juhani Kaijanaho Helokantie 1 A 16 - FIN-40640 JYVÄSKYLÄ + FIN-40640 JYVÄSKYLÄ FINLAND EUROPE and via electronic mail from @@ -31,6 +32,36 @@ Copyright: If you have a choice, use the email address; it is more likely to stay current. - In Debian systems, the GNU GPL version 2 is available at /usr/share/common-licenses/GPL . + +The files getaline.c and fnutil.c are covered by the following +copyright: + + Copyright (c) 1994 Lars Wirzenius. All rights reserved. + Copyright (C) 2004 Antti-Juhani Kaijanaho. All rights reserved. + + 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 list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS + OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY + DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE + GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + WHETHER IN CONTRACT, STRICT LIABILITY, 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. + diff --git a/debian/librules-manual.txt b/debian/librules-manual.txt index f577112..10e1ff9 100644 --- a/debian/librules-manual.txt +++ b/debian/librules-manual.txt @@ -1,6 +1,6 @@ Manual for the librules helper -*- Text -*- ------------------------------ -Last modified: 2002-10-16 +Last modified: 2004-01-01 This file documents an experimental new debian/rules helper, a makefile called "librules.mk", which does all the boring work of @@ -39,9 +39,11 @@ debian/stamp/binary/<package>: debian/stamp/build $(postbinary) touch $@ - The $(prebinary) macro will create a skeletal build tree for the + The $(prebinary) macro will create a skeletal build tree for the package. It also install the copyright file (debian/copyright) - and the Debian changelog file (debian/changelog). + and the Debian changelog file (debian/changelog). If there is a + debian/NEWS, it will install it as NEWS.Debian to the + documentation directory, compressed. See below for instructions about how to write your own install commands. diff --git a/debian/librules.mk b/debian/librules.mk index c5fa631..298b341 100644 --- a/debian/librules.mk +++ b/debian/librules.mk @@ -1,6 +1,6 @@ # librules.mk - a library of convenient rules and macros for debian/rules files # -# Copyright © 1999, 2000, 2002, 2003 Antti-Juhani Kaijanaho. +# Copyright © 1999, 2000, 2002, 2003, 2004 Antti-Juhani Kaijanaho. # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this file, to deal in this file without @@ -29,6 +29,7 @@ # 3.6.0. # Changes: +# 2004-01-01 ajk Install NEWS.Debian if it exists # 2003-08-10 ajk Add $(etcdir) # 2002-10-16 ajk Don't force installing the prerm/postinst scripts # Instead, install them if present. @@ -145,7 +146,11 @@ define prebinary $(install_dir) $(docdir) $(install_nonex) debian/copyright $(docdir) $(install_nonex) debian/changelog $(docdir)/$(librules_changelog) - $(gzip) $(docdir)/$(librules_changelog) + set -e ; if test -e debian/NEWS ; then \ + $(install_nonex) debian/NEWS $(docdir)/NEWS.Debian ; \ + $(gzip) $(docdir)/NEWS.Debian ; \ + fi + $(gzip) $(docdir)/$(librules_changelog) endef define postbinary |