[Pkg-ocaml-maint-commits] [SCM] OCaml packaging branch, master, updated. debian/3.11.1-2-10-gd768538
Mehdi Dogguy
dogguy at pps.jussieu.fr
Fri Jul 24 00:18:40 UTC 2009
The following commit has been merged in the master branch:
commit d768538288b12ee184b342d2e2b70e419cd14b54
Author: Mehdi Dogguy <dogguy at pps.jussieu.fr>
Date: Fri Jul 24 02:18:21 2009 +0200
Fix a typo in debian/control{,.in}
diff --git a/debian/control b/debian/control
index 281b107..fccd283 100644
--- a/debian/control
+++ b/debian/control
@@ -46,12 +46,12 @@ Recommends:
camlp4,
file
Replaces:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
camlp4 (<< 3.10.0),
focaml (<< 3.07.2a-3),
libnums-ocaml-dev
Conflicts:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
camlp4 (<< 3.10.0),
camlidl (<< 1.04),
ocaml (<< 3.07.2a-3),
@@ -169,11 +169,11 @@ Depends:
Provides:
${ocaml:Provides}
Replaces:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
ocaml-base (<< 3.07.2a-3),
libnums-ocaml
Conflicts:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
ocaml (<< 3.04-2),
ocaml-base (<< 3.07.2a-3),
libnums-ocaml
diff --git a/debian/control.in b/debian/control.in
index 0566682..32d4b18 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -46,12 +46,12 @@ Recommends:
camlp4,
file
Replaces:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
camlp4 (<< 3.10.0),
focaml (<< 3.07.2a-3),
libnums-ocaml-dev
Conflicts:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
camlp4 (<< 3.10.0),
camlidl (<< 1.04),
ocaml (<< 3.07.2a-3),
@@ -169,11 +169,11 @@ Depends:
Provides:
${ocaml:Provides}
Replaces:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
ocaml-base (<< 3.07.2a-3),
libnums-ocaml
Conflicts:
- ocaml-interp (<< 3.11.1-2),
+ ocaml-interp (<< 3.11.1-3),
ocaml (<< 3.04-2),
ocaml-base (<< 3.07.2a-3),
libnums-ocaml
--
OCaml packaging
More information about the Pkg-ocaml-maint-commits
mailing list