[Pkg-ocaml-maint-commits] [SCM] xstr packaging branch, master, updated. debian/0.2.1-19-9-ge47a5cd

[Stefano Zacchiroli]

The following commit has been merged in the master branch:
commit e47a5cd59bd10eeae3d0fb20ff0450bad94af0c3
Author: Stefano Zacchiroli <zack at upsilon.cc>
Date:   Thu Feb 26 23:11:26 2009 +0100

    delegate installd dir creation to makefile

diff --git a/debian/changelog b/debian/changelog
index 90309c2..17fd13e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ xstr (0.2.1-20) UNRELEASED; urgency=low
   * debian/control:
     - bump standards version to 3.8.0 (no changes needed)
     - add missing ${misc:Depends} dependency
+  * debian/patches/
+    - build: delegate installd dir creation to makefile, rather instead
+      of debhelper
   * bump debhelper compatibility level to 7
   * debian/rules: use ocaml.mk as a CDBS "rules" snippet
 
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/build.dpatch b/debian/patches/build.dpatch
index b1d44ed..a59246b 100755
--- a/debian/patches/build.dpatch
+++ b/debian/patches/build.dpatch
@@ -5,9 +5,9 @@
 ## DP: enable installing to a target directory passed from debian/rules
 
 @DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2000-09-23 15:06:54.000000000 +0200
-+++ trunk/Makefile	2005-11-12 10:10:49.000000000 +0100
+diff -urNad xstr~/Makefile xstr/Makefile
+--- xstr~/Makefile	2009-02-26 23:07:16.000000000 +0100
++++ xstr/Makefile	2009-02-26 23:08:40.321976359 +0100
 @@ -17,6 +17,7 @@
  NAME     = xstr
  #REQUIRES =
@@ -16,9 +16,11 @@ diff -urNad trunk~/Makefile trunk/Makefile
  
  # you may try this: (0% to 10% faster)
  #UNSAFE   = -unsafe
-@@ -49,7 +50,7 @@
+@@ -48,8 +49,9 @@
+ 
  .PHONY: install
  install: all
++	if [ ! -d $(DESTDIR) ] ; then mkdir -p $(DESTDIR) ; fi
  	{ test ! -f $(XARCHIVE) || extra="*.cmxa *.a"; }; \
 -	$(OCAMLFIND) install $(NAME) *.mli *.cmi *.cma META $$extra
 +	$(OCAMLFIND) install -destdir $(DESTDIR) $(NAME) *.mli *.cmi *.cma META $$extra

-- 
xstr packaging