[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-4-g18aff3b



The following commit has been merged in the master branch:
commit 18aff3b7dcab63eca36626b576dd58f23d44ccd9
Author: Benjamin Drung <bdrung@debian.org>
Date:   Fri Mar 11 11:59:43 2011 +0100

    Added oneiric as a valid Ubuntu dist
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/changes-file.desc b/checks/changes-file.desc
index d0709f7..dda3f32 100644
--- a/checks/changes-file.desc
+++ b/checks/changes-file.desc
@@ -41,8 +41,8 @@ Info: You've specified an unknown target distribution for your upload in
  the <tt>debian/changelog</tt> file.
  .
  Your version string suggests this package is for Ubuntu, so your
- distribution should be one of natty, maverick, lucid, karmic, hardy, or
- dapper.
+ distribution should be one of oneiric, natty, maverick, lucid, karmic, hardy,
+ or dapper.
 
 Tag: multiple-distributions-in-changes-file
 Severity: important
diff --git a/data/changelog-file/ubuntu-dists b/data/changelog-file/ubuntu-dists
index a97264e..5c25962 100644
--- a/data/changelog-file/ubuntu-dists
+++ b/data/changelog-file/ubuntu-dists
@@ -7,3 +7,4 @@ karmic
 lucid
 maverick
 natty
+oneiric
diff --git a/debian/changelog b/debian/changelog
index 93dc40a..f788cce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,19 @@ lintian (2.5.0~rc2) UNRELEASED; urgency=low
     + [ADB] Update binary-from-other-architecture's tests in line with the
       changes to filename output introduced in 2.5.0~rc1.
       (Closes: #614906)
+  * checks/changes-file.desc:
+    + [NT] Added oneiric as valid Ubuntu distribution.  Thanks to Benjamin
+      Drung for the patch.  (Closes: #617227)
   * checks/deb-format:
     + [NT] Removed assumption that there was always a changelog in a binary
       with a data.tar.lzma member.
   * checks/huge-usr-share:
     + [NT] Removed assumption that there is always files in usr/share.
 
+  * data/changelog-file/ubuntu-dists:
+    + [NT] Added oneiric as valid Ubuntu distribution.  Thanks to Benjamin
+      Drung for the patch.
+
  -- Adam D. Barratt <adam@adam-barratt.org.uk>  Fri, 25 Feb 2011 17:48:59 +0000
 
 lintian (2.5.0~rc1) experimental; urgency=low

-- 
Debian package checker


Reply to: