[Pkg-ocaml-maint-commits] [SCM] calendar packaging branch, master, updated. debian/2.0.2-1.1-20-g96d5d0e

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit ac8c2f576c97d6bc96680b867e157be0b3ba4fd4
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Feb 18 18:41:26 2009 +0100

    debian/dirs.in: removed, dir creation is now delegated to Makefile

diff --git a/debian/changelog b/debian/changelog
index 8dbf6f9..9bc9d18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ calendar (2.01-1) UNRELEASED; urgency=low
   * make Vcs-* fields point to the new git repository
   * new upstream version
     - refresh patch install_destdir
+  * debian/dirs.in: removed, dir creation is now delegated to Makefile
 
  -- Stefano Zacchiroli <zack at debian.org>  Wed, 18 Feb 2009 18:28:32 +0100
 
diff --git a/debian/dirs.in b/debian/dirs.in
deleted file mode 100644
index 92126d8..0000000
--- a/debian/dirs.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/ocaml/@OCamlABI@
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
index 91d51b8..99ed6c2 100755
--- a/debian/patches/install_destdir.dpatch
+++ b/debian/patches/install_destdir.dpatch
@@ -6,9 +6,9 @@
 
 @DPATCH@
 diff -urNad calendar~/Makefile.in calendar/Makefile.in
---- calendar~/Makefile.in	2009-02-18 18:29:33.000000000 +0100
-+++ calendar/Makefile.in	2009-02-18 18:31:40.921643322 +0100
-@@ -191,10 +191,11 @@
+--- calendar~/Makefile.in	2009-02-18 18:36:21.000000000 +0100
++++ calendar/Makefile.in	2009-02-18 18:38:17.944672051 +0100
+@@ -191,10 +191,12 @@
  # Install
  #########
  
@@ -17,6 +17,7 @@ diff -urNad calendar~/Makefile.in calendar/Makefile.in
  	@if [ "`sed -n -e 's/version = "\([0-9.]*\)"/\1/p' META`" = "$(VERSION)" ]; then \
  	  (if test -d `ocamlfind install -help | grep destdir | sed -e "s/.*default: \(.*\))/\1/"`/$(NAME); then $(MAKE) uninstall; fi;\
 -	  $(CAMLFIND) install $(NAME) target/*.cm[iox] target/*.cma target/*.cmxa $(MLI) $(CMI) $(CLIBS) META\
++	  mkdir -p $(OCAML_LIB_DIR);\
 +	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/*.cm[iox] target/*.cma target/*.cmxa $(MLI) $(CMI) $(CLIBS) META\
  	)else \
  	  (echo; echo "Not the good version. Please, do :"; \

-- 
calendar packaging