[Pkg-ocaml-maint-commits] [SCM] mikmatch packaging branch, master, updated. debian/1.0.4-1-6-gdb3fff3

Hendrik Tews hendrik at askra.de
Tue Jun 11 11:59:23 UTC 2013 

The following commit has been merged in the master branch:
commit db3fff35e53b7b10e6b4d778ce5b99c86f74a670
Author: Hendrik Tews <hendrik at askra.de>
Date:   Tue Jun 11 13:36:18 2013 +0200

    update and improve packaging

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..ce313da
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,8 @@
+The Debian mikmatch package provides both, the PCRE and the Str
+version of the library. The PCRE version uses the Perl-compatibility
+regular expressions C library (libpcre3-dev). The Str version uses the
+Str module from the OCaml distribution. There are also two toplevels,
+mikmatch_pcre and mikmatch_str, that have the respective mikmatch
+library already preloaded.
+
+ -- Hendrik Tews <hendrik at askra.de>, Tue, 11 Jun 2013 11:48:37 +0200
diff --git a/debian/changelog b/debian/changelog
index 6c2c86b..b58306d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,26 @@
-mikmatch (1.0.4-2) UNRELEASED; urgency=low
+mikmatch (1.0.6-1) unstable; urgency=low
 
   [ Sylvain Le Gall ]
   * Remove Sylvain Le Gall from uploaders
 
   [ Hendrik Tews ]
   * fix watchfile
