[Pkg-ocaml-maint-commits] [SCM] ocamlbricks packaging branch, master, updated. debian/0.50.1-4-26-g57c36f5

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 6c936a7d9047ecf2353b065ac1dcd626b2262799
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue Feb 12 19:46:50 2013 +0100

    Add patch: edit CONFIGME to install to debian/tmp

diff --git a/debian/patches/01_adapt_debian.diff b/debian/patches/01_adapt_debian.diff
deleted file mode 100644
index 114687d..0000000
--- a/debian/patches/01_adapt_debian.diff
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_adapt_debian.dpatch by  <root@>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Little modif to add cmx file, one compilation option and path to build 
-## DP: package
-
- at DPATCH@
-
---- a/CONFIGME
-+++ b/CONFIGME
-@@ -33,12 +33,15 @@
- # Section 2: Installation setup: prefixes, and the like
- ###########################################################################
- 
-+# Change for Debian Packaging
-+DESTDIR=$PWD"/debian/tmp"
-+
- # Installation prefix for OCaml libraries: they will be installed into
- # $prefix/$name, where $name is the package name defined in META.
- # This is a reasonable default, but you can change it if you really want
- # to install into a different, custom prefix.
- # *No* trailing slash should be included.
--libraryprefix=`ocamlc -where || exit -1`
-+libraryprefix=$DESTDIR/`ocamlc -where || exit -1`
- #libraryprefix=/mystrangepath
- 
- # This should be defined as the absolute path to a directory containing
-@@ -48,7 +51,7 @@ libraryprefix=`ocamlc -where || exit -1`
- # the directory containing OCaml headers.  
- #
- # This definition is appropriate for debian-like distributions:
--ocaml_sources=/usr/include/caml
-+ocaml_sources=$DESTDIR/usr/include/caml
- #
- # This is reasonable if you have downloaded and configured the OCaml
- # sources yourself, somewhere:
-@@ -56,14 +59,14 @@ ocaml_sources=/usr/include/caml
- 
- # Installation prefix, for example /usr or /usr/local
- # *No* trailing slash should be included.
--prefix=/usr/local
-+prefix=$DESTDIR/usr
- 
- # Prefix for host-wide configuration files; you should probably keep the
- # default setting:
--configurationprefix=/etc
-+configurationprefix=$DESTDIR/etc
- 
- # Prefix for the locale files
--localeprefix=/usr/share/locale
-+localeprefix=$DESTDIR/usr/share/locale
- 
- # Prefix for documentation files; you should probably keep the
- # default setting:
---- a/Makefile
-+++ b/Makefile
-@@ -442,6 +442,7 @@ install-libraries: libraries install-lib
- 	  cp -f META $(OTHER_LIBRARY_FILES_TO_INSTALL) \
- 	        _build/*.cma _build/*.cmxa _build/*.a \
- 	        `find _build/ -name \*.cmi | grep -v /myocamlbuild` \
-+                `find _build/ -name \*.cmx | grep -v /myocamlbuild` \
- 	        `find _build/ -name \*.mli | grep -v /myocamlbuild` \
- 	      $$libraryprefix/$$name/) && \
- 	  echo 'Library installation was successful.'; \
-@@ -670,9 +671,9 @@ NATIVE_OR_BYTE = \
- # -byte-plugin if needed:
- OCAMLBUILD_COMMAND_LINE = \
- 	(if [ $$( $(call NATIVE_OR_BYTE) ) == 'byte' ]; then \
--	  echo 'ocamlbuild -byte-plugin -verbose 2 -log _build/_log'; \
-+	  echo 'ocamlbuild -byte-plugin -classic-display -verbose 2 -log _build/_log'; \
- 	else \
--	  echo 'ocamlbuild -verbose 2 -log _build/_log'; \
-+	  echo 'ocamlbuild -classic-display -verbose 2 -log _build/_log'; \
- 	fi)
- 
- # Macro extracting, via source, the value associated to some keys
diff --git a/debian/patches/debian-prefix.diff b/debian/patches/debian-prefix.diff
new file mode 100644
index 0000000..3db631b
--- /dev/null
+++ b/debian/patches/debian-prefix.diff
@@ -0,0 +1,25 @@
+--- a/CONFIGME
++++ b/CONFIGME
+@@ -34,11 +34,11 @@
+ 
+ # Installation prefix, for example /usr or /usr/local
+ # *No* trailing slash should be included.
+-prefix=/usr/local
++prefix=${DESTDIR:-debian/tmp}
+ 
+ # Prefix for host-wide configuration files; you should probably keep the
+ # default setting:
+-configurationprefix=/etc
++configurationprefix=${prefix}/etc
+ 
+ # Prefix for the locale files
+ localeprefix=${prefix}/share/locale
+@@ -58,7 +58,7 @@ ocaml_libraryprefix=$(ocamlc -where || e
+ # By default they will be installed into ${ocaml_libraryprefix}, but you 
+ # can change it if you really want to install into a different, custom prefix.
+ # *No* trailing slash should be included.
+-libraryprefix=${ocaml_libraryprefix}
++libraryprefix=${prefix}/${ocaml_libraryprefix}
+ #
+ # This definition may be appropriate for debian packaging:
+ #libraryprefix=debian/tmp/${ocaml_libraryprefix}
diff --git a/debian/patches/series b/debian/patches/series
index af38ad9..a08459b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01_adapt_debian.diff
 fix_mlvalues.h_path.diff
+debian-prefix.diff

-- 
ocamlbricks packaging