[Pkg-ocaml-maint-commits] [SCM] mikmatch packaging branch, master, updated. debian/1.0.2-1
Sylvain Le Gall
gildor at debian.org
Thu Dec 2 21:30:14 UTC 2010
The following commit has been merged in the master branch:
commit ce7f1f7308eb4c9e537ba4499b1446bfa1f74a04
Author: Sylvain Le Gall <gildor at debian.org>
Date: Thu Dec 2 17:58:55 2010 +0100
Initial packaging
diff --git a/Makefile b/Makefile
index 5f399cb..baf1dda 100644
--- a/Makefile
+++ b/Makefile
@@ -19,8 +19,10 @@ uninstall: uninstall-pcre
## GODIVA/GODI targets
all: common
cd pcre && $(MAKE) all-bc
+ cd str && $(MAKE) all-bc
opt: common
cd pcre && $(MAKE) all-nc
+ cd str && $(MAKE) all-nc
## end of GODIVA targets
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..d80f1e5
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+mikmatch (1.0.2-1) unstable; urgency=low
+
+ * Initial release. (Closes: #605635)
+
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 02 Dec 2010 17:58:11 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7f8f011
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+7
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..7958562
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,64 @@
+Source: mikmatch
+Section: ocaml
+Priority: optional
+Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
+Uploaders:
+ Sylvain Le Gall <gildor at debian.org>
+Build-Depends:
+ ocaml-nox (>= 3.11.1-3~),
+ ocaml-findlib,
+ dh-ocaml (>= 0.9~),
+ debhelper (>= 7.0.50~),
+ libpcre-ocaml-dev,
+ camlp4, camlp4-extra,
+ texlive-latex-base, hevea, camlmix
+Standards-Version: 3.9.1
+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
+
+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
+ Mikmatch provides enhanced pattern matching with regexps for OCaml.
+ .
+ The goal of Mikmatch is to make text-oriented programs even easier to write,
+ read and run without losing the unique and powerful features of OCaml.
+ Mikmatch provides a concise and highly readable syntax for regular
+ expressions, and integrates it into the syntax of OCaml thanks to Camlp4.
+ .
+ The implementation of Mikmatch consists essentially of:
+ * a library which is loaded by the OCaml preprocessor (Camlp4) and
+ defines sophisticated "macros", i.e. the modified syntax;
+ * a traditional library (runtime) which is required by the programs that
+ use the Mikmatch syntax;
+ * 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.
+
+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
+ Mikmatch provides enhanced pattern matching with regexps for OCaml.
+ .
+ The goal of Mikmatch is to make text-oriented programs even easier to write,
+ read and run without losing the unique and powerful features of OCaml.
+ Mikmatch provides a concise and highly readable syntax for regular
+ expressions, and integrates it into the syntax of OCaml thanks to Camlp4.
+ .
+ The implementation of Mikmatch consists essentially of:
+ * a library which is loaded by the OCaml preprocessor (Camlp4) and
+ defines sophisticated "macros", i.e. the modified syntax;
+ * a traditional library (runtime) which is required by the programs that
+ use the Mikmatch syntax;
+ * 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 shared runtime libraries.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..b79ebcf
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,37 @@
+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>
+
+Files: *
+Copyright: Copyright (c) 2004-2008 Martin Jambon
+License: BSD3
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ 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.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: (C) 2010 Sylvain Le Gall <gildor at debian.org>
+License: GPL-3+
+
+ See '/usr/share/common-licenses/GPL-3' for the full text.
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
diff --git a/debian/libmikmatch-ocaml-dev.doc-base.manual b/debian/libmikmatch-ocaml-dev.doc-base.manual
new file mode 100644
index 0000000..9d06e78
--- /dev/null
+++ b/debian/libmikmatch-ocaml-dev.doc-base.manual
@@ -0,0 +1,8 @@
+Document: libmikmatch-ocaml-dev-manual
+Title: Mikmatch reference manual
+Author: Martin Jambon
+Section: Programming/OCaml
+
+Format: HTML
+Index: /usr/share/doc/libmikmatch-ocaml-dev/mikmatch-manual.html
+Files: /usr/share/doc/libmikmatch-ocaml-dev/mikmatch-manual.html
diff --git a/debian/libmikmatch-ocaml-dev.docs b/debian/libmikmatch-ocaml-dev.docs
new file mode 100644
index 0000000..f17f1f0
--- /dev/null
+++ b/debian/libmikmatch-ocaml-dev.docs
@@ -0,0 +1,2 @@
+doc/mikmatch-ocamldoc
+doc/mikmatch-manual.html
diff --git a/debian/libmikmatch-ocaml-dev.install.in b/debian/libmikmatch-ocaml-dev.install.in
new file mode 100644
index 0000000..d2920c4
--- /dev/null
+++ b/debian/libmikmatch-ocaml-dev.install.in
@@ -0,0 +1,17 @@
+ at OCamlStdlibDir@/mikmatch_pcre/*.cmi
+ at OCamlStdlibDir@/mikmatch_str/*.cmi
+ at OCamlStdlibDir@/mikmatch_pcre/*.mli
+ at OCamlStdlibDir@/mikmatch_str/*.mli
+ at OCamlStdlibDir@/mikmatch_pcre/pa_mikmatch_pcre.cmo
+ at OCamlStdlibDir@/mikmatch_pcre/pa_mikmatch_pcre.cma
+ at OCamlStdlibDir@/mikmatch_str/pa_mikmatch_str.cmo
+ at OCamlStdlibDir@/mikmatch_str/pa_mikmatch_str.cma
+OPT: @OCamlStdlibDir@/mikmatch_pcre/*.cmxa
+OPT: @OCamlStdlibDir@/mikmatch_str/*.cmxa
+OPT: @OCamlStdlibDir@/mikmatch_pcre/*.cmx
+OPT: @OCamlStdlibDir@/mikmatch_str/*.cmx
+OPT: @OCamlStdlibDir@/mikmatch_pcre/*.a
+OPT: @OCamlStdlibDir@/mikmatch_str/*.a
+OPT: @OCamlStdlibDir@/mikmatch_pcre/*.o
+OPT: @OCamlStdlibDir@/mikmatch_str/*.o
+
diff --git a/debian/libmikmatch-ocaml-dev.ocamldoc b/debian/libmikmatch-ocaml-dev.ocamldoc
new file mode 100644
index 0000000..fb08ba7
--- /dev/null
+++ b/debian/libmikmatch-ocaml-dev.ocamldoc
@@ -0,0 +1,2 @@
+-d mikmatch-ocamldoc
+--doc-base-generate
diff --git a/debian/libmikmatch-ocaml.install.in b/debian/libmikmatch-ocaml.install.in
new file mode 100644
index 0000000..650442b
--- /dev/null
+++ b/debian/libmikmatch-ocaml.install.in
@@ -0,0 +1,8 @@
+ at OCamlStdlibDir@/mikmatch_pcre/META
+ at OCamlStdlibDir@/mikmatch_str/META
+ at OCamlStdlibDir@/mikmatch_pcre/run_mikmatch_pcre.cmo
+ at OCamlStdlibDir@/mikmatch_pcre/run_mikmatch_pcre.cma
+ at OCamlStdlibDir@/mikmatch_str/mikmatch.cmo
+ at OCamlStdlibDir@/mikmatch_str/run_mikmatch_str.cmo
+ at OCamlStdlibDir@/mikmatch_str/run_mikmatch_str.cma
+
diff --git a/debian/patches/debian-changes-1.0.2-1 b/debian/patches/debian-changes-1.0.2-1
new file mode 100644
index 0000000..7791522
--- /dev/null
+++ b/debian/patches/debian-changes-1.0.2-1
@@ -0,0 +1,128 @@
+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.
+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>
+
+Index: mikmatch/Makefile
+===================================================================
+--- mikmatch.orig/Makefile 2010-12-02 17:56:55.000000000 +0100
++++ mikmatch/Makefile 2010-12-02 17:56:55.000000000 +0100
+@@ -19,8 +19,10 @@
+ ## GODIVA/GODI targets
+ all: common
+ cd pcre && $(MAKE) all-bc
++ cd str && $(MAKE) all-bc
+ opt: common
+ cd pcre && $(MAKE) all-nc
++ cd str && $(MAKE) all-nc
+
+ ## end of GODIVA targets
+
+Index: mikmatch/str/Makefile
+===================================================================
+--- mikmatch.orig/str/Makefile 2010-12-02 17:56:55.000000000 +0100
++++ mikmatch/str/Makefile 2010-12-02 17:56:55.000000000 +0100
+@@ -24,21 +24,30 @@
+
+ USE_CAMLP4 = yes
+
+-LIBINSTALL_FILES := \
++COMMON_LIBINSTALL_FILES := \
+ 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
++BC_LIBINSTALL_FILES := \
++ run_mikmatch_str.cma run_mikmatch_str.cmo mikmatch.cmo
++NC_LIBINSTALL_FILES := \
++ mikmatch.cmx \
+ run_mikmatch_str.cmxa run_mikmatch_str.cmx \
+ run_mikmatch_str.a run_mikmatch_str.o
++ALL_LIBINSTALL_FILES := \
++ $(COMMON_LIBINSTALL_FILES) $(BC_LIBINSTALL_FILES) $(NC_LIBINSTALL_FILES)
+
+ .PHONY: default force all links
+
+-default: version links pa_lib misc
++default: all-nc all-bc
+ force:
+ touch $(SOURCES)
+ $(MAKE)
+
+-all:
++all-bc: version links pa_lib misc-bc
++ touch bytecode
++all-nc: version links pa_lib misc-nc
++ touch nativecode
+
+ 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.ml: ../common/global_def.ml
+ ln -s $< $@
+
+-.PHONY: pa_lib install uninstall version topinstall misc
++.PHONY: pa_lib install uninstall version topinstall misc all-nc all-bc \
++ misc-bc misc-nc
+
+ pa_lib:
+ $(MAKE) RESULT=pa_mikmatch_str pabc bcl
+
+ #install: libinstall topinstall
+-install: libinstall
++install:
++ if test -f nativecode; \
++ then \
++ $(MAKE) "LIBINSTALL_FILES=$(ALL_LIBINSTALL_FILES)" libinstall;\
++ else \
++ $(MAKE) "LIBINSTALL_FILES=$(COMMON_LIBINSTALL_FILES) $(BC_LIBINSTALL_FILES)" libinstall; \
++ fi
+ uninstall: libuninstall
+ rm -f $(BINDIR)/mikmatch_str.top $(BINDIR)/mikmatch_str
+
+@@ -74,10 +90,12 @@
+ topinstall:
+ install -m 0755 mikmatch_str.top mikmatch_str $(BINDIR)
+
+-misc:
++misc-bc:
+ ocamlc -c mikmatch.mli
+ ocamlc -a -o run_mikmatch_str.cma \
+ mikmatch.ml run_mikmatch_str.ml
++
++misc-nc: misc-bc
+ ocamlopt -a -o run_mikmatch_str.cmxa \
+ mikmatch.ml run_mikmatch_str.ml
+
+@@ -110,7 +128,8 @@
+
+ TRASH = \
+ *~ *.ppo *.cm[ioxa] *.cmxa *.o *.a *.top \
+- *.test test1 test1.more mikmatch_str mikmatch_str.ml
++ *.test test1 test1.more mikmatch_str mikmatch_str.ml \
++ bytecode nativecode
+
+
+ OCAMLMAKEFILE = ../OCamlMakefile
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3893f58
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+debian-changes-1.0.2-1
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..4b0ab0c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,41 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+DESTDIR=$(CURDIR)/debian/tmp
+
+include /usr/share/ocaml/ocamlvars.mk
+
+OCAMLFIND_DESTDIR=$(DESTDIR)/$(OCAML_STDLIB_DIR)
+export OCAMLFIND_DESTDIR
+OCAMLFIND_LDCONF=ignore
+export OCAMLFIND_LDCONF
+
+%:
+ dh --with ocaml $@
+
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
+ $(MAKE) all
+ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
+ $(MAKE) opt
+endif
+ $(MAKE) -C doc all
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+ mkdir -p '$(DESTDIR)/usr/bin'
+ mkdir -p '$(OCAMLFIND_DESTDIR)'
+ 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
+ $(MAKE) -C doc clean
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/str/Makefile b/str/Makefile
index 658cb3d..3940239 100644
--- a/str/Makefile
+++ b/str/Makefile
@@ -24,21 +24,30 @@ INCDIRS = ../common
USE_CAMLP4 = yes
-LIBINSTALL_FILES := \
+COMMON_LIBINSTALL_FILES := \
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
+BC_LIBINSTALL_FILES := \
+ run_mikmatch_str.cma run_mikmatch_str.cmo mikmatch.cmo
+NC_LIBINSTALL_FILES := \
+ mikmatch.cmx \
run_mikmatch_str.cmxa run_mikmatch_str.cmx \
run_mikmatch_str.a run_mikmatch_str.o
+ALL_LIBINSTALL_FILES := \
+ $(COMMON_LIBINSTALL_FILES) $(BC_LIBINSTALL_FILES) $(NC_LIBINSTALL_FILES)
.PHONY: default force all links
-default: version links pa_lib misc
+default: all-nc all-bc
force:
touch $(SOURCES)
$(MAKE)
-all:
+all-bc: version links pa_lib misc-bc
+ touch bytecode
+all-nc: version links pa_lib misc-nc
+ touch nativecode
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
global_def.ml: ../common/global_def.ml
ln -s $< $@
-.PHONY: pa_lib install uninstall version topinstall misc
+.PHONY: pa_lib install uninstall version topinstall misc all-nc all-bc \
+ misc-bc misc-nc
pa_lib:
$(MAKE) RESULT=pa_mikmatch_str pabc bcl
#install: libinstall topinstall
-install: libinstall
+install:
+ if test -f nativecode; \
+ then \
+ $(MAKE) "LIBINSTALL_FILES=$(ALL_LIBINSTALL_FILES)" libinstall;\
+ else \
+ $(MAKE) "LIBINSTALL_FILES=$(COMMON_LIBINSTALL_FILES) $(BC_LIBINSTALL_FILES)" libinstall; \
+ fi
uninstall: libuninstall
rm -f $(BINDIR)/mikmatch_str.top $(BINDIR)/mikmatch_str
@@ -74,10 +90,12 @@ version:
topinstall:
install -m 0755 mikmatch_str.top mikmatch_str $(BINDIR)
-misc:
+misc-bc:
ocamlc -c mikmatch.mli
ocamlc -a -o run_mikmatch_str.cma \
mikmatch.ml run_mikmatch_str.ml
+
+misc-nc: misc-bc
ocamlopt -a -o run_mikmatch_str.cmxa \
mikmatch.ml run_mikmatch_str.ml
@@ -110,7 +128,8 @@ test-install:
TRASH = \
*~ *.ppo *.cm[ioxa] *.cmxa *.o *.a *.top \
- *.test test1 test1.more mikmatch_str mikmatch_str.ml
+ *.test test1 test1.more mikmatch_str mikmatch_str.ml \
+ bytecode nativecode
OCAMLMAKEFILE = ../OCamlMakefile
--
mikmatch packaging
More information about the Pkg-ocaml-maint-commits
mailing list