[Pkg-ocaml-maint-commits] [SCM] hlins packaging branch, master, updated. debian/0.39-16-17-g8cb6022
Ralf Treinen
treinen at free.fr
Mon Feb 14 20:26:37 UTC 2011
The following commit has been merged in the master branch:
commit 86159ed0cd543194cc00670563decef1f04cfb4e
Author: Ralf Treinen <treinen at free.fr>
Date: Mon Feb 8 20:06:49 2010 +0100
convert to source format 3.0
diff --git a/debian/changelog b/debian/changelog
index 7440044..66f9432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+hlins (0.39-16) unstable; urgency=low
+
+ * Switch to source format 3.0 (quilt):
+ - patches quilt style
+ - no more build-dependency on dpatch
+ - no more patching in debian/rules
+ - add file debian/source
+
+ -- Ralf Treinen <treinen at debian.org> Mon, 08 Feb 2010 20:06:31 +0100
+
hlins (0.39-15) unstable; urgency=low
[ Stephane Glondu ]
diff --git a/debian/control b/debian/control
index dbf92b3..514fd9a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders:
Stefano Zacchiroli <zack at debian.org>
Standards-Version: 3.8.2
Build-Depends-Indep: ocaml-nox (>= 3.07)
-Build-Depends: debhelper (>= 7.0), dpatch, cdbs, dh-ocaml
+Build-Depends: debhelper (>= 7.0), cdbs, dh-ocaml
Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/hlins.git
Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/hlins.git
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index d09216d..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-01_nocustom
-02_examples_makefile
diff --git a/debian/patches/01_nocustom.dpatch b/debian/patches/01_nocustom.dpatch
deleted file mode 100755
index 03164be..0000000
--- a/debian/patches/01_nocustom.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh -e
-## 01_nocustom.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch upstream Makefile.in in order to surpress the -custom
-## DP: option when compiling to byteode.
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
---- hlins-0.39.orig/source/Makefile.in
-+++ hlins-0.39/source/Makefile.in
-@@ -39,7 +39,7 @@
-
- # byte code compilation
- hlins.bc: $(MODULES:.cmx=.cmo)
-- $(CAMLC) -custom -o hlins.bc str.cma unix.cma $(MODULES:.cmx=.cmo)\
-+ $(CAMLC) -o hlins.bc str.cma unix.cma $(MODULES:.cmx=.cmo)\
- -cclib -lstr
-
- .mli.cmi:
diff --git a/debian/patches/02_examples_makefile.dpatch b/debian/patches/02_examples_makefile.dpatch
deleted file mode 100755
index 3902404..0000000
--- a/debian/patches/02_examples_makefile.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh -e
-## 01_nocustom.dpatch by Ralf Treinen <treinen at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix Makefile in doc/examples/test-example (use installed hlins
-## DP: instead of the one in a build-directory)
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -E -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
- at DPATCH@
---- hlins-0.39.orig/doc/examples/test-examples/Makefile
-+++ hlins-0.39/doc/examples/test-examples/Makefile
-@@ -1,11 +1,11 @@
--HLINS=../../../source/hlins
-+HLINS=hlins
-
- all: test1.out test2.out
-
--test1.out: $(HLINS) directors.db test1.in
-+test1.out: directors.db test1.in
- $(HLINS) -db directors.db -o test1.out test1.in
-
--test2.out: $(HLINS) test2.db test2.in
-+test2.out: test2.db test2.in
- $(HLINS) -db test2.db -o test2.out test2.in
-
- clean:
diff --git a/debian/patches/examples_makefile b/debian/patches/examples_makefile
new file mode 100755
index 0000000..89706a3
--- /dev/null
+++ b/debian/patches/examples_makefile
@@ -0,0 +1,21 @@
+Author: Ralf Treinen <treinen at debian.org>
+Desription: fix Makefile in doc/examples/test-example (use installed hlins
+ instead of the one in a build-directory)
+
+--- hlins-0.39.orig/doc/examples/test-examples/Makefile
++++ hlins-0.39/doc/examples/test-examples/Makefile
+@@ -1,11 +1,11 @@
+-HLINS=../../../source/hlins
++HLINS=hlins
+
+ all: test1.out test2.out
+
+-test1.out: $(HLINS) directors.db test1.in
++test1.out: directors.db test1.in
+ $(HLINS) -db directors.db -o test1.out test1.in
+
+-test2.out: $(HLINS) test2.db test2.in
++test2.out: test2.db test2.in
+ $(HLINS) -db test2.db -o test2.out test2.in
+
+ clean:
diff --git a/debian/patches/nocustom b/debian/patches/nocustom
new file mode 100755
index 0000000..679978e
--- /dev/null
+++ b/debian/patches/nocustom
@@ -0,0 +1,15 @@
+Author: Ralf Treinen <treinen at debian.org>
+Description: Patch upstream Makefile.in in order to surpress the -custom
+ option when compiling to byteode.
+
+--- hlins-0.39.orig/source/Makefile.in
++++ hlins-0.39/source/Makefile.in
+@@ -39,7 +39,7 @@
+
+ # byte code compilation
+ hlins.bc: $(MODULES:.cmx=.cmo)
+- $(CAMLC) -custom -o hlins.bc str.cma unix.cma $(MODULES:.cmx=.cmo)\
++ $(CAMLC) -o hlins.bc str.cma unix.cma $(MODULES:.cmx=.cmo)\
+ -cclib -lstr
+
+ .mli.cmi:
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f639ba9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+nocustom
+examples_makefile
diff --git a/debian/rules b/debian/rules
index 7da536b..fe32acc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,6 @@ common-configure::
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/rules/ocaml.mk
DEB_SRCDIR = source
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)
diff --git a/debian/source/format~ b/debian/source/format~
new file mode 100644
index 0000000..87baf5e
--- /dev/null
+++ b/debian/source/format~
@@ -0,0 +1 @@
+i3.0 (quilt)
--
hlins packaging
More information about the Pkg-ocaml-maint-commits
mailing list