[Pkg-ocaml-maint-commits] [SCM] ocaml-reins packaging branch, master, updated. debian/0.1a-1-5-gb22e562

Stephane Glondu steph at glondu.net
Sat Jul 4 13:02:58 UTC 2009 

The following commit has been merged in the master branch:
commit b22e5621ff359174a7ba3ce4877191d19f97efc0
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Jul 4 14:50:12 2009 +0200

    Switch patches to quilt, add README.source

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a26fede
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,16 @@
+ocaml-reins Debian source package
+=================================
+
+Patching upstream sources
+-------------------------
+
+This source package uses quilt to apply and remove its patches. Please
+refer to `/usr/share/doc/quilt/README.source' for information about
+how to use quilt for source packages.
+
+The quilt series is generated from the Git repository, using
+dom-{apply,save}-patches, from the dh-ocaml (>= 0.4.2) package. Please
+refer to the appendix about Git in the Debian OCaml Packaging Policy
+(from the same package).
+
+ -- Stephane Glondu <steph at glondu.net>, Sat, 04 Jul 2009 15:00:10 +0200
diff --git a/debian/control b/debian/control
index c757782..1ff3a1c 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,13 @@ Source: ocaml-reins
 Section: libdevel
 Priority: optional
 Maintainer: Mike Furr <mfurr at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, ocaml-nox (>= 3.10.0), omake, libounit-ocaml-dev, ocaml-findlib
+Build-Depends:
+ debhelper (>= 5),
+ quilt,
+ ocaml-nox (>= 3.10.0),
+ omake,
+ libounit-ocaml-dev,
+ ocaml-findlib
 Standards-Version: 3.7.2
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocaml-reins.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocaml-reins.git
diff --git a/debian/patches/0001-Fix-PREFIX-handling.patch b/debian/patches/0001-Fix-PREFIX-handling.patch
new file mode 100644
index 0000000..c55fa27
--- /dev/null
+++ b/debian/patches/0001-Fix-PREFIX-handling.patch
@@ -0,0 +1,27 @@
+From: Mike Furr <mfurr at debian.org>
+Date: Sat, 4 Jul 2009 14:48:29 +0200
+Subject: [PATCH] Fix PREFIX handling
+
+---
+ config.omake |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/config.omake b/config.omake
+index 4417254..7a35fc2 100644
+--- a/config.omake
++++ b/config.omake
+@@ -7,7 +7,12 @@ static. =
+ 	  exit 1
+ 	OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE)
+ 	OCAMLDEP=$(OCAMLDEP_MODULES)
+-	PREFIX=$(shell ocamlc -where)
++	if $(not $(defined PREFIX))
++	  PREFIX=$(shell ocamlc -where)
++	  export
++	if $(defined-env OCAMLFIND_DESTDIR)
++	  PREFIX = $(getenv OCAMLFIND_DESTDIR)
++	  export
+ 	VERSION=0.1a
+ 	ConfMsgChecking(oUnit)
+ 	OUNIT_DIR=$(shell ocamlfind query oUnit)
+-- 
diff --git a/debian/patches/0002-Install-cmi.patch b/debian/patches/0002-Install-cmi.patch
new file mode 100644
index 0000000..7efb7f6
--- /dev/null
+++ b/debian/patches/0002-Install-cmi.patch
@@ -0,0 +1,20 @@
+From: Mike Furr <mfurr at debian.org>
+Date: Sat, 4 Jul 2009 14:48:41 +0200
+Subject: [PATCH] Install cmi
+
+---
+ src/OMakefile |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/OMakefile b/src/OMakefile
+index 983799d..e85608c 100644
+--- a/src/OMakefile
++++ b/src/OMakefile
+@@ -52,5 +52,5 @@ REINS_CMX=$(if $(NATIVE_ENABLED), reins.cmx)
+ 
+ install: META $(REINS_LIB)
+ 	mkdir -p $(PREFIX)/reins
+-	ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \
++	ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \
+ 	  $(filter-exists $(addsuffix .mli, $(FILES)))
+-- 
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 9e9dbfb..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-10_DESTDIR
-20_INSTALL_CMI
diff --git a/debian/patches/10_DESTDIR.dpatch b/debian/patches/10_DESTDIR.dpatch
deleted file mode 100755
index d40d667..0000000
--- a/debian/patches/10_DESTDIR.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 10_DESTDIR.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 ocaml-reins-0.1a~/config.omake ocaml-reins-0.1a/config.omake
---- ocaml-reins-0.1a~/config.omake	2007-10-02 18:09:15.312445370 -0400
-+++ ocaml-reins-0.1a/config.omake	2007-10-02 18:09:24.105535886 -0400
-@@ -7,7 +7,12 @@
- 	  exit 1
- 	OCAMLDEP_MODULES_ENABLED = $(OCAMLDEP_MODULES_AVAILABLE)
- 	OCAMLDEP=$(OCAMLDEP_MODULES)
--	PREFIX=$(shell ocamlc -where)
-+	if $(not $(defined PREFIX))
-+	  PREFIX=$(shell ocamlc -where)
-+	  export
-+	if $(defined-env OCAMLFIND_DESTDIR)
-+	  PREFIX = $(getenv OCAMLFIND_DESTDIR)
-+	  export
- 	VERSION=0.1a
- 	ConfMsgChecking(oUnit)
- 	OUNIT_DIR=$(shell ocamlfind query oUnit)
diff --git a/debian/patches/20_INSTALL_CMI.dpatch b/debian/patches/20_INSTALL_CMI.dpatch
deleted file mode 100755
index be64f03..0000000
--- a/debian/patches/20_INSTALL_CMI.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_INSTALL_CMI.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 ocaml-reins-0.1a~/src/OMakefile ocaml-reins-0.1a/src/OMakefile
---- ocaml-reins-0.1a~/src/OMakefile	2007-10-02 17:26:23.000000000 -0400
-+++ ocaml-reins-0.1a/src/OMakefile	2007-10-02 17:26:54.705359854 -0400
-@@ -52,5 +52,5 @@
- 
- install: META $(REINS_LIB)
- 	mkdir -p $(PREFIX)/reins
--	ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) \
-+	ocamlfind install reins META $(REINS_LIB) $(REINS_CMX) reins.cmi \
- 	  $(filter-exists $(addsuffix .mli, $(FILES)))
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..365f15a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Fix-PREFIX-handling.patch
+0002-Install-cmi.patch
diff --git a/debian/rules b/debian/rules
index fdbeb85..5ccacba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 #export DH_VERBOSE=1
 
 PACKAGE=ocaml-reins
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 OCAMLABI = $(shell ocamlc -version)
 OCAMLLIB = $(shell ocamlc -where)
 DEST = $(CURDIR)/debian/libreins-ocaml-dev/$(OCAMLLIB)

-- 
ocaml-reins packaging

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