[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.3-1-6-g0a1367f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit dd88c016cb296bc71bcbf82c72cb49cf18da19e0
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Feb 15 18:57:01 2011 +0100

    Bump Standards-Version to 3.9.1

diff --git a/debian/control b/debian/control
index 0f0fd2a..583e8f0 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Build-Depends:
  libobrowser-ocaml-dev,
  ocamlduce (>= 3.11.1.0-2~),
  dh-ocaml (>= 0.9.5~)
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 Homepage: http://www.ocsigen.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocsigen.git
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocsigen.git
@@ -58,7 +58,7 @@ Depends: ${misc:Depends}
 Suggests: ocsigen-dev
 Provides: ocsigen-doc
 Replaces: ocsigen-doc (<< 1.2.2)
-Conflicts: ocsigen-doc (<< 1.2.2)
+Breaks: ocsigen-doc (<< 1.2.2)
 Description: developer's documentation for Ocsigen
  Ocsigen is a Web server and a programming framework providing a new
  way to create dynamic Web sites.
@@ -101,11 +101,11 @@ Replaces:
  ocsigen (<< 1.2.2),
  ocsigen-dev (<< 1.2.2),
  libocsigen-ocaml-dev (<< 1.3.3)
-Conflicts:
+Breaks:
  ocsigen (<< 1.2.2),
  ocsigen-dev (<< 1.2.2),
- libocsigen-ocaml-dev (<< 1.3.3)
-Breaks: nurpawiki (<< 1.2.3-4~)
+ libocsigen-ocaml-dev (<< 1.3.3),
+ nurpawiki (<< 1.2.3-4~)
 Description: runtime librairies for Ocsigen
  Ocsigen is a Web server and a programming framework providing a new
  way to create dynamic Web sites.
@@ -123,8 +123,10 @@ Depends:
 Provides: ${ocaml:Provides}
 Recommends: ocsigen-doc
 Replaces: ocsigen (<< 1.2.2), ocsigen-dev (<< 1.2.2)
-Conflicts: ocsigen (<< 1.2.2), ocsigen-dev (<< 1.2.2)
-Breaks: nurpawiki (<< 1.2.3-4~)
+Breaks:
+ ocsigen (<< 1.2.2),
+ ocsigen-dev (<< 1.2.2),
+ nurpawiki (<< 1.2.3-4~)
 Description: development librairies for Ocsigen
  Ocsigen is a Web server and a programming framework providing a new
  way to create dynamic Web sites. Its goal is to offer an alternative
@@ -148,7 +150,7 @@ Depends:
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib, libocsigen-ocaml-doc
 Replaces: libocsigen-ocaml-dev (<< 1.3.0-3~)
-Conflicts: libocsigen-ocaml-dev (<< 1.3.0-3~)
+Breaks: libocsigen-ocaml-dev (<< 1.3.0-3~)
 Description: Ocsigen XHTML generation library
  This package provides the XHTML generation library of Ocsigen, to
  generate statically typed XHTML pages. Typing is achieved with

-- 
ocsigen packaging