[Pkg-ocaml-maint-commits] r2021 - in
trunk/packages/ulex/trunk/debian: . patches
Stefano Zacchiroli
zack at costa.debian.org
Sun Nov 13 00:34:27 UTC 2005
Author: zack
Date: 2005-11-13 00:34:27 +0000 (Sun, 13 Nov 2005)
New Revision: 2021
Added:
trunk/packages/ulex/trunk/debian/control.in
trunk/packages/ulex/trunk/debian/dirs.in
trunk/packages/ulex/trunk/debian/patches/23_meta_version.dpatch
Removed:
trunk/packages/ulex/trunk/debian/patches/19_install_mlis.dpatch
Modified:
trunk/packages/ulex/trunk/debian/changelog
trunk/packages/ulex/trunk/debian/control
trunk/packages/ulex/trunk/debian/dirs
trunk/packages/ulex/trunk/debian/patches/00list
trunk/packages/ulex/trunk/debian/patches/17_destdir.dpatch
trunk/packages/ulex/trunk/debian/rules
Log:
3.09 transition
Modified: trunk/packages/ulex/trunk/debian/changelog
===================================================================
--- trunk/packages/ulex/trunk/debian/changelog 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/changelog 2005-11-13 00:34:27 UTC (rev 2021)
@@ -1,5 +1,20 @@
-ulex (0.7-2) UNRELEASED; urgency=low
+ulex (0.8-1) unstable; urgency=low
+ * New upstream release
+ * Rebuilt with ocaml 3.09
+ * debian/*
+ - no longer hard coding of ocaml abi version anywhere
+ * debian/control
+ - bumped standards version
+ * debian/patches/
+ - ported 17_build to this upstream release
+ - removed 19_install_mlis, no longer needed
+ - added 23_meta_version, fix META version number
+
+ -- Stefano Zacchiroli <zack at debian.org> Sun, 13 Nov 2005 00:21:57 +0000
+
+ulex (0.7-2) unstable; urgency=low
+
* debian/rules
- uses cdbs
* debian/control
Modified: trunk/packages/ulex/trunk/debian/control
===================================================================
--- trunk/packages/ulex/trunk/debian/control 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/control 2005-11-13 00:34:27 UTC (rev 2021)
@@ -2,12 +2,12 @@
Section: devel
Priority: optional
Maintainer: Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 4.1.0), ocaml-nox-3.08.3, ocaml-findlib, dpatch, cdbs
-Standards-Version: 3.6.1.1
+Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= 3.09.0), ocaml-findlib (>= 1.1), dpatch, cdbs
+Standards-Version: 3.6.2
Package: ocaml-ulex
Architecture: any
-Depends: ocaml-nox-3.08.3, ocaml-findlib, ${misc:Depends}
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), ${misc:Depends}
Description: OCaml lexer generator with Unicode support
ulex is a lexer genereator for the Objective Caml (OCaml) programming
language.
Added: trunk/packages/ulex/trunk/debian/control.in
===================================================================
--- trunk/packages/ulex/trunk/debian/control.in 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/control.in 2005-11-13 00:34:27 UTC (rev 2021)
@@ -0,0 +1,21 @@
+Source: ulex
+Section: devel
+Priority: optional
+Maintainer: Stefano Zacchiroli <zack at debian.org>
+Build-Depends: debhelper (>= 4.1.0), ocaml-nox (>= @OCamlABI@), ocaml-findlib (>= 1.1), dpatch, cdbs
+Standards-Version: 3.6.2
+
+Package: ocaml-ulex
+Architecture: any
+Depends: ocaml-nox-${F:OCamlABI}, ocaml-findlib (>= 1.1), ${misc:Depends}
+Description: OCaml lexer generator with Unicode support
+ ulex is a lexer genereator for the Objective Caml (OCaml) programming
+ language.
+ .
+ It is implemented as a Camlp4 syntax extension: lexer specifications
+ are embedded in regular OCaml code.
+ .
+ Generated lexers work with a new kind of "lexbuf" that supports
+ Unicode; a single lexer can work with arbitrary encodings of the input
+ stream.
+
Modified: trunk/packages/ulex/trunk/debian/dirs
===================================================================
--- trunk/packages/ulex/trunk/debian/dirs 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/dirs 2005-11-13 00:34:27 UTC (rev 2021)
@@ -1 +1 @@
-usr/lib/ocaml/3.08.3
+usr/lib/ocaml/3.09.0
Added: trunk/packages/ulex/trunk/debian/dirs.in
===================================================================
--- trunk/packages/ulex/trunk/debian/dirs.in 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/dirs.in 2005-11-13 00:34:27 UTC (rev 2021)
@@ -0,0 +1 @@
+usr/lib/ocaml/@OCamlABI@
Modified: trunk/packages/ulex/trunk/debian/patches/00list
===================================================================
--- trunk/packages/ulex/trunk/debian/patches/00list 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/patches/00list 2005-11-13 00:34:27 UTC (rev 2021)
@@ -1 +1,2 @@
-17_destdir
+17_destdir.dpatch
+23_meta_version.dpatch
Modified: trunk/packages/ulex/trunk/debian/patches/17_destdir.dpatch
===================================================================
--- trunk/packages/ulex/trunk/debian/patches/17_destdir.dpatch 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/patches/17_destdir.dpatch 2005-11-13 00:34:27 UTC (rev 2021)
@@ -1,39 +1,21 @@
-#!/bin/sh -e
-## 17_destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23_build.dpatch by Stefano Zacchiroli <zack at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
-## DP: Install stuff in DESTDIR. Install also ulexing.mli.
+## DP: No description.
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
@DPATCH@
-diff -urNad /home/zack/dati/debian/packages/ulex/ulex-0.4/Makefile ulex-0.4/Makefile
---- /home/zack/dati/debian/packages/ulex/ulex-0.4/Makefile 2004-01-11 15:20:26.000000000 +0100
-+++ ulex-0.4/Makefile 2004-01-11 15:22:26.000000000 +0100
+diff -urNad trunk~/Makefile trunk/Makefile
+--- trunk~/Makefile 2005-10-30 07:59:49.000000000 +0000
++++ trunk/Makefile 2005-11-13 00:30:07.000000000 +0000
@@ -4,8 +4,9 @@
all.opt: ulexing.cma ulexing.cmxa pa_ulex.cma
+DESTDIR=
install: all
-- ocamlfind install ulex META $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-+ ocamlfind install -destdir $(DESTDIR) ulex META $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) ulexing.mli
+- ocamlfind install ulex META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
++ ocamlfind install -destdir $(DESTDIR) ulex META $(wildcard *.mli) $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
uninstall:
ocamlfind remove ulex
Deleted: trunk/packages/ulex/trunk/debian/patches/19_install_mlis.dpatch
===================================================================
--- trunk/packages/ulex/trunk/debian/patches/19_install_mlis.dpatch 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/patches/19_install_mlis.dpatch 2005-11-13 00:34:27 UTC (rev 2021)
@@ -1,37 +0,0 @@
-#!/bin/sh -e
-## 19_install_mlis.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-diff -urNad /home/zack/dati/debian/packages/ulex/ulex-0.4/Makefile ulex-0.4/Makefile
---- /home/zack/dati/debian/packages/ulex/ulex-0.4/Makefile 2004-01-15 20:20:55.000000000 +0100
-+++ ulex-0.4/Makefile 2004-01-15 20:21:04.000000000 +0100
-@@ -5,7 +5,7 @@
-
-
- install: all
-- ocamlfind install ulex META $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa)
-+ ocamlfind install ulex META $(wildcard *.cmi) $(wildcard *.a) $(wildcard *.cma) $(wildcard *.cmxa) ulexing.mli
-
- uninstall:
- ocamlfind remove ulex
Added: trunk/packages/ulex/trunk/debian/patches/23_meta_version.dpatch
===================================================================
--- trunk/packages/ulex/trunk/debian/patches/23_meta_version.dpatch 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/patches/23_meta_version.dpatch 2005-11-13 00:34:27 UTC (rev 2021)
@@ -0,0 +1,16 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 23_meta_version.dpatch by Stefano Zacchiroli <zack at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad trunk~/META trunk/META
+--- trunk~/META 2005-10-30 07:59:49.000000000 +0000
++++ trunk/META 2005-11-13 00:32:27.000000000 +0000
+@@ -1,4 +1,4 @@
+-version = "0.7"
++version = "0.8"
+ requires = "camlp4"
+ description = "Runtime support for ulex"
+ archive(byte) = "ulexing.cma"
Property changes on: trunk/packages/ulex/trunk/debian/patches/23_meta_version.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/packages/ulex/trunk/debian/rules
===================================================================
--- trunk/packages/ulex/trunk/debian/rules 2005-11-13 00:17:42 UTC (rev 2020)
+++ trunk/packages/ulex/trunk/debian/rules 2005-11-13 00:34:27 UTC (rev 2021)
@@ -2,6 +2,22 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/dpatch.mk
-DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/ocaml-ulex$(shell ocamlc -where)
-common-build-arch::
- if [ -x /usr/bin/ocamlopt ]; then $(MAKE) all.opt; else true; fi
+
+PKGNAME = ocaml-ulex
+
+OCAMLABI := $(shell ocamlc -version)
+OCAMLLIBDIR := $(shell ocamlc -where)
+OFILES := $(patsubst %.in,%,$(shell ls debian/*.in))
+HAVE_OCAMLOPT := $(shell test -x /usr/bin/ocamlopt && echo "yes")
+DEB_DH_GENCONTROL_ARGS = -- -VF:OCamlABI="$(OCAMLABI)"
+DEB_MAKE_INSTALL_TARGET = install DESTDIR=$(CURDIR)/debian/$(PKGNAME)$(OCAMLLIBDIR)
+
+ocamlinit:
+ for f in $(OFILES); do sed -e 's/@OCamlABI@/$(OCAMLABI)/' $$f.in > $$f; done
+ifeq ($(HAVE_OCAMLOPT),yes)
+build/$(PKGNAME)::
+ $(MAKE) all.opt
+endif
+
+# work around cdbs' bug
+unpatch: deapply-dpatches
More information about the Pkg-ocaml-maint-commits
mailing list