Hi Jan, I've prepared an NMU for nvi to fix this issue. See the attached debdiff for the changes I made.
I'll upload it soon to DELAYED/10. Feel free to tell me in case I
should delay it longer or shorter.
Regards, Axel
--
,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/
: :' : | Debian Developer, ftp.ch.debian.org Admin
`. `' | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE
`- | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5
diff -u nvi-1.81.6/debian/control nvi-1.81.6/debian/control --- nvi-1.81.6/debian/control +++ nvi-1.81.6/debian/control @@ -3,12 +3,12 @@ Priority: optional Maintainer: Jan Christoph Nordholz <he...@pool.math.tu-berlin.de> Standards-Version: 3.8.2 -Build-Depends: debhelper (>= 7), libncurses5-dev, libncursesw5-dev, autotools-dev, dpatch, libdb4.7-dev +Build-Depends: debhelper (>= 7), libncurses5-dev, libncursesw5-dev, autotools-dev, dpatch, libdb-dev Homepage: http://www.kotnet.org/~skimo/nvi/ Package: nvi Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Recommends: nvi-doc Description: 4.4BSD re-implementation of vi Vi is the original screen based text editor for Unix systems. @@ -23,6 +23,7 @@ Package: nvi-doc Architecture: all Section: doc +Depends: ${misc:Depends} Description: 4.4BSD re-implementation of vi - documentation files Vi is the original screen based text editor for Unix systems. It is considered the standard text editor, and is available on diff -u nvi-1.81.6/debian/copyright nvi-1.81.6/debian/copyright --- nvi-1.81.6/debian/copyright +++ nvi-1.81.6/debian/copyright @@ -13,9 +13,42 @@ Copyright (c) 1996, 1999, 2000, Sven Verdoolaege. All rights reserved. Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, Free Software Foundation, Inc. License: BSD-3 - On Debian systems, the complete text of the BSD License can be found in - /usr/share/common-licenses/BSD - + The following are the copyrights and redistribution conditions that apply + to this copy of the Vi software. + + /* + * Copyright (c) 1991, 1992, 1993, 1994 + * The Regents of the University of California. All rights reserved. + * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 + * Keith Bostic. All rights reserved. + * Copyright (c) 1999, 2000 + * Sven Verdoolaege. 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. + * 3. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. + */ + (The files in the clib/ subdirectory bear a BSD-4 license header, yet the only copyright holder of those files is the University of California, Berkeley, which removed the ad-clause in 1997 retroactively (i.e. it @@ -48,9 +81,43 @@ 4. This notice may not be removed or altered. - Subsequent modifications made by UCB are covered by BSD-3. - On Debian systems, the complete text of the BSD License can be found in - /usr/share/common-licenses/BSD + Subsequent modifications made by UCB are covered by BSD-3: + + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= + /*- + * Copyright (c) 1994 + * The Regents of the University of California. 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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. + * + * @(#)COPYRIGHT 8.1 (Berkeley) 3/16/94 + */ Files: debian/* Copyright: Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, Steve Greenland. diff -u nvi-1.81.6/debian/changelog nvi-1.81.6/debian/changelog --- nvi-1.81.6/debian/changelog +++ nvi-1.81.6/debian/changelog @@ -1,3 +1,18 @@ +nvi (1.81.6-8.2) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on libdb-dev (Closes: #621381) + * Bumped Standards-Version to 3.9.2 + - Included full license texts in debian/copyright instead of refering + to /usr/share/common-licenses/BSD (which is due to be removed from + common-licenses) + * Added a dependency on ${misc:Depends} to each binary to fix the lintian + warning debhelper-but-no-misc-depends. + * Added a README.source (based on dpatch's standard README.source) to + fix the lintian warning patch-system-but-no-source-readme. + + -- Axel Beckert <a...@debian.org> Sat, 14 May 2011 19:31:12 +0200 + nvi (1.81.6-8.1) unstable; urgency=medium * Non-maintainer upload. only in patch2: unchanged: --- nvi-1.81.6.orig/debian/README.source +++ nvi-1.81.6/debian/README.source @@ -0,0 +1,28 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + dpatch apply-all + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "dpatch deapply-all" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + -- Axel Beckert <a...@debian.org>, Sat, 14 May 2011 18:52:01 +0200
signature.asc
Description: Digital signature
