[SCM] Debian package checker branch, master, updated. 2.0.0-rc1-14-g2d55c59
The following commit has been merged in the master branch:
commit 06d5e31bf9623c9288d247ce84f0413ec3ebcd9f
Author: Frank Lichtenheld <djpig@debian.org>
Date: Sun Sep 21 15:00:26 2008 +0200
checks/scripts: Accept the ocaml virtual packages as providing ocamlrun
Based on a patch by Stephane Glondu.
Closes: #495431
diff --git a/checks/scripts b/checks/scripts
index 26b4bb6..8013212 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -337,6 +337,8 @@ for my $filename (sort keys %{$info->scripts}) {
# Initialization files for csh.
} elsif ($base eq 'fish' && $filename =~ m,^\./etc/fish\.d/,) {
# Initialization files for fish.
+ } elsif ($base eq 'ocamlrun' && $all_deps =~ /\bocaml(-base)?(-nox)?-\d\.[\d.]+/) {
+ # ABI-versioned virtual packages for ocaml
} else {
tag('missing-dep-for-interpreter', "$base => $depends",
"($filename)");
diff --git a/debian/changelog b/debian/changelog
index 1f8fd7d..c8efc7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ lintian (2.0.0) unstable; urgency=low
* checks/fields{,.desc}:
+ [FL] Warn about Perl module packages superseded by Perl
core. Patch by Niko Tyni. (Closes: #498897)
+ * checks/scripts:
+ + [FL] Accept the ocaml virtual packages as providing ocamlrun.
+ Based on a patch by Stephane Glondu. (Closes: #495431)
* frontend/lintian:
+ [FL] Add support for ranges to --display-level.
diff --git a/t/tests/6000_scripts-ocamlrun.desc b/t/tests/6000_scripts-ocamlrun.desc
new file mode 100644
index 0000000..4859be0
--- /dev/null
+++ b/t/tests/6000_scripts-ocamlrun.desc
@@ -0,0 +1,6 @@
+Testname: scripts-ocamlrun
+Type: non-native
+Version: 1.0
+Description: Test correct handling of ocamlrun scripts
+Test-Against: missing-dep-for-interpreter
+References: Debian Bug#495431
diff --git a/t/templates/skel/debian/control.in b/t/tests/scripts-ocamlrun/debian/debian/control.in
similarity index 78%
copy from t/templates/skel/debian/control.in
copy to t/tests/scripts-ocamlrun/debian/debian/control.in
index bc8f6c0..d40a17a 100644
--- a/t/templates/skel/debian/control.in
+++ b/t/tests/scripts-ocamlrun/debian/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7)
Package: {$srcpkg}
Architecture: {$architecture}
-Depends: $\{shlib:Depends\}, $\{misc:Depends\}
+Depends: ocaml-nox-3.10.2, $\{shlib:Depends\}, $\{misc:Depends\}
Description: {$description}
.
Part of the lintian test suite.
diff --git a/t/tests/scripts-ocamlrun/tags b/t/tests/scripts-ocamlrun/tags
new file mode 100644
index 0000000..1a0dab6
--- /dev/null
+++ b/t/tests/scripts-ocamlrun/tags
@@ -0,0 +1 @@
+W: scripts-ocamlrun: binary-without-manpage usr/bin/script1
diff --git a/t/tests/scripts-ocamlrun/upstream/Makefile b/t/tests/scripts-ocamlrun/upstream/Makefile
new file mode 100644
index 0000000..54fa3ef
--- /dev/null
+++ b/t/tests/scripts-ocamlrun/upstream/Makefile
@@ -0,0 +1,8 @@
+default:
+ :
+
+install:
+ install -d $(DESTDIR)/usr/bin
+ install -m755 script1 $(DESTDIR)/usr/bin/
+
+.PHONY: distclean realclean clean install test check
diff --git a/t/tests/scripts-ocamlrun/upstream/script1 b/t/tests/scripts-ocamlrun/upstream/script1
new file mode 100644
index 0000000..49c50f2
--- /dev/null
+++ b/t/tests/scripts-ocamlrun/upstream/script1
@@ -0,0 +1 @@
+#!/usr/bin/ocamlrun
--
Debian package checker
Reply to: