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

[SCM] Debian package checker branch, master, updated. 2.4.3-240-g5a62e25



The following commit has been merged in the master branch:
commit 2685f90f88cdcafc4eeae3c4f8129907528865e1
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sat Feb 19 00:35:59 2011 -0600

    Allow ocaml as an alternative to ocaml-nox
    
    Additionally drop the version requirement, which is satisfied in
    squeeze.
    
    * checks/rules:
      + [RG] Allow 'ocaml' as an alternative to 'ocaml-nox'.  Thanks,
        Ralf Treinen.  (Closes: #612568)

diff --git a/checks/rules b/checks/rules
index cf0d210..230b8b6 100644
--- a/checks/rules
+++ b/checks/rules
@@ -56,7 +56,7 @@ our @GLOBAL_CLEAN_DEPENDS =
 # Build-Depends-Indep as appropriate; and optional tags as above.
 my @GLOBAL_DEPENDS =
     (
-     [ 'dh-ocaml (>= 0.9~), ocaml-nox (>= 3.11.1-3~)' => qr'^\t\s*dh_ocaml(?:init|doc)\s' ],
+     [ 'dh-ocaml, ocaml-nox | ocaml' => qr'^\t\s*dh_ocaml(?:init|doc)\s' ],
      [ $PYTHON_DEPEND => qr'^\t\s*dh_python\s', 'missing-dh_python-build-dependency' ],
      [ 'python-central' => qr'^\t\s*dh_pycentral\s' ],
      [ 'python-support' => qr'^\t\s*dh_pysupport\s' ],
@@ -71,7 +71,7 @@ my @RULE_CLEAN_DEPENDS =
     (
      [ 'ant | ant1.7' => qr'^\t\s*(\S+=\S+\s+)*ant\s' ],
      [ debhelper => qr'^\t\s*dh_.+' ],
-     [ 'dh-ocaml (>= 0.9~), ocaml-nox (>= 3.11.1-3~) ' => qr'^\t\s*(?:dh_ocamlinit|dh\s.*--with\s+(?:\S+,)*ocaml)\s' ],
+     [ 'dh-ocaml, ocaml-nox | ocaml' => qr'^\t\s*(?:dh_ocamlinit|dh\s.*--with\s+(?:\S+,)*ocaml)\s' ],
      [ dpatch => qr'^\t\s*(\S+=\S+\s+)*dpatch\s' ],
      [ "po-debconf" => qr'^\t\s*debconf-updatepo\s' ],
      [ $PYTHON_DEPEND => qr'^\t\s*python\s', 'missing-python-build-dependency' ],
diff --git a/debian/changelog b/debian/changelog
index 5544d2b..153bf34 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -141,6 +141,8 @@ lintian (2.5.0) UNRELEASED; urgency=low
       (Closes: #612137)
     + [RG] Correctly handle include directives preceded by a tab.
       (Closes: #607281)
+    + [RG] Allow 'ocaml' as an alternative to 'ocaml-nox'.  Thanks,
+      Ralf Treinen.  (Closes: #612568)
   * checks/scripts:
     + [NT] Added mscgen as interpreter.
   * checks/standards-version:

-- 
Debian package checker


Reply to: