[Pkg-ocaml-maint-commits] [SCM] ulex packaging branch, master, updated. debian/1.1-1-7-gb38801f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 21e5b6b833a67944cf8df828c25247c801d304a6
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Apr 20 14:55:41 2010 +0200

    Switch source package to format 3.0 (quilt)

diff --git a/debian/control b/debian/control
index bf7159d..d4e3525 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends:
  camlp4-extra,
  ocaml-findlib (>= 1.2.4),
  dh-ocaml (>= 0.9),
- dpatch,
  cdbs
 Standards-Version: 3.8.4
 Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ulex.git
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..6c7ed3b
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+pristine-tar = True
+cleaner = debuild clean && dh_quilt_unpatch && dh_clean
diff --git a/debian/patches/0001-Enable-installing-to-a-target-directory-passed-from-.patch b/debian/patches/0001-Enable-installing-to-a-target-directory-passed-from-.patch
new file mode 100644
index 0000000..9e6e163
--- /dev/null
+++ b/debian/patches/0001-Enable-installing-to-a-target-directory-passed-from-.patch
@@ -0,0 +1,26 @@
+From: Stefano Zacchiroli <zack at debian.org>
+Date: Tue, 20 Apr 2010 14:54:09 +0200
+Subject: [PATCH] Enable installing to a target directory passed from debian/rules
+
+Signed-off-by: Stefano Zacchiroli <zack at debian.org>
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ Makefile |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c398c15..4f05503 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,8 +14,9 @@ MODS=ulexing utf16 utf8
+ install: all
+ 	cd _build && $(MAKE) -f ../Makefile realinstall
+ 
++DESTDIR =
+ realinstall:
+-	ocamlfind install ulex ../META $(wildcard $(MODS:=.mli) $(MODS:=.cmi) $(MODS:=.cmx) pa_ulex.cma ulexing.a ulexing.cma ulexing.cmxa)
++	ocamlfind install -destdir $(DESTDIR) ulex ../META $(wildcard $(MODS:=.mli) $(MODS:=.cmi) $(MODS:=.cmx) pa_ulex.cma ulexing.a ulexing.cma ulexing.cmxa)
+ 
+ uninstall:
+ 	ocamlfind remove ulex
+-- 
diff --git a/debian/patches/00dpatch.conf b/debian/patches/00dpatch.conf
deleted file mode 100644
index c2409be..0000000
--- a/debian/patches/00dpatch.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-conf_debianonly=1
-conf_origtargzpath=../upstream
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 806a429..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-install_destdir.dpatch
diff --git a/debian/patches/install_destdir.dpatch b/debian/patches/install_destdir.dpatch
deleted file mode 100755
index 87a562f..0000000
--- a/debian/patches/install_destdir.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## install_destdir.dpatch by Stefano Zacchiroli <zack at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: enable installing to a target directory passed from debian/rules
-
- at DPATCH@
-diff -urNad trunk~/Makefile trunk/Makefile
---- trunk~/Makefile	2007-05-30 09:14:56.000000000 +0200
-+++ trunk/Makefile	2007-07-14 11:52:29.000000000 +0200
-@@ -14,8 +14,9 @@
- install: all
- 	cd _build && $(MAKE) -f ../Makefile realinstall
- 
-+DESTDIR =
- realinstall:
--	ocamlfind install ulex ../META $(wildcard $(MODS:=.mli) $(MODS:=.cmi) $(MODS:=.cmx) pa_ulex.cma ulexing.a ulexing.cma ulexing.cmxa)
-+	ocamlfind install -destdir $(DESTDIR) ulex ../META $(wildcard $(MODS:=.mli) $(MODS:=.cmi) $(MODS:=.cmx) pa_ulex.cma ulexing.a ulexing.cma ulexing.cmxa)
- 
- uninstall:
- 	ocamlfind remove ulex
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..32678e8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Enable-installing-to-a-target-directory-passed-from-.patch
diff --git a/debian/rules b/debian/rules
index c0a386b..4efaf5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/dpatch.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/rules/ocaml.mk
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)

-- 
ulex packaging