[Pkg-ocaml-maint-commits] [SCM] camlzip packaging branch, master, updated. debian/1.04-4-3-g8f55eb0

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 8f55eb07f6b574f4d668a4d5090cfe1bc2f18f24
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Aug 22 13:02:49 2009 +0200

    Update Conflicts/Replaces for libzip-ocaml

diff --git a/debian/changelog b/debian/changelog
index 70a12f3..d7d6872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ camlzip (1.04-5) UNRELEASED; urgency=low
   * Fix version field in META file
   * Add README.source
   * Update Standards-Version to 3.8.3
+  * Update Conflicts/Replaces for libzip-ocaml
 
  -- Stephane Glondu <steph at glondu.net>  Sat, 22 Aug 2009 12:25:33 +0200
 
diff --git a/debian/control b/debian/control
index 6a39431..2af13e9 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,8 @@ Depends:
  ocaml-base-nox-${F:OCamlABI},
  ${shlibs:Depends},
  ${misc:Depends}
-Conflicts: camlzip (<< 1.01-3)
-Replaces: libzip-ocaml-dev (<< 1.04-3)
+Conflicts: libzip-ocaml-dev (<< 1.04-4)
+Replaces: libzip-ocaml-dev (<< 1.04-4)
 Description: OCaml compression libraries (runtime libraries)
  This Objective Caml library provides easy access to compressed files in ZIP
  and GZIP format, as well as to Java JAR files.  It provides functions

-- 
camlzip packaging