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

[SCM] Debian package checker branch, master, updated. 2.5.0-rc1-36-gb679ea1



The following commit has been merged in the master branch:
commit 074a0219ea2f3685037fbb9e0cac8f86704b92e6
Author: Joachim Breitner <nomeata@debian.org>
Date:   Sun Mar 27 12:40:38 2011 +0200

    Haskell package names dropped the 6 from libghc6
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/fields b/checks/fields
index d411add..65f4f57 100644
--- a/checks/fields
+++ b/checks/fields
@@ -142,7 +142,7 @@ my @NAME_SECTION_MAPPINGS = (
     [ qr/^lib.*-cil$/                  => 'cli-mono' ],
     [ qr/^lib.*-(?:java|gcj)$/         => 'java'     ],
     [ qr/^(?:lib)php-/                 => 'php'      ],
-    [ qr/^lib(?:hugs|ghc6)-/           => 'haskell'  ],
+    [ qr/^lib(?:hugs|ghc6?)-/          => 'haskell'  ],
     [ qr/^lib.*-ruby(?:1\.\d)?$/       => 'ruby'     ],
     [ qr/^lib.*-(?:ocaml|camlp4)-dev$/ => 'ocaml'    ],
     [ qr/^lib.*-dev$/                  => 'libdevel' ],
diff --git a/checks/menus b/checks/menus
index 4f789c2..93779b5 100644
--- a/checks/menus
+++ b/checks/menus
@@ -203,7 +203,7 @@ if ($docbase_file) {
     }
     closedir DOCBASEDIR;
 } elsif ($documentation) {
-    if ($pkg =~ /^libghc6-.*-doc$/) {
+    if ($pkg =~ /^libghc6?-.*-doc$/) {
         # This is the library documentation for a haskell library. Haskell
         # libraries register their documentation via the ghc compiler's
         # documetation registration mechanism.  See bug #586877.
diff --git a/debian/changelog b/debian/changelog
index 65a5f79..fc88542 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,8 @@ lintian (2.5.0~rc2) UNRELEASED; urgency=low
       Python team.  The tag was outdated and most instances of it was
       false positives.  Thanks to Piotr Ożarowski and Jakub Wilk for
       the report and clarification.  (Closes: #619487)
+    + [NT] Accepted patch from Joachim Breitner to support new Haskell
+      package naming scheme.
   * checks/files:
     + [NT] Also check files in /etc/cron.d for dots in filenames.  Thanks
       to Thijs Kinkhorst for the report and patch.  (Closes: #615072)
@@ -49,6 +51,8 @@ lintian (2.5.0~rc2) UNRELEASED; urgency=low
     + [NT] Fixed check for special files that does not need to be
       registered with doc-base (e.g.  README.html).  Thanks to
       Tanguy Ortolo for the report.  (Closes: #617266)
+    + [NT] Accepted patch from Joachim Breitner to support new Haskell
+      package naming scheme.  (Closes: #616403)
   * checks/patch-systems.desc:
     + [NT] Reduced unneeded-build-dep-on-quilt to a pedantic tag,
       since some people keep the dependency on quilt to ease

-- 
Debian package checker


Reply to: