[Pkg-ocaml-maint-commits] [SCM] calendar packaging branch, master, updated. debian/2.01.1-6-4-g5ca7a4a

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 5ca7a4a7187a5106edc6643c0ff59e5dfa843e85
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jun 23 11:08:10 2010 -0700

    Update debian/{control,changelog}

diff --git a/debian/changelog b/debian/changelog
index cc70f38..5d4ca30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,18 @@
 calendar (2.01.1-7) UNRELEASED; urgency=low
 
+  [ Stefano Zacchiroli ]
   * debian/rules
     - switch {debhelper,dpatch}.mk: fix debian/*.log cleanup
   * debian/control: fix typo in long description (Closes: #557494)
 
- -- Stefano Zacchiroli <zack at debian.org>  Tue, 06 Oct 2009 16:31:34 +0200
+  [ Stéphane Glondu ]
+  * Install plugin only on natdynlink architectures
+  * debian/control:
+    - add myself to Uploaders, remove Stefano
+    - replace Conflicts by Breaks
+    - bump Standards-Version to 3.9.0
+
+ -- Stéphane Glondu <glondu at debian.org>  Wed, 23 Jun 2010 11:07:44 -0700
 
 calendar (2.01.1-6) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 0f49dcc..aa8890e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders:
- Stefano Zacchiroli <zack at debian.org>,
+ Stéphane Glondu <glondu at debian.org>,
  Mehdi Dogguy <mehdi at debian.org>
 Build-Depends:
  debhelper (>= 7.0.0),
@@ -12,7 +12,7 @@ Build-Depends:
  dh-ocaml (>= 0.9.4~),
  dpatch,
  cdbs
-Standards-Version: 3.8.3
+Standards-Version: 3.9.0
 Homepage: http://calendar.forge.ocamlcore.org/
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/calendar.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/calendar.git
@@ -49,7 +49,7 @@ Depends:
  ${shlibs:Depends}
 Provides: ${ocaml:Provides}
 Replaces: libcalendar-ocaml-dev (<< 2.01.1-4)
-Conflicts: libcalendar-ocaml-dev (<< 2.01.1-4)
+Breaks: libcalendar-ocaml-dev (<< 2.01.1-4)
 Description: OCaml library providing operations over dates and times
  OCaml library implementing common date/time operations with
  timezones and pretty printing support.

-- 
calendar packaging