[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.5.0-60-gd4f0d3d
Stephane Glondu
steph at glondu.net
Tue Sep 22 21:18:26 UTC 2009
The following commit has been merged in the master branch:
commit bd697b061edd70e8c41d46a35690fcba63d33547
Author: Stephane Glondu <steph at glondu.net>
Date: Tue Sep 22 21:01:57 2009 +0200
dh_ocaml / ocaml-lintian bug squashing party
diff --git a/debhelper/Makefile b/debhelper/Makefile
index b40668c..8792a77 100644
--- a/debhelper/Makefile
+++ b/debhelper/Makefile
@@ -1,5 +1,5 @@
-PAGES=dh_ocaml.1 dh_ocamlinit.1 dh_ocamldoc.1 ocaml-md5sums.1
+PAGES=dh_ocaml.1 dh_ocamlinit.1 dh_ocamldoc.1 ocaml-md5sums.1 ocaml-lintian.1
all:
for i in $(PAGES); do \
diff --git a/debhelper/dh_ocaml b/debhelper/dh_ocaml
index 0996a00..dc2870c 100755
--- a/debhelper/dh_ocaml
+++ b/debhelper/dh_ocaml
@@ -42,8 +42,8 @@ init(options => {
=head1 SYNOPSIS
-B<dh_ocaml> [S<I<debhelper options>>]
- [B<--runtime-map>=I<dev:runtime,...>]
+B<dh_ocaml> [S<I<debhelper options>>]
+ [B<--runtime-map>=I<dev:runtime,...>]
[B<--nodefined-map>=I<dev:ignore1,ignore2>]
[B<--checksum>=I<str>]
@@ -59,7 +59,7 @@ runtime for OCaml libraires (e.g. plugin and shared library, usually named
libXXX-ocaml) and those shipping OCaml bytecode non-custom executables (i.e.
executables interpreted by /usr/bin/ocamlrun).
-On specific package the convention is XXX for development and XXX-base for
+On specific package the convention is XXX for development and XXX-base for
runtime (e.g. ocaml-nox and ocaml-base-nox).
On OCaml library packages dh_ocaml will firstly look at OCaml objects shipped
@@ -112,7 +112,7 @@ dependency from XXXX to the appropriate libYYYY-ocaml-NNNN packages.
=back
-For runtime package ${ocaml:Provides} will be set libXXXX-ocaml-NNNN and
+For runtime package ${ocaml:Provides} will be set libXXXX-ocaml-NNNN and
for development package to libXXX-ocaml-dev-NNNN.
=head1 OPTIONS
@@ -123,10 +123,10 @@ for development package to libXXX-ocaml-dev-NNNN.
Checksum are automatically computed from exported interface by the dev/runtime
package. This checksum can only show a partial information about the interface.
-In this case the checksum computation can be replaced by another string which
+In this case the checksum computation can be replaced by another string which
gives more information about dependencies.
-Typically, ocaml-nox/ocaml-base-nox package doesn't use a computed checksum but
+Typically, ocaml-nox/ocaml-base-nox package doesn't use a computed checksum but
the version of OCaml.
=item B<--nodefined-map> I<dev1:unit1,unit2,...>
@@ -136,7 +136,7 @@ with care. It is a very special case, when one library ship a drop-in replacemen
for another library. Most of the time if one library ship the same unit it
should be considered as an error.
-This option can be repeated as much as needed to define ignore for all development
+This option can be repeated as much as needed to define ignore for all development
packages.
=item B<--runtime-map> I<dev1:runtime1,dev2:runtime2,...>
@@ -288,7 +288,7 @@ foreach (keys(%dev_packages), values(%dev_packages), @binary_packages)
# Flags for calling ocaml-md5sums
my $flags = "";
$flags .= " -v" if $dh{VERBOSE};
-$flags .= " -checksum $dh{CHECKSUM}" if $dh{CHECKSUM};
+$flags .= " --checksum $dh{CHECKSUM}" if $dh{CHECKSUM};
verbose_print "+++ Remove former .olist.debhelper files +++";
foreach (keys(%dev_packages), @binary_packages) {
@@ -338,7 +338,7 @@ foreach my $package (keys(%dev_packages), @binary_packages)
open(OLIST, ">", $olist_fn) unless $dh{NO_ACT};
# Search for OCaml bytecode binaries
foreach (@search_path)
- {
+ {
die "E: $_ directory must exist when invoking dh_ocaml\n" unless -d $_;
};
find
@@ -360,11 +360,11 @@ foreach my $package (keys(%dev_packages), @binary_packages)
my @paths = map {"$_/usr/lib" if -e "$_/usr/lib"} @search_path;
foreach (@paths)
- {
+ {
die "E: $_ directory must exist when invoking dh_ocaml\n" unless -d $_;
};
- find
+ find
sub {
($_ =~ /\.cm([iaox]|x[as])$/)
&&
@@ -399,7 +399,7 @@ foreach my $package (keys(%dev_packages)) {
# compute md5sums files
doit(qw/mkdir -p/, dirname $md5sums_fn);
- complex_doit("$omd5 $local_flags"
+ complex_doit("$omd5 $local_flags"
. " --dump-info $oinfo_fn"
. " --dump-provides $oprovides_fn"
. " compute < ".$olist{$package}
@@ -412,8 +412,8 @@ foreach my $package (keys(%dev_packages)) {
{
my @META = ();
my $obj_dir = (tmpdir $runtime)."/usr/lib";
- find(sub {push (@META, $File::Find::name) if $_ =~ /META(\..+)?/},
- $obj_dir)
+ find(sub {push (@META, $File::Find::name) if $_ =~ /META(\..+)?$/},
+ $obj_dir)
if -d $obj_dir;
foreach (@META)
{
@@ -503,7 +503,7 @@ This program is a part of debhelper.
=head1 AUTHORS
-Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>,
+Stefano Zacchiroli <zack at debian.org>, Samuel Mimram <smimram at debian.org>,
Mehdi Dogguy <mehdi at dogguy.org>, Sylvain Le Gall <gildor at debian.org>
=cut
diff --git a/debhelper/ocaml-lintian b/debhelper/ocaml-lintian
index c1e42be..75ea324 100755
--- a/debhelper/ocaml-lintian
+++ b/debhelper/ocaml-lintian
@@ -16,6 +16,7 @@ my $package_dev;
my $package_runtime;
my $package_version;
my $checksum;
+my $md5sums_dir;
sub process_not_option
{
@@ -29,13 +30,14 @@ sub get_objects
}
GetOptions(
- "package=s" => \$package_dev,
- "runtime=s" => \$package_runtime,
- "version=s" => \$package_version,
- "checksum=s" => \$checksum,
- "<>" => \&process_not_option,
- "help|?" => \$help,
- "man" => \$man) or pod2usage(2);
+ "package=s" => \$package_dev,
+ "runtime=s" => \$package_runtime,
+ "version=s" => \$package_version,
+ "checksum=s" => \$checksum,
+ "md5sums-dir=s" => \$md5sums_dir,
+ "<>" => \&process_not_option,
+ "help|?" => \$help,
+ "man" => \$man) or pod2usage(2);
pod2usage(1) if $help;
pod2usage(-exitstatus => 0, -verbose => 2) if $man;
diff --git a/debian/install b/debian/install
index 303b9bf..371497c 100644
--- a/debian/install
+++ b/debian/install
@@ -4,5 +4,6 @@ debhelper/dh_ocaml usr/bin
debhelper/dh_ocamlinit usr/bin
debhelper/dh_ocamldoc usr/bin
debhelper/ocaml-md5sums usr/bin
+debhelper/ocaml-lintian usr/bin
tools/* usr/bin
debhelper/ocaml.pm usr/share/perl5/Debian/Debhelper/Sequence
--
dh-ocaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list