[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.2-1-7-g7b96bb1

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 31f23f73ac989809a5becf455a559582515aad3d
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri May 7 22:54:41 2010 +0200

    Move META file to libocsigen-ocaml

diff --git a/debian/changelog b/debian/changelog
index 20cca5b..1f04e18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 ocsigen (1.3.3-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Move META file to libocsigen-ocaml
 
  -- Stéphane Glondu <glondu at debian.org>  Sun, 13 Jun 2010 11:03:46 +0200
 
diff --git a/debian/control b/debian/control
index f1ed871..ac1ffa2 100644
--- a/debian/control
+++ b/debian/control
@@ -98,11 +98,11 @@ Provides: ${ocaml:Provides}
 Replaces:
  ocsigen (<< 1.2.2),
  ocsigen-dev (<< 1.2.2),
- libocsigen-ocaml-dev (<< 1.3.0-3~)
+ libocsigen-ocaml-dev (<< 1.3.3)
 Conflicts:
  ocsigen (<< 1.2.2),
  ocsigen-dev (<< 1.2.2),
- libocsigen-ocaml-dev (<< 1.3.0-3~)
+ libocsigen-ocaml-dev (<< 1.3.3)
 Breaks: nurpawiki (<< 1.2.3-4~)
 Description: runtime librairies for Ocsigen
  Ocsigen is a Web server and a programming framework providing a new
diff --git a/debian/libocsigen-ocaml-dev.install.in b/debian/libocsigen-ocaml-dev.install.in
index 9061230..468b0e5 100644
--- a/debian/libocsigen-ocaml-dev.install.in
+++ b/debian/libocsigen-ocaml-dev.install.in
@@ -1,4 +1,3 @@
- at OCamlStdlibDir@/ocsigen/META
 @OCamlStdlibDir@/ocsigen/accesscontrol.cmi
 @OCamlStdlibDir@/ocsigen/accesscontrol.mli
 @OCamlStdlibDir@/ocsigen/eliom_common.cmi
diff --git a/debian/libocsigen-ocaml.install.in b/debian/libocsigen-ocaml.install.in
index 6f2969c..a1ecc40 100644
--- a/debian/libocsigen-ocaml.install.in
+++ b/debian/libocsigen-ocaml.install.in
@@ -1,4 +1,5 @@
 @OCamlDllDir@/*
+ at OCamlStdlibDir@/ocsigen/META
 @OCamlStdlibDir@/ocsigen/accesscontrol.cmo
 @OCamlStdlibDir@/ocsigen/authbasic.cmo
 @OCamlStdlibDir@/ocsigen/cgimod.cmo

-- 
ocsigen packaging