The following commit has been merged in the master branch:
commit 42dd68458e983a59d79d46ec8837c2c35e22a1c6
Author: Ralf Treinen <trei...@free.fr>
Date: Wed Jun 17 19:53:49 2009 +0200
make conflict with edos-{deb,rpm}check versionend
diff --git a/debian/changelog b/debian/changelog
index fc03739..511e3da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+pkglab (1.4.2-2) unstable; urgency=low
+
+ * Weaken conflict with edos-{rpm,deb}check to (<= 1.0-8) in order to
+ allow for transitional packages for edos-{rpm,deb}check to depend
+ on edos-distcheck.
+ * Standards-Version 3.8.2 (no change).
+
+ -- Ralf Treinen <trei...@debian.org> Wed, 17 Jun 2009 19:53:06 +0200
+
pkglab (1.4.2-1) unstable; urgency=low
* New Upstream Version
diff --git a/debian/control b/debian/control
index e0ec549..d8eb2cf 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
libledit-ocaml-dev,
libzip-ocaml-dev,
hevea
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
Homepage: http://sodiac.gforge.inria.fr/
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/pkglab.git
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/pkglab.git
@@ -41,7 +41,7 @@ Depends:
${F:OCamlInterpDepends},
${shlibs:Depends},
${misc:Depends}
-Conflicts: edos-debcheck, edos-rpmcheck
+Conflicts: edos-debcheck (<= 1.0-8), edos-rpmcheck (<= 1.0-8)
Replaces: edos-debcheck, edos-rpmcheck
Provides: edos-debcheck, edos-rpmcheck
Description: Checks whether dependencies of packages can be satisfied
--
pkglab packaging
_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-ocaml-maint-commits
