[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 2985a05c823f4a112a9c8c626731f76ac5ba43d8
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Wed Feb 18 18:29:19 2009 +0100

    new upstream version
    
    refresh install_destdir patch

diff --git a/debian/changelog b/debian/changelog
index c8f371a..8dbf6f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-calendar (2.0.2-1.2) UNRELEASED; urgency=low
+calendar (2.01-1) UNRELEASED; urgency=low
 
   [ Stefano Zacchiroli ]
   * make Vcs-* fields point to the new git repository
+  * new upstream version
+    - refresh patch install_destdir
 
- -- Ralf Treinen <treinen at debian.org>  Sat, 09 Aug 2008 10:15:11 -0300
+ -- Stefano Zacchiroli <zack at debian.org>  Wed, 18 Feb 2009 18:28:32 +0100
 
 calendar (2.0.2-1.1) experimental; urgency=low
 
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
old mode 100644
new mode 100755
index d832023..91d51b8
--- a/debian/patches/install_destdir.dpatch
+++ b/debian/patches/install_destdir.dpatch
@@ -2,22 +2,22 @@
 ## install_destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: install to $(OCAML_LIB_DIR), passed by debian/rules
+## DP: No description.
 
 @DPATCH@
-diff -urNad trunk~/Makefile.in trunk/Makefile.in
---- trunk~/Makefile.in	2008-03-17 10:56:41.000000000 +0100
-+++ trunk/Makefile.in	2008-03-21 13:31:47.000000000 +0100
-@@ -188,10 +188,11 @@
+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 @@
  # Install
  #########
  
 +OCAML_LIB_DIR =
  install: $(LIBS) $(CLIBS) META
  	@if [ "`sed -n -e 's/version = "\([0-9.]*\)"/\1/p' META`" = "$(VERSION)" ]; then \
- 	  (if test -d $(CAMLLIB)/site-lib/$(NAME); then $(MAKE) uninstall; fi;\
--	  $(CAMLFIND) install $(NAME) target/*.cm[iox] $(MLI) $(CMI) $(CLIBS) META\
-+	  $(CAMLFIND) install -destdir $(OCAML_LIB_DIR) $(NAME) target/*.cm[iox] $(MLI) $(CMI) $(CLIBS) META\
+ 	  (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\
++	  $(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 :"; \
  	   echo "  make clean && make"; \

-- 
calendar packaging