[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.4-1-12-g5a5cb26

[Ralf Treinen]

The following commit has been merged in the master branch:
commit 609bec8ae712b2feb11a39c9b867d888f0d96cf4
Author: Ralf Treinen <treinen at free.fr>
Date:   Mon May 18 22:00:22 2009 +0200

    fix bug with conditional rules

diff --git a/debian/changelog b/debian/changelog
index bb03238..d0e04fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ pkglab (1.4.1-1) unstable; urgency=low
 
   * New upstream version.
   * debian/rules: put explicit MANDIR in install target
+  * Create edos-distchck package
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 18 May 2009 21:39:14 +0200
+ -- Ralf Treinen <treinen at debian.org>  Mon, 18 May 2009 21:55:53 +0200
 
 pkglab (1.4-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index f08ffdb..b7576b8 100644
--- a/debian/control
+++ b/debian/control
@@ -43,6 +43,9 @@ Depends:
  ${F:OCamlInterpDepends},
  ${shlibs:Depends},
  ${misc:Depends}
+Conflicts: edos-debcheck, edos-rpmcheck
+Replaces: edos-debcheck, edos-rpmcheck
+Provides: edos-debcheck, edos-rpmcheck
 Description: Checks whether dependencies of packages can be satisfied
  This software checks for every package of a distribution whether it
  is possible to satisfy its dependencies and conflicts within this
diff --git a/debian/rules b/debian/rules
index c8a7034..3002ee3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,14 +5,17 @@ include /usr/share/cdbs/1/rules/ocaml.mk
 
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
  DEB_MAKE_BUILD_TARGET = depend pkglab.opt
-build::
-	cd distcheck && make distcheck
 else
  DEB_MAKE_BUILD_TARGET = depend pkglab
  DEB_DH_GENCONTROL_ARGS += \
   -VF:OCamlInterpDepends="ocaml-base-nox-$(OCAML_ABI), libdose2-ocaml, libledit-ocaml, libzip-ocaml"
  DEB_STRIP_EXCLUDE += usr/bin/pkglab
+endif
+
 build::
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+	cd distcheck && make distcheck
+else
 	cd distcheck && make distcheck.opt
 endif
 

-- 
pkglab packaging