Hi, the final NMU patch which fixes both bugs is attached to this mail.
Cheers, Bernd -- Bernd Zeimetz <[EMAIL PROTECTED]> <http://bzed.de/>
diff -uwNr tmp/mcvs-1.0.13/debian/changelog mcvs-1.0.13/debian/changelog --- tmp/mcvs-1.0.13/debian/changelog 2008-04-06 18:20:48.000000000 +0200 +++ mcvs-1.0.13/debian/changelog 2008-04-06 18:30:54.000000000 +0200 @@ -1,3 +1,33 @@ +mcvs (1.0.13-17.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Sandro Tosi ] + * debian/rules + - removed some binary files left behind (Closes: #424566) + * debian/control + - bump Standards-Version to 3.7.3 + - removed revision from versioned build-dep + - moved Homepage field to source stanza + * debian/mcvs.{postinst,postrm,prerm} + - removed since empty + * debian/copyright + - added a real license notice + - added a real copyright notice + - indented upstream author with 4 spaces + + [ Bernd Zeimetz ] + * debian/control: + - Adding quilt, libdb-dev and libffcall1-dev to build-dep. + * debian/patches: + - Adding add-missing-includes patch to fix a build failure with + gcc >= 4.1 (Closes: #450441). + * debian/rules: + - Adding calls to quilt. + - Removing even more cruft from the build in the clean target. + + -- Bernd Zeimetz <[EMAIL PROTECTED]> Sun, 06 Apr 2008 18:15:44 +0200 + mcvs (1.0.13-17) unstable; urgency=low * Build-Depend on latest clisp, for FFI support on mips/mipsel diff -uwNr tmp/mcvs-1.0.13/debian/control mcvs-1.0.13/debian/control --- tmp/mcvs-1.0.13/debian/control 2008-04-06 18:20:48.000000000 +0200 +++ mcvs-1.0.13/debian/control 2008-04-06 18:17:42.000000000 +0200 @@ -1,9 +1,10 @@ Source: mcvs -Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), clisp-dev (>= 1:2.39-1), clisp (>= 1:2.39-1) +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), clisp-dev (>= 1:2.39), clisp (>= 1:2.39), quilt, libffcall1-dev, libdb-dev Section: devel Priority: optional Maintainer: Robin Verduijn <[EMAIL PROTECTED]> -Standards-Version: 3.7.2.0 +Standards-Version: 3.7.3 +Homepage: http://users.footprints.net/~kaz/mcvs.html Package: mcvs Architecture: any @@ -17,5 +18,3 @@ - Simple branching and merging - Support for symbolic links and meta-data - Tracking of third party code containing moves and renames - . - More information can be found at http://users.footprints.net/~kaz/mcvs.html diff -uwNr tmp/mcvs-1.0.13/debian/copyright mcvs-1.0.13/debian/copyright --- tmp/mcvs-1.0.13/debian/copyright 2008-04-06 18:20:48.000000000 +0200 +++ mcvs-1.0.13/debian/copyright 2008-04-06 17:30:05.000000000 +0200 @@ -2,9 +2,32 @@ Mon, 3 Mar 2003 13:21:45 -0100. It was downloaded from http://users.footprints.net/~kaz/mcvs.html -Upstream Author: Kaz Kylheku <[EMAIL PROTECTED]> -Copyright: Meta-CVS is licensed under the terms of the GNU GPL. +Upstream Author: + + Kaz Kylheku <[EMAIL PROTECTED]> + +Copyright: + + Copyright 2002-2004 Kaz Kylheku + +License: + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + + The GPL licence can be found in /usr/share/common-licenses on modern Debian systems. diff -uwNr tmp/mcvs-1.0.13/debian/mcvs.postinst mcvs-1.0.13/debian/mcvs.postinst --- tmp/mcvs-1.0.13/debian/mcvs.postinst 2008-04-06 18:20:48.000000000 +0200 +++ mcvs-1.0.13/debian/mcvs.postinst 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# diff -uwNr tmp/mcvs-1.0.13/debian/mcvs.postrm mcvs-1.0.13/debian/mcvs.postrm --- tmp/mcvs-1.0.13/debian/mcvs.postrm 2008-04-06 18:20:48.000000000 +0200 +++ mcvs-1.0.13/debian/mcvs.postrm 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# diff -uwNr tmp/mcvs-1.0.13/debian/mcvs.prerm mcvs-1.0.13/debian/mcvs.prerm --- tmp/mcvs-1.0.13/debian/mcvs.prerm 2008-04-06 18:20:48.000000000 +0200 +++ mcvs-1.0.13/debian/mcvs.prerm 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# diff -uwNr tmp/mcvs-1.0.13/debian/patches/add-missing-includes mcvs-1.0.13/debian/patches/add-missing-includes --- tmp/mcvs-1.0.13/debian/patches/add-missing-includes 1970-01-01 01:00:00.000000000 +0100 +++ mcvs-1.0.13/debian/patches/add-missing-includes 2008-04-06 18:14:28.000000000 +0200 @@ -0,0 +1,24 @@ +Index: mcvs-1.0.13/code/unix-bindings/wrap.h +=================================================================== +--- mcvs-1.0.13.orig/code/unix-bindings/wrap.h 2008-04-06 18:13:30.000000000 +0200 ++++ mcvs-1.0.13/code/unix-bindings/wrap.h 2008-04-06 18:14:22.000000000 +0200 +@@ -1,5 +1,19 @@ ++#include <termio.h> ++#include <stddef.h> ++#include <bits/ipctypes.h> + #include <dirent.h> + ++ ++//definitions from http://clisp.cvs.sourceforge.net/clisp/clisp/modules/bindings/glibc/linux.lisp?revision=1.25&view=markup ++//lines 1852:1858 ++#ifndef __USE_FILE_OFFSET64 ++typedef __ino_t clisp_dirent_ino_t; ++typedef __off_t clisp_dirent_off_t; ++#else ++typedef __ino64_t clisp_dirent_ino_t; ++typedef __off64_t clisp_dirent_off_t; ++#endif ++ + #define MCVS_WRAP(FUNC, RETTYPE, ARGNAMES, ARGDECLS) \ + RETTYPE mcvs_ ## FUNC ARGDECLS; + diff -uwNr tmp/mcvs-1.0.13/debian/patches/series mcvs-1.0.13/debian/patches/series --- tmp/mcvs-1.0.13/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ mcvs-1.0.13/debian/patches/series 2008-04-06 18:08:47.000000000 +0200 @@ -0,0 +1 @@ +add-missing-includes diff -uwNr tmp/mcvs-1.0.13/debian/rules mcvs-1.0.13/debian/rules --- tmp/mcvs-1.0.13/debian/rules 2008-04-06 18:20:48.000000000 +0200 +++ mcvs-1.0.13/debian/rules 2008-04-06 18:27:39.000000000 +0200 @@ -5,6 +5,7 @@ # include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk common-install-arch:: cd code; ./install.sh /usr $(DEB_DESTDIR) @@ -22,8 +23,12 @@ DEB_SHLIBDEPS_LIBRARY := mcvs clean:: - rm -rf $(CWD)/debian/mcvs \ + rm -rf $(CURDIR)/debian/mcvs \ code/unix-bindings-linking-set \ - code/meta-cvs + code/meta-cvs \ + code/dynmod \ + code/mcvs.mem + rm -f changelog + rm -f code/*.fas code/*.lib make -C code/unix-bindings clean make -C docs clean