[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:19 UTC 2010
The following commit has been merged in the master branch:
commit a7cf40c207f41dbd0fed7a02bf83feba85477e3f
Author: Sylvain Le Gall <gildor at debian.org>
Date: Thu Dec 2 22:28:32 2010 +0100
Prepare release, add missing dependencies
diff --git a/debian/changelog b/debian/changelog
index d80f1e5..82d2a43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ 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
+ -- Sylvain Le Gall <gildor at debian.org> Thu, 02 Dec 2010 22:22:54 +0100
diff --git a/debian/control b/debian/control
index 7958562..65ddaed 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends:
debhelper (>= 7.0.50~),
libpcre-ocaml-dev,
camlp4, camlp4-extra,
- texlive-latex-base, hevea, camlmix
+ texlive-latex-base, texlive-latex-extra,
+ 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
diff --git a/debian/patches/debian-changes-1.0.2-1 b/debian/patches/debian-changes-1.0.2-1
index 7791522..1cf2ab6 100644
--- a/debian/patches/debian-changes-1.0.2-1
+++ b/debian/patches/debian-changes-1.0.2-1
@@ -24,11 +24,9 @@ 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 @@
+--- mikmatch-1.0.2.orig/Makefile
++++ mikmatch-1.0.2/Makefile
+@@ -19,8 +19,10 @@ uninstall: uninstall-pcre
## GODIVA/GODI targets
all: common
cd pcre && $(MAKE) all-bc
@@ -39,11 +37,9 @@ Index: mikmatch/Makefile
## 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 @@
+--- mikmatch-1.0.2.orig/str/Makefile
++++ mikmatch-1.0.2/str/Makefile
+@@ -24,21 +24,30 @@ INCDIRS = ../common
USE_CAMLP4 = yes
@@ -79,7 +75,7 @@ Index: mikmatch/str/Makefile
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 $< $@
@@ -102,7 +98,7 @@ Index: mikmatch/str/Makefile
uninstall: libuninstall
rm -f $(BINDIR)/mikmatch_str.top $(BINDIR)/mikmatch_str
-@@ -74,10 +90,12 @@
+@@ -74,10 +90,12 @@ version:
topinstall:
install -m 0755 mikmatch_str.top mikmatch_str $(BINDIR)
@@ -116,7 +112,7 @@ Index: mikmatch/str/Makefile
ocamlopt -a -o run_mikmatch_str.cmxa \
mikmatch.ml run_mikmatch_str.ml
-@@ -110,7 +128,8 @@
+@@ -110,7 +128,8 @@ test-install:
TRASH = \
*~ *.ppo *.cm[ioxa] *.cmxa *.o *.a *.top \
--
mikmatch packaging
More information about the Pkg-ocaml-maint-commits
mailing list