Bug#475026: lintian: Recognize +nmuX as a native NMU

[James Vega <jamessan@debian.org>]

Package: lintian
Version: 1.23.46
Severity: wishlist
Tags: patch

Recently the debchange script from devscripts started using +nmuX to
indicate an NMU of a native package after some discussion on -devel[0].
The attached patch updates lintian's nmu check to recognize this version
format as a valid version.  There is also a small update to nmu.desc to
indicate that "+nmuX" is allowed for NMUs of native packages.

[0] Start of thread at
    <http://lists.debian.org/debian-devel/2008/03/msg00498.html>
-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (499, 'experimental')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages lintian depends on:
ii  binutils            2.18.1~cvs20080103-4 The GNU assembler, linker and bina
ii  diffstat            1.45-2               produces graph of changes introduc
ii  dpkg-dev            1.14.16.6            package building tools for Debian
ii  file                4.23-2               Determines file type using "magic"
ii  gettext             0.17-2               GNU Internationalization utilities
ii  intltool-debian     0.35.0+20060710.1    Help i18n of RFC822 compliant conf
ii  libparse-debianchan 1.1.1-2              parse Debian changelogs and output
ii  liburi-perl         1.35.dfsg.1-1        Manipulates and accesses URI strin
ii  man-db              2.5.1-3              on-line manual pager
ii  perl [libdigest-md5 5.8.8-12             Larry Wall's Practical Extraction 

lintian recommends no packages.

-- no debconf information

Index: checks/nmu.desc
===================================================================
--- checks/nmu.desc	(revision 1267)
+++ checks/nmu.desc	(working copy)
@@ -19,8 +19,9 @@
 
 Tag: source-nmu-has-incorrect-version-number
 Type: warning
-Info: A source NMU should have a Debian revision of "-x.x". This is to prevent
- stealing version numbers from the maintainer.
+Info: A source NMU should have a Debian revision of "-x.x" (or "+nmuX" for a
+ native package). This is to prevent stealing version numbers from the
+ maintainer.
  .
  Maybe you didn't intend this upload to be a NMU, in that case, please
  doublecheck that the most recent entry in the changelog is byte-for-byte
Index: checks/nmu
===================================================================
--- checks/nmu	(revision 1267)
+++ checks/nmu	(working copy)
@@ -67,6 +67,9 @@
 	$version_nmuness = 1 if defined $1;
 	$version_nmuness = 2 if defined $2;
 }
+if ($version =~ /\+nmu\d+$/) {
+	$version_nmuness = 1;
+}
 if ($version =~ /\+b\d+$/) {
 	$version_nmuness = 2;
 }