-
- -- Hendrik Tews <hendrik at askra.de>  Sun, 26 May 2013 23:45:33 +0200
+  * new upstream version
+  * bump debhelper compat level and standards version
+  * add myself as uploader
+  * update Vcs fields, homepage, package description and dependencies
+  * update copyright
+  * update existing makefile patch
+    - rename and refresh
+    - add meaningful description
+    - don't install stray cmo's
+    - build and install mikmatch toplevels
+  * add new patch ocaml-3-12 for 3.12 compilation
+  * fix rules to use native compilers and prepare ocamldoc subdir
+  * install toplevels and add man pages for them
+  * add README.Debian telling about the PCRE and Str version
+
+ -- Hendrik Tews <hendrik at askra.de>  Tue, 11 Jun 2013 13:45:35 +0200
 
 mikmatch (1.0.4-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 19f9a21..4376731 100644
--- a/debian/control
+++ b/debian/control
@@ -2,26 +2,29 @@ Source: mikmatch
 Section: ocaml
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders: Hendrik Tews <hendrik at askra.de>
 Build-Depends:
   ocaml-nox (>= 3.12),
+  ocaml-best-compilers,
   ocaml-findlib,
   dh-ocaml (>= 0.9~),
-  debhelper (>= 7.0.50~),
+  debhelper (>= 9),
   libpcre-ocaml-dev,
-  camlp4, camlp4-extra,
-  texlive-latex-base, texlive-latex-extra,
-  hevea, camlmix
-Standards-Version: 3.9.2
-Homepage: http://martin.jambon.free.fr/micmatch.html
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/mikmatch.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/mikmatch.git
+  camlp4-extra,
+  texlive-latex-extra,
+  hevea,
+  camlmix
+Standards-Version: 3.9.4
+Homepage: http://mjambon.com/micmatch.html
+Vcs-Git: git://anonscm.debian.org/pkg-ocaml-maint/packages/mikmatch.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ocaml-maint/packages/mikmatch.git
 
 Package: libmikmatch-ocaml-dev
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: camlp4 extension for pattern matching with regexps
+Description: camlp4 extension for pattern matching with regexps - development
  Mikmatch provides enhanced pattern matching with regexps for OCaml.
  .
  The goal of Mikmatch is to make text-oriented programs even easier to write,
@@ -37,13 +40,16 @@ Description: camlp4 extension for pattern matching with regexps
   * a dedicated 'mikmatch' command which can be used as a replacement for
     'ocaml' in scripts or as an interactive toplevel. It performs automatically
     these steps: preprocessing, compilation and execution.
+ .
+ This package contains the development files needed for programming
+ with the library.
 
 Package: libmikmatch-ocaml
 Architecture: any
 Depends: ${ocaml:Depends}, ${misc:Depends}, libtophide-ocaml-dev
 Provides: ${ocaml:Provides}
 Recommends: ocaml-findlib
-Description: camlp4 extension for pattern matching with regexps
+Description: camlp4 extension for pattern matching with regexps - runtime
  Mikmatch provides enhanced pattern matching with regexps for OCaml.
  .
  The goal of Mikmatch is to make text-oriented programs even easier to write,
diff --git a/debian/copyright b/debian/copyright
index d4dfb39..5250713 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,13 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-Name: mikmatch
-Maintainer: Sylvain Le Gall <gildor at debian.org>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Mikmatch
+Upstream-Contact: Martin Jambon <martin at mjambon.com> 
+Source: http://mjambon.com/micmatch.html
 
 Files: *
-Copyright: Copyright (c) 2004-2008 Martin Jambon
-License: BSD3
-
+Copyright: 2004-2008 Martin Jambon
+License: BSD-3-clause
  All rights reserved.
-
+ .
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
@@ -18,7 +18,7 @@ License: BSD3
     documentation and/or other materials provided with the distribution.
  3. The name of the author may not be used to endorse or promote products
     derived from this software without specific prior written permission.
-
+ .
  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
@@ -31,7 +31,22 @@ License: BSD3
  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 Files: debian/*
-Copyright: (C) 2010 Sylvain Le Gall <gildor at debian.org>
+Copyright: 2010 Sylvain Le Gall <gildor at debian.org>
+           2013 Hendrik Tews <hendrik at askra.de>
 License: GPL-3+
-
- See '/usr/share/common-licenses/GPL-3' for the full text.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or (at
+ your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/libmikmatch-ocaml-dev.install.in b/debian/libmikmatch-ocaml-dev.install.in
index d2920c4..e9297d3 100644
--- a/debian/libmikmatch-ocaml-dev.install.in
+++ b/debian/libmikmatch-ocaml-dev.install.in
@@ -1,7 +1,7 @@
 @OCamlStdlibDir@/mikmatch_pcre/*.cmi
 @OCamlStdlibDir@/mikmatch_str/*.cmi
- at OCamlStdlibDir@/mikmatch_pcre/*.mli
- at OCamlStdlibDir@/mikmatch_str/*.mli
+ at OCamlStdlibDir@/mikmatch_pcre/*.ml*
+ at OCamlStdlibDir@/mikmatch_str/*.ml*
 @OCamlStdlibDir@/mikmatch_pcre/pa_mikmatch_pcre.cmo
 @OCamlStdlibDir@/mikmatch_pcre/pa_mikmatch_pcre.cma
 @OCamlStdlibDir@/mikmatch_str/pa_mikmatch_str.cmo
@@ -14,4 +14,5 @@ OPT: @OCamlStdlibDir@/mikmatch_pcre/*.a
 OPT: @OCamlStdlibDir@/mikmatch_str/*.a
 OPT: @OCamlStdlibDir@/mikmatch_pcre/*.o
 OPT: @OCamlStdlibDir@/mikmatch_str/*.o
-
+/usr/bin/mikmatch_pcre
+/usr/bin/mikmatch_str
diff --git a/debian/libmikmatch-ocaml-dev.manpages b/debian/libmikmatch-ocaml-dev.manpages
new file mode 100644
index 0000000..c37f3f1
--- /dev/null
+++ b/debian/libmikmatch-ocaml-dev.manpages
@@ -0,0 +1,2 @@
+debian/mikmatch_pcre.1
+debian/mikmatch_str.1
diff --git a/debian/libmikmatch-ocaml-dev.ocamldoc b/debian/libmikmatch-ocaml-dev.ocamldoc
index fb08ba7..52a7c34 100644
--- a/debian/libmikmatch-ocaml-dev.ocamldoc
+++ b/debian/libmikmatch-ocaml-dev.ocamldoc
@@ -1,2 +1 @@
--d mikmatch-ocamldoc
---doc-base-generate
+-d mikmatch-ocamldoc --doc-base-generate
diff --git a/debian/libmikmatch-ocaml.install.in b/debian/libmikmatch-ocaml.install.in
index 650442b..8a49a0a 100644
--- a/debian/libmikmatch-ocaml.install.in
+++ b/debian/libmikmatch-ocaml.install.in
@@ -1,8 +1,6 @@
 @OCamlStdlibDir@/mikmatch_pcre/META
 @OCamlStdlibDir@/mikmatch_str/META
- at OCamlStdlibDir@/mikmatch_pcre/run_mikmatch_pcre.cmo
 @OCamlStdlibDir@/mikmatch_pcre/run_mikmatch_pcre.cma
 @OCamlStdlibDir@/mikmatch_str/mikmatch.cmo
- at OCamlStdlibDir@/mikmatch_str/run_mikmatch_str.cmo
 @OCamlStdlibDir@/mikmatch_str/run_mikmatch_str.cma
 
diff --git a/debian/mikmatch_pcre.1 b/debian/mikmatch_pcre.1
new file mode 100644
index 0000000..670497b
--- /dev/null
+++ b/debian/mikmatch_pcre.1
@@ -0,0 +1,70 @@
+.\" groff -man -Tascii mikmatch_pcre.1
+.\" ==========================================================================
+.\" ============= Synopsis ===================================================
+.\" ==========================================================================
+.TH MIKMATCH 1 "May 2013" MIKMATCH "User Manuals"
+.SH NAME
+mikmatch_pcre, mikmatch_str \- OCaml toplevels with mikmatch loaded
+.SH SYNOPSIS
+.B mikmatch_pcre ...
+.P
+.B mikmatch_str ...
+.\" ==========================================================================
+.\" ============= Description ================================================
+.\" ==========================================================================
+.SH DESCRIPTION
+These commands provide
+.B OCaml
+toplevels with the 
+.B mikmatch
+library preloaded.
+.I mikmatch_pcre
+contains the PCRE (Perl-compatibility regular expressions)
+variant of
+.B mikmatch
+and
+.I mikmatch_str
+contains the Str (OCaml regexp library) variant of
+.B mikmatch\fR.
+Besides, both toplevels do also contain the libraries
+.I dynlink\fR, \fIcamlp4o\fR and \fIunix\fR.
+.\"
+.\" ==========================================================================
+.\" ================ Options =================================================
+.\" ==========================================================================
+.\"
+.SH OPTIONS
+See 
+.I ocaml\fR\|(7).
+Both toplevels accept the same options and arguments as the
+standard
+.B OCaml
+toplevel.
+
+.\"
+.\" ==========================================================================
+.\" ================ SEE ALSO ================================================
+.\" ==========================================================================
+.\"
+.SH SEE ALSO
+.TP
+The \fBmikmatch\fR web page,
+\fIhttp://mjambon.com/micmatch.html\fR
+.TP
+The \fBmikmatch\fR tutorial,
+\fIhttp://mjambon.com/micmatch-howto.html\fR
+.TP
+The \fBmikmatch\fR reference manual,
+\fI/usr/share/doc/libmikmatch-ocaml-dev/mikmatch-manual.html 
+or
+\fIhttp://mjambon.com/micmatch-howto.html
+.TP
+.I ocaml\fR\|(7)
+.\"
+.\" ==========================================================================
+.\" ================ Author ==================================================
+.\" ==========================================================================
+.\"
+.SH AUTHOR
+This manual page was written by Hendrik Tews <hendrik at askra.de>,
+specifically for the Debian project (and may be used by others).
diff --git a/debian/mikmatch_str.1 b/debian/mikmatch_str.1
new file mode 100644
index 0000000..23118d4
--- /dev/null
+++ b/debian/mikmatch_str.1
@@ -0,0 +1 @@
+.so man1/mikmatch_pcre.1
diff --git a/debian/patches/debian-changes-1.0.2-1 b/debian/patches/makefile.patch
similarity index 53%
rename from debian/patches/debian-changes-1.0.2-1
rename to debian/patches/makefile.patch
index 1cf2ab6..3f69755 100644
--- a/debian/patches/debian-changes-1.0.2-1
+++ b/debian/patches/makefile.patch
@@ -1,32 +1,15 @@
-Description: Upstream changes introduced in version 1.0.2-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- mikmatch (1.0.2-1) unstable; urgency=low
- .
-   * Initial release. (Closes: #605635)
- .
- The person named in the Author field signed this changelog entry.
+Description: Makefile changes
+ patching the makefile for several purposes:
+ - bytecode compilation
+ - str variant
+ - fix lintian stray-cmo
+ - fix lintian dangling-cmi
+ - compile and install toplevels
 Author: Sylvain Le Gall <gildor at debian.org>
-Bug-Debian: http://bugs.debian.org/605635
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- mikmatch-1.0.2.orig/Makefile
-+++ mikmatch-1.0.2/Makefile
-@@ -19,8 +19,10 @@ uninstall: uninstall-pcre
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/Makefile
++++ b/Makefile
+@@ -23,8 +23,10 @@
  ## GODIVA/GODI targets
  all: common
  	cd pcre && $(MAKE) all-bc
@@ -37,9 +20,9 @@ Last-Update: <YYYY-MM-DD>
  
  ## end of GODIVA targets
  
---- mikmatch-1.0.2.orig/str/Makefile
-+++ mikmatch-1.0.2/str/Makefile
-@@ -24,21 +24,30 @@ INCDIRS = ../common
+--- a/str/Makefile
++++ b/str/Makefile
+@@ -24,21 +24,30 @@
  
  USE_CAMLP4 = yes
  
@@ -48,10 +31,10 @@ Last-Update: <YYYY-MM-DD>
    pa_mikmatch_str.cma pa_mikmatch_str.cmo pa_mikmatch_str.cmi \
 -  run_mikmatch_str.cma run_mikmatch_str.cmo run_mikmatch_str.cmi \
 -  mikmatch.cmi mikmatch.cmo mikmatch.cmx mikmatch.mli \
-+  run_mikmatch_str.cmi \
-+  mikmatch.cmi mikmatch.mli 
++  run_mikmatch_str.cmi run_mikmatch_str.ml \
++  mikmatch.cmi mikmatch.mli
 +BC_LIBINSTALL_FILES := \
-+  run_mikmatch_str.cma run_mikmatch_str.cmo mikmatch.cmo
++  run_mikmatch_str.cma mikmatch.cmo
 +NC_LIBINSTALL_FILES := \
 +  mikmatch.cmx \
    run_mikmatch_str.cmxa run_mikmatch_str.cmx \
@@ -75,7 +58,7 @@ Last-Update: <YYYY-MM-DD>
  
  links: mikmatch.mli mikmatch.ml match.ml syntax_common.ml mm_util.ml \
  	global_def.mli global_def.ml
-@@ -58,13 +67,20 @@ global_def.mli: ../common/global_def.mli
+@@ -58,13 +67,20 @@
  global_def.ml: ../common/global_def.ml
  	ln -s $< $@
  
@@ -88,7 +71,7 @@ Last-Update: <YYYY-MM-DD>
  
  #install: libinstall topinstall
 -install: libinstall
-+install: 
++install: topinstall
 +	if test -f nativecode; \
 +	then \
 +		$(MAKE) "LIBINSTALL_FILES=$(ALL_LIBINSTALL_FILES)" libinstall;\
@@ -98,21 +81,28 @@ Last-Update: <YYYY-MM-DD>
  uninstall: libuninstall
  	rm -f $(BINDIR)/mikmatch_str.top $(BINDIR)/mikmatch_str
  
-@@ -74,10 +90,12 @@ version:
+@@ -72,12 +88,18 @@
+ 	sed -e "s/VERSION/$(VERSION)/" < META.template > META
+ 
  topinstall:
- 	install -m 0755 mikmatch_str.top mikmatch_str $(BINDIR)
+-	install -m 0755 mikmatch_str.top mikmatch_str $(BINDIR)
++	install -m 0755 mikmatch_str.top $(DESTDIR)$(BINDIR)/mikmatch_str
  
 -misc:
 +misc-bc:
  	ocamlc -c mikmatch.mli
  	ocamlc -a -o run_mikmatch_str.cma \
  		mikmatch.ml run_mikmatch_str.ml
++	ocamlmktop -o mikmatch_str.top -I +camlp4 \
++		dynlink.cma \
++		camlp4o.cma \
++		pa_mikmatch_str.cma str.cma unix.cma run_mikmatch_str.cma
 +
 +misc-nc: misc-bc
  	ocamlopt -a -o run_mikmatch_str.cmxa \
  		mikmatch.ml run_mikmatch_str.ml
  
-@@ -110,7 +128,8 @@ test-install:
+@@ -110,7 +132,8 @@
  
  TRASH = \
   *~ *.ppo *.cm[ioxa] *.cmxa *.o *.a *.top \
@@ -122,3 +112,39 @@ Last-Update: <YYYY-MM-DD>
  
  
  OCAMLMAKEFILE = ../OCamlMakefile
+--- a/pcre/Makefile
++++ b/pcre/Makefile
+@@ -29,9 +29,9 @@
+ 
+ COMMON_LIBINSTALL_FILES = \
+   pa_mikmatch_pcre.cma pa_mikmatch_pcre.cmo pa_mikmatch_pcre.cmi \
+-  run_mikmatch_pcre.cmi mikmatch.cmi mikmatch.mli
++  run_mikmatch_pcre.cmi run_mikmatch_pcre.ml mikmatch.cmi mikmatch.mli
+ BC_LIBINSTALL_FILES = \
+-  run_mikmatch_pcre.cma run_mikmatch_pcre.cmo 
++  run_mikmatch_pcre.cma
+ NC_LIBINSTALL_FILES = \
+   run_mikmatch_pcre.cmxa run_mikmatch_pcre.cmx \
+   run_mikmatch_pcre.a run_mikmatch_pcre.o mikmatch.cmx
+@@ -44,9 +44,9 @@
+ default: version links pa_lib misc-bc misc-nc
+ 	touch bytecode
+ 	touch nativecode
+-all-bc: links pa_lib misc-bc
++all-bc: version links pa_lib misc-bc
+ 	touch bytecode
+-all-nc: links pa_lib misc-nc
++all-nc: version links pa_lib misc-nc
+ 	touch nativecode
+ 
+ all: # needed by libinstall
+@@ -90,6 +90,9 @@
+ version:
+ 	sed -e "s/VERSION/$(VERSION)/" < META.template > META
+ 
++topinstall:
++	install -m 0755 mikmatch_pcre.top $(DESTDIR)$(BINDIR)/mikmatch_pcre
++
+ misc-bc:
+ 	ocamlc -c mikmatch.mli
+ 	ocamlc -a -o run_mikmatch_pcre.cma -I $(PCRE_DIR) \
diff --git a/debian/patches/ocaml-3-12.patch b/debian/patches/ocaml-3-12.patch
new file mode 100644
index 0000000..3d0b6fb
--- /dev/null
+++ b/debian/patches/ocaml-3-12.patch
@@ -0,0 +1,16 @@
+Description: backward compatibility for OCaml 3.12
+ Mikmatch 1.06 has been released for OCaml 4.00. This patch undoes
+ some of the 1.06 changes to regain 3.12 compatibility. When compiling
+ for 4.00, this patch should not be used.
+Author: Hendrik Tews <hendrik at askra.de>
+--- a/common/match.ml
++++ b/common/match.ml
+@@ -585,7 +585,7 @@
+     | <:patt< $_$ ; $_$ >> (* record or array items *)
+     | <:patt< $_$ = $_$ >> (* record field *)
+     | <:patt< >>
+-    | Ast.PaMod _    (* (module M) *)
++(*    | Ast.PaMod _    (* (module M) *) *)
+     | Ast.PaOlb _    (* ?s or ?s:(p) *)
+     | Ast.PaOlbi _   (* ?s:(p = e) or ?(p = e) *)
+     | Ast.PaLab _ -> (* label *)
diff --git a/debian/patches/series b/debian/patches/series
index 3893f58..ebc27c9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-debian-changes-1.0.2-1
+makefile.patch
+ocaml-3-12.patch
diff --git a/debian/rules b/debian/rules
index 4b0ab0c..cd2c972 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,9 +2,11 @@
 # -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
 
 DESTDIR=$(CURDIR)/debian/tmp
+export DESTDIR
 
 include /usr/share/ocaml/ocamlvars.mk
 
@@ -13,28 +15,44 @@ export OCAMLFIND_DESTDIR
 OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
+
 %:
-	dh --with ocaml $@
+	dh $@ --with ocaml
+
 
 .PHONY: override_dh_auto_build
 override_dh_auto_build:
-	$(MAKE) all
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-	$(MAKE) opt
+	$(MAKE) OCAMLC=ocamlc.opt OCAMLOPT=ocamlopt.opt all opt
+else
+	$(MAKE) all
 endif 
+	mkdir -p doc/mikmatch-ocamldoc
 	$(MAKE) -C doc all
 
+
+# there is also a failing test goal in pcre,
+# waiting for upstream comments on it
+# the test goal in str uses native compilation
+# diable it too until discussed with upstream
+# .PHONY: override_dh_auto_test
+# override_dh_auto_test:
+# 	$(MAKE) -C str test
+
+
 .PHONY: override_dh_auto_install
 override_dh_auto_install:
 	mkdir -p '$(DESTDIR)/usr/bin'
 	mkdir -p '$(OCAMLFIND_DESTDIR)'
-	make install 
-	make install-str
+	$(MAKE) install 
+	$(MAKE) install-str
+
 
 .PHONY: override_dh_install
 override_dh_install:
 	dh_install --fail-missing
 
+
 .PHONY: override_dh_auto_clean
 override_dh_auto_clean:
 	$(MAKE) clean

-- 
mikmatch packaging

More information about the Pkg-ocaml-maint-commits mailing list