[Pkg-ocaml-maint-commits] [SCM] ocsigen packaging branch, master, updated. debian/1.3.0-1-1-g01d8957

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 01d89573de3984d65a652c56401757066a43f77d
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Mar 15 16:13:24 2010 +0100

    Prepare upload to unstable

diff --git a/debian/NEWS b/debian/NEWS
index 3a15aaf..62790c9 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -6,3 +6,4 @@ ocsigen (1.3.0-1) experimental; urgency=low
     instructions at http://ocsigen.org/updates/From12To13 .
 
  -- Stéphane Glondu <glondu at debian.org>  Sun, 07 Mar 2010 13:48:30 +0100
+
diff --git a/debian/changelog b/debian/changelog
index a439479..5dcdc24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ocsigen (1.3.0-2) unstable; urgency=low
+
+  * Upload to unstable
+  * This version breaks nurpawiki (<< 1.2.3-4~) because of API changes
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 15 Mar 2010 16:13:10 +0100
+
 ocsigen (1.3.0-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index d85d6ec..c388b87 100644
--- a/debian/control
+++ b/debian/control
@@ -36,7 +36,7 @@ Depends: adduser, psmisc, procps,
  ${misc:Depends}
 Provides: httpd, httpd-cgi
 Suggests: ocsigen-dev
-Breaks: nurpawiki (<< 1.2.3-3~)
+Breaks: nurpawiki (<< 1.2.3-4~)
 Description: web server and programming framework in OCaml
  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
@@ -98,6 +98,7 @@ Depends:
 Provides: ${ocaml:Provides}
 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~)
 Description: runtime librairies for Ocsigen
  Ocsigen is a Web server and a programming framework providing a new
  way to create dynamic Web sites.
@@ -116,6 +117,7 @@ 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~)
 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

-- 
ocsigen packaging