[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.3-1-15-ge4a1429

[Ralf Treinen (none)]

The following commit has been merged in the master branch:
commit dfb6735626cce9a81c39f9d2b87d33ae0f7c16c7
Author: Ralf Treinen <treinen at debian.(none)>
Date:   Mon Apr 20 11:09:12 2009 +0900

    add changelog enry on switching back Makefile,
    some cosmeic changes in debian/rules

diff --git a/debian/changelog b/debian/changelog
index fa6a551..12579f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,10 @@ pkglab (1.4-1) unstable; urgency=low
   * Added dependency in the bytecode case on libledit-ocaml, libzip-ocaml
   * debian/rules: cdbs class/ocaml.mk -> rules/ocaml.mk
   * Install pkglab examples directory.
+  * Switch back to upstream's Makefile, adapt install target in debian/rules
+    accordingly
 
- -- Ralf Treinen <treinen at debian.org>  Mon, 20 Apr 2009 10:31:11 +0900
+ -- Ralf Treinen <treinen at debian.org>  Mon, 20 Apr 2009 11:02:59 +0900
 
 pkglab (1.3-1) exprerimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index ed1081f..834864f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,13 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
 
-BIN_PKG = pkglab
-
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-DEB_MAKE_BUILD_TARGET = depend pkglab.opt
+ DEB_MAKE_BUILD_TARGET = depend pkglab.opt
 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
+ 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
 
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(BIN_PKG)/usr
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(DEB_DESTDIR)/usr

-- 
pkglab packaging