sync lintian overrides against sid

diff --git a/debian/changelog b/debian/changelog
index 42362f5..d036556 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,4 +26,4 @@ cvs (2:1.12.13-4) unstable; urgency=low
   * Clarify package description (LP: #377411)
   * Build with Kerberos V support (Closes: #60800) (LP: #157760)
 
- -- Thorsten Glaser <tg@mirbsd.de>  Fri, 06 May 2011 23:25:29 +0000
+ -- Thorsten Glaser <tg@mirbsd.de>  Fri, 06 May 2011 23:46:09 +0000

diff --git a/debian/lintian/cvs b/debian/lintian/cvs
index c44b997..e43d974 100644 (file)
--- a/debian/lintian/cvs
+++ b/debian/lintian/cvs
@@ -1,8 +1,9 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.7 2011/05/06 23:28:42 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/lintian/cvs,v 1.8 2011/05/06 23:46:19 tg Exp $
 
 # these are just contrib
 cvs: csh-considered-harmful usr/share/cvs/contrib/sccs2rcs
 cvs: missing-dep-for-interpreter csh *
 
 # this is part of the ABI
-cvs: spelling-error-in-binary usr/bin/cvs misformed malformed
+#XXX lintian 2.5.0~rc3 stopped complaining about it? why?
+#cvs: spelling-error-in-binary usr/bin/cvs misformed malformed

diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 76f09f3..e6a0be9 100644 (file)
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,4 +1,8 @@
-# $MirOS: contrib/hosted/tg/deb/cvs/debian/source.lintian-overrides,v 1.2 2010/09/20 08:41:13 tg Exp $
+# $MirOS: contrib/hosted/tg/deb/cvs/debian/source.lintian-overrides,v 1.3 2011/05/06 23:46:19 tg Exp $
 
 # we know, who cares, this is the way this package works
 cvs source: direct-changes-in-diff-but-no-patch-system *
+
+# not my fault
+cvs source: source-contains-cvs-control-dir zlib/CVS
+cvs source: source-contains-cvs-control-dir zlib/os2/CVS