[Pkg-ocaml-maint-commits] r2179 - in
trunk/packages/regexp-pp/trunk: . debian debian/patches
Mike Furr
mfurr at costa.debian.org
Sun Nov 27 18:28:41 UTC 2005
Author: mfurr
Date: 2005-11-27 18:28:39 +0000 (Sun, 27 Nov 2005)
New Revision: 2179
Added:
trunk/packages/regexp-pp/trunk/debian/patches/10_pp.dpatch
trunk/packages/regexp-pp/trunk/debian/patches/20_test.dpatch
trunk/packages/regexp-pp/trunk/regexp-pp_1.0.0.orig.tar.gz
Removed:
trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch
trunk/packages/regexp-pp/trunk/regexp-pp_0.9.5.3.orig.tar.gz
Modified:
trunk/packages/regexp-pp/trunk/debian/changelog
trunk/packages/regexp-pp/trunk/debian/control
trunk/packages/regexp-pp/trunk/debian/patches/00list
trunk/packages/regexp-pp/trunk/debian/rules
Log:
new upstream release
Modified: trunk/packages/regexp-pp/trunk/debian/changelog
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/changelog 2005-11-27 17:30:50 UTC (rev 2178)
+++ trunk/packages/regexp-pp/trunk/debian/changelog 2005-11-27 18:28:39 UTC (rev 2179)
@@ -1,3 +1,11 @@
+regexp-pp (1.0.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Build with OCaml 3.09
+ * Dropped version on findlib and pcre deps since 3.09 dep is sufficient
+
+ -- Mike Furr <mfurr at debian.org> Sun, 27 Nov 2005 12:45:45 -0500
+
regexp-pp (0.9.5.3-1) unstable; urgency=low
* New maintainer: Mike Furr
Modified: trunk/packages/regexp-pp/trunk/debian/control
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/control 2005-11-27 17:30:50 UTC (rev 2178)
+++ trunk/packages/regexp-pp/trunk/debian/control 2005-11-27 18:28:39 UTC (rev 2179)
@@ -2,12 +2,12 @@
Section: devel
Priority: optional
Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.08.3, ocaml-findlib (>= 1.0.4-2), libpcre-ocaml-dev (>= 5.08.1-1), ocaml-tools, dpatch
+Build-Depends: debhelper (>= 4.0.0), ocaml-nox-3.09.0, ocaml-findlib, libpcre-ocaml-dev, ocaml-tools, dpatch
Standards-Version: 3.6.1.1
Package: libregexp-pp-ocaml-dev
Architecture: any
-Depends: libpcre-ocaml-dev, ocaml-nox-3.08.3, ocaml-findlib
+Depends: libpcre-ocaml-dev, ocaml-nox-3.09.0, ocaml-findlib
Description: Syntax extension for OCaml to make Regexp usage much easier
Regexp/OCaml provides convenient syntax sugar for regular expression
match for strings using PCRE/OCaml library. The features of this macro
Modified: trunk/packages/regexp-pp/trunk/debian/patches/00list
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/patches/00list 2005-11-27 17:30:50 UTC (rev 2178)
+++ trunk/packages/regexp-pp/trunk/debian/patches/00list 2005-11-27 18:28:39 UTC (rev 2179)
@@ -1 +1,2 @@
-makefiles
+10_pp
+20_test
Added: trunk/packages/regexp-pp/trunk/debian/patches/10_pp.dpatch
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/patches/10_pp.dpatch 2005-11-27 17:30:50 UTC (rev 2178)
+++ trunk/packages/regexp-pp/trunk/debian/patches/10_pp.dpatch 2005-11-27 18:28:39 UTC (rev 2179)
@@ -0,0 +1,15 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_pp.dpatch by Mike Furr <mfurr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad regexp-pp-1.0.0~/common/version_filter.ml regexp-pp-1.0.0/common/version_filter.ml
+--- regexp-pp-1.0.0~/common/version_filter.ml 2005-06-06 12:08:39.000000000 -0400
++++ regexp-pp-1.0.0/common/version_filter.ml 2005-11-27 12:49:26.602471286 -0500
+@@ -1,3 +1,4 @@
++
+ (*pp ocamlrun ./version_filter -pp "camlp4o -impl" *)
+ (************************************************************
+ *
Property changes on: trunk/packages/regexp-pp/trunk/debian/patches/10_pp.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/regexp-pp/trunk/debian/patches/20_test.dpatch
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/patches/20_test.dpatch 2005-11-27 17:30:50 UTC (rev 2178)
+++ trunk/packages/regexp-pp/trunk/debian/patches/20_test.dpatch 2005-11-27 18:28:39 UTC (rev 2179)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_test.dpatch by Mike Furr <mfurr at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad regexp-pp-1.0.0~/pa_regexp_match/Makefile regexp-pp-1.0.0/pa_regexp_match/Makefile
+--- regexp-pp-1.0.0~/pa_regexp_match/Makefile 2005-01-24 14:00:56.000000000 -0500
++++ regexp-pp-1.0.0/pa_regexp_match/Makefile 2005-11-27 12:57:24.991828536 -0500
+@@ -32,8 +32,8 @@
+ clean: clean-doc clean-test
+
+ test: all match-regexp-test \
+- match-regexp-test2.ppo match-regexp-test3.ppo match-regexp-test4.ppo \
+- match-regexp-test5
++ match-regexp-test2.ppo match-regexp-test3.ppo match-regexp-test4.ppo
++# match-regexp-test5
+
+ TEST_MAKEOPTS=-f $(OCAMLMAKEFILE) SOURCES=match-regexp-test.ml \
+ RESULT=match-regexp-test PACKS=pcre OCAMLLDFLAGS=
Property changes on: trunk/packages/regexp-pp/trunk/debian/patches/20_test.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch 2005-11-27 17:30:50 UTC (rev 2178)
+++ trunk/packages/regexp-pp/trunk/debian/patches/makefiles.dpatch 2005-11-27 18:28:39 UTC (rev 2179)
@@ -1,42 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## makefiles.dpatch by John Goerzen <jgoerzen at complete.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Cleaner installation and compilation rules.
-
- at DPATCH@
-diff -urNad regexp-pp-0.9.5.1.orig/OCamlMakefile /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/OCamlMakefile
---- regexp-pp-0.9.5.1.orig/OCamlMakefile 2004-09-27 18:17:41.000000000 +0200
-+++ /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/OCamlMakefile 2005-04-03 23:42:20.000000000 +0200
-@@ -148,9 +148,7 @@
- TOPRESULT := $(addsuffix $(TOPSUFFIX), $(RESULT))
-
- ifndef OCAMLFIND
-- ifndef PACKS
-- OCAMLFIND := ocamlfind
-- endif
-+ OCAMLFIND := ocamlfind
- endif
-
- export OCAMLFIND
-@@ -912,7 +910,7 @@
- .PHONY: libinstall
- libinstall: all
- $(QUIET)printf "\nInstalling library with ocamlfind\n"
-- $(OCAMLFIND) install $(RESULT) META $(LIBINSTALL_FILES)
-+ $(OCAMLFIND) install -destdir $(DESTDIR)/`ocamlc -where` $(RESULT) META $(LIBINSTALL_FILES)
- $(QUIET)printf "\nInstallation successful.\n"
-
- .PHONY: libuninstall
-diff -urNad regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile
---- regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile 2004-09-27 18:17:39.000000000 +0200
-+++ /tmp/dpep.Oirbqb/regexp-pp-0.9.5.1.orig/pa_regexp_match/Makefile 2005-04-03 23:42:10.000000000 +0200
-@@ -32,7 +32,7 @@
-
- match-regexp-test: match-regexp-test.ml pa_regexp_match.cma
- rm -f match-regexp-test$(EXE)
-- $(MAKE) $(TEST_MAKEOPTS) native-code
-+ $(MAKE) $(TEST_MAKEOPTS) `if [ -x /usr/bin/ocamlopt ]; then echo native-code; else echo byte-code; fi`
-
- %.ppo: %.ml pa_regexp_match.cma
- camlp4o pr_o.cmo $*.ml > $*.ppo
Modified: trunk/packages/regexp-pp/trunk/debian/rules
===================================================================
--- trunk/packages/regexp-pp/trunk/debian/rules 2005-11-27 17:30:50 UTC (rev 2178)
+++ trunk/packages/regexp-pp/trunk/debian/rules 2005-11-27 18:28:39 UTC (rev 2179)
@@ -9,6 +9,7 @@
# Include dpatch stuff.
include /usr/share/dpatch/dpatch.make
+OCAML_DIR=`ocamlc -where`
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -31,7 +32,6 @@
dh_testdir
$(MAKE) all
- $(MAKE) test
touch build-stamp
@@ -51,9 +51,10 @@
dh_clean -k
dh_installdirs
- mkdir -p debian/libregexp-pp-ocaml-dev`ocamlc -where`
+ mkdir -p debian/libregexp-pp-ocaml-dev$(OCAML_DIR)
- $(MAKE) install DESTDIR=$(CURDIR)/debian/libregexp-pp-ocaml-dev
+ OCAMLFIND_DESTDIR=$(CURDIR)/debian/libregexp-pp-ocaml-dev$(OCAML_DIR) \
+ $(MAKE) install
# Build architecture-independent files here.
Deleted: trunk/packages/regexp-pp/trunk/regexp-pp_0.9.5.3.orig.tar.gz
===================================================================
(Binary files differ)
Added: trunk/packages/regexp-pp/trunk/regexp-pp_1.0.0.orig.tar.gz
===================================================================
(Binary files differ)
Property changes on: trunk/packages/regexp-pp/trunk/regexp-pp_1.0.0.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
More information about the Pkg-ocaml-maint-commits
mailing list