[Pkg-ocaml-maint-commits] [mikmatch] 06/09: Reformat patches

Stéphane Glondu glondu at moszumanska.debian.org
Thu Aug 4 12:04:00 UTC 2016 

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository mikmatch.

commit 0a571168a3888444da809e5d992d292cd83de66a
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 4 13:51:19 2016 +0200

    Reformat patches
---
 ...{makefile.patch => 0001-Makefile-changes.patch} | 106 ++++++++++++---------
 ...0002-Make-manual-ocamldoc-4.00-compatible.patch |  20 ++++
 debian/patches/ocamldoc-4.patch                    |  12 ---
 debian/patches/series                              |   4 +-
 4 files changed, 83 insertions(+), 59 deletions(-)

diff --git a/debian/patches/makefile.patch b/debian/patches/0001-Makefile-changes.patch
similarity index 80%
rename from debian/patches/makefile.patch
rename to debian/patches/0001-Makefile-changes.patch
index 3f69755..bbf8b66 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/0001-Makefile-changes.patch
@@ -1,15 +1,27 @@
-Description: Makefile changes
- patching the makefile for several purposes:
+From: Sylvain Le Gall <gildor at debian.org>
+Date: Thu, 4 Aug 2016 13:48:13 +0200
+Subject: 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>
-Author: Hendrik Tews <hendrik at askra.de>
+
+Signed-off-by: Sylvain Le Gall <gildor at debian.org>
+Signed-off-by: Hendrik Tews <hendrik at askra.de>
+---
+ Makefile      |  2 ++
+ pcre/Makefile | 11 +++++++----
+ str/Makefile  | 43 +++++++++++++++++++++++++++++++++----------
+ 3 files changed, 42 insertions(+), 14 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 750b4bb..b5b14fe 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -23,8 +23,10 @@
+@@ -23,8 +23,10 @@ reinstall:
  ## GODIVA/GODI targets
  all: common
  	cd pcre && $(MAKE) all-bc
@@ -20,9 +32,49 @@ Author: Hendrik Tews <hendrik at askra.de>
  
  ## end of GODIVA targets
  
+diff --git a/pcre/Makefile b/pcre/Makefile
+index cfad2c1..7ebd19a 100644
+--- a/pcre/Makefile
++++ b/pcre/Makefile
+@@ -29,9 +29,9 @@ USE_CAMLP4 = yes
+ 
+ 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 @@ ALL_LIBINSTALL_FILES = \
+ 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 @@ uninstall:
+ 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/str/Makefile b/str/Makefile
+index 658cb3d..859809b 100644
 --- a/str/Makefile
 +++ b/str/Makefile
-@@ -24,21 +24,30 @@
+@@ -24,21 +24,30 @@ INCDIRS = ../common
  
  USE_CAMLP4 = yes
  
@@ -58,7 +110,7 @@ Author: Hendrik Tews <hendrik at askra.de>
  
  links: mikmatch.mli mikmatch.ml match.ml syntax_common.ml mm_util.ml \
  	global_def.mli global_def.ml
-@@ -58,13 +67,20 @@
+@@ -58,13 +67,20 @@ global_def.mli: ../common/global_def.mli
  global_def.ml: ../common/global_def.ml
  	ln -s $< $@
  
@@ -81,7 +133,7 @@ Author: Hendrik Tews <hendrik at askra.de>
  uninstall: libuninstall
  	rm -f $(BINDIR)/mikmatch_str.top $(BINDIR)/mikmatch_str
  
-@@ -72,12 +88,18 @@
+@@ -72,12 +88,18 @@ version:
  	sed -e "s/VERSION/$(VERSION)/" < META.template > META
  
  topinstall:
@@ -102,7 +154,7 @@ Author: Hendrik Tews <hendrik at askra.de>
  	ocamlopt -a -o run_mikmatch_str.cmxa \
  		mikmatch.ml run_mikmatch_str.ml
  
-@@ -110,7 +132,8 @@
+@@ -110,7 +132,8 @@ test-install:
  
  TRASH = \
   *~ *.ppo *.cm[ioxa] *.cmxa *.o *.a *.top \
@@ -112,39 +164,3 @@ Author: Hendrik Tews <hendrik at askra.de>
  
  
  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/0002-Make-manual-ocamldoc-4.00-compatible.patch b/debian/patches/0002-Make-manual-ocamldoc-4.00-compatible.patch
new file mode 100644
index 0000000..f7930f2
--- /dev/null
+++ b/debian/patches/0002-Make-manual-ocamldoc-4.00-compatible.patch
@@ -0,0 +1,20 @@
+From: Hendrik Tews <hendrik at askra.de>
+Date: Thu, 4 Aug 2016 13:50:09 +0200
+Subject: Make manual ocamldoc 4.00 compatible
+
+---
+ doc/mikmatch-manual.tex.mlx | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/doc/mikmatch-manual.tex.mlx b/doc/mikmatch-manual.tex.mlx
+index b111ed3..e6b2262 100644
+--- a/doc/mikmatch-manual.tex.mlx
++++ b/doc/mikmatch-manual.tex.mlx
+@@ -12,6 +12,7 @@
+ \usepackage{fullpage} 
+ \usepackage{url} 
+ \usepackage{ocamldoc}
++\usepackage{textcomp}
+ 
+ \title{Mikmatch Version~## Sys.command "../VERSION" ##\\
+ Reference Manual}
diff --git a/debian/patches/ocamldoc-4.patch b/debian/patches/ocamldoc-4.patch
deleted file mode 100644
index 875ddbb..0000000
--- a/debian/patches/ocamldoc-4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: make manual ocamldoc 4.00 compatible
-Author: Hendrik Tews <hendrik at askra.de>
---- a/doc/mikmatch-manual.tex.mlx
-+++ b/doc/mikmatch-manual.tex.mlx
-@@ -12,6 +12,7 @@
- \usepackage{fullpage} 
- \usepackage{url} 
- \usepackage{ocamldoc}
-+\usepackage{textcomp}
- 
- \title{Mikmatch Version~## Sys.command "../VERSION" ##\\
- Reference Manual}
diff --git a/debian/patches/series b/debian/patches/series
index 41109a5..ba73cf3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-makefile.patch
-ocamldoc-4.patch
+0001-Makefile-changes.patch
+0002-Make-manual-ocamldoc-4.00-compatible.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/mikmatch.git

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