[Pkg-ocaml-maint-commits] [SCM] approx upstream and debian packaging branch, upstream, updated. debian/2.06-22-gfdc1649

[Eric Cooper]

The following commit has been merged in the upstream branch:
commit 9644fac77ed1a661c2e8997bd2c85674f9da1896
Author: Eric Cooper <ecc at cmu.edu>
Date:   Wed Oct 15 13:58:41 2008 -0400

    use explicit version.ml for "upstream" version

diff --git a/mkversion b/mkversion
deleted file mode 100755
index b55fc0d..0000000
--- a/mkversion
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -Tw
-use strict;
-
-$ENV{PATH} = "/usr/bin";
-
-my $name = undef;
-my $number = undef;
-
-sub parse_changelog() {
-    open(CHANGELOG, "-|", "dpkg-parsechangelog") or exit 1;
-    while (<CHANGELOG>) {
-	$name = $1 if /^Source:\s+(\S+)/;
-	$number = $1 if /^Version:\s+(\S+)/;
-    }
-    close(CHANGELOG);
-    defined $name or die "$0: package name not found in changelog\n";
-    defined $number or die "$0: version number not found in changelog\n";
-}
-
-sub write_version() {
-    my $t = localtime;
-    print <<EOF;
-(* Automatically generated by $0 on $t *)
-
-let name = "$name"
-let number = "$number"
-EOF
-}
-
-parse_changelog();
-write_version();
diff --git a/myocamlbuild.ml b/myocamlbuild.ml
index d8ec212..8244064 100644
--- a/myocamlbuild.ml
+++ b/myocamlbuild.ml
@@ -22,10 +22,6 @@ let add_library lib =
   ocaml_lib ~extern: true ~dir: ("+" ^ inc) lib
 
 let custom_rules () =
-  rule "Use mkversion to generate version.ml"
-    ~dep: "debian/changelog" ~prod: "version.ml"
-    (fun _ _ -> Cmd (S [P (concat pwd "mkversion"); Sh "> version.ml"]));
-  dep ["compile"; "ocaml"; "file:log.ml"] ["version.ml"];
   dep ["link"; "ocaml"; "netstubs"] ["netstubs.o"];
   dep ["link"; "ocaml"; "libwrap"] ["libwrap.o"];
   flag ["link"; "ocaml"; "libwrap"] & S [A "-cclib"; A "-lwrap"];
diff --git a/patch.ml b/patch.ml
index 4eda72f..1b05f40 100644
--- a/patch.ml
+++ b/patch.ml
@@ -76,7 +76,7 @@ let range_of_string str =
 
 (* Ed commands are represented as operators on the
    input channel, output channel, and current line number.
-   When applied, each operator returns the updated the line number. *)
+   When applied, each operator returns the updated line number. *)
 
 type t = in_channel -> out_channel -> int -> int
 
diff --git a/tcp_wrappers.mli b/version.ml
similarity index 64%
copy from tcp_wrappers.mli
copy to version.ml
index ed928b8..4255827 100644
--- a/tcp_wrappers.mli
+++ b/version.ml
@@ -2,5 +2,5 @@
    Copyright (C) 2008  Eric C. Cooper <ecc at cmu.edu>
    Released under the GNU General Public License *)
 
-val hosts_ctl :
-  ?address:string -> ?host:string -> ?user:string -> string -> bool
+let name = "approx"
+let number = "3.4"

-- 
approx upstream and debian packaging