[Pkg-ocaml-maint-commits] [SCM] otags packaging branch, master, updated. debian/3.12.5-1-2-g324cfaf

[Hendrik Tews]

The following commit has been merged in the master branch:
commit 324cfaf8fd316498c68a541b3899b3f4fa5aba96
Author: Hendrik Tews <hendrik at askra.de>
Date:   Sun Jun 23 23:22:06 2013 +0200

    apapt to type-conv renaming

diff --git a/debian/changelog b/debian/changelog
index 30c5bb3..96371c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 otags (3.12.5-2) unstable; urgency=low
 
-  * silent lintian canonical vcs info
+  * update Vcs fields
+  * add patch for type-conv name change (Closes: #713387)
+  * bump standards version
 
- -- Hendrik Tews <hendrik at askra.de>  Fri, 31 May 2013 23:04:40 +0200
+ -- Hendrik Tews <hendrik at askra.de>  Sun, 23 Jun 2013 23:12:18 +0200
 
 otags (3.12.5-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index b1df8b1..f988351 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
  camlp4-extra (>= 3.12.1),
  camlp4-extra (<< 3.13),
  libsexplib-camlp4-dev
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://askra.de/software/otags/
 Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/otags.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/otags.git
diff --git a/debian/patches/series b/debian/patches/series
index 1bb8bf6..e79a503 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 # empty
+type-conf-name.patch
diff --git a/debian/patches/type-conf-name.patch b/debian/patches/type-conf-name.patch
new file mode 100644
index 0000000..7cb4b26
--- /dev/null
+++ b/debian/patches/type-conf-name.patch
@@ -0,0 +1,16 @@
+Description: update type-conv name
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/configure
++++ b/configure
+@@ -286,9 +286,9 @@
+     typeconvdir=$ocaml_lib_dir/sexplib
+     sexpdir=$ocaml_lib_dir/type-conv
+ else
+-    if ocamlfind query type-conv > /dev/null ; then
++    if ocamlfind query type_conv > /dev/null ; then
+ 	if ocamlfind query sexplib > /dev/null ; then
+-	    typeconvdir=$(ocamlfind query type-conv)
++	    typeconvdir=$(ocamlfind query type_conv)
+ 	    sexpdir=$(ocamlfind query sexplib)
+ 	else
+ 	    typeconvdir=

-- 
otags packaging