[Pkg-ocaml-maint-commits] [spamoracle] 06/10: Switch to dh and 3.0 (quilt)

Wed Jul 26 06:18:31 UTC 2017

This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository spamoracle.

commit 18ca29abb76a21ce9041ed798923eac312bd7b2c
Author: Stephane Glondu <steph at glondu.net>
Date:   Wed Jul 26 07:55:01 2017 +0200

    Switch to dh and 3.0 (quilt)
---
 debian/control                                     |  2 +-
 ...nfigure-scripts-and-other-build-stuff-ad.patch} | 35 +++++--------
 ...racters-which-are-not-allowed-in-manpages.patch | 21 ++++++++
 debian/patches/00list                              |  2 -
 debian/patches/manpage.dpatch                      | 19 --------
 debian/patches/series                              |  2 +
 debian/rules                                       | 57 +++-------------------
 debian/source/format                               |  1 +
 debian/source/local-options                        |  2 +
 9 files changed, 46 insertions(+), 95 deletions(-)

diff --git a/debian/control b/debian/control
index 990622f..4b28f88 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint at lists.debian.org>
 Uploaders: Samuel Mimram <smimram at debian.org>, Stefano Zacchiroli <zack at debian.org>
-Build-Depends: debhelper (>= 10), dh-ocaml, ocaml-nox (>= 3.11), dpatch
+Build-Depends: debhelper (>= 10), dh-ocaml, ocaml-nox (>= 3.11)
 Standards-Version: 3.9.1
 Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/spamoracle.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/spamoracle.git
diff --git a/debian/patches/build.dpatch b/debian/patches/0001-Makefiles-configure-scripts-and-other-build-stuff-ad.patch
old mode 100755
new mode 100644
similarity index 62%
rename from debian/patches/build.dpatch
rename to debian/patches/0001-Makefiles-configure-scripts-and-other-build-stuff-ad.patch
index 3892db2..6bca8b3
--- a/debian/patches/build.dpatch
+++ b/debian/patches/0001-Makefiles-configure-scripts-and-other-build-stuff-ad.patch
@@ -1,26 +1,17 @@
-#! /bin/sh -e 
-## build.dpatch by <luther at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Makefiles, configure scripts and other build stuff adapted for
-## DP: debian package creation
+From: Sven Luther <luther at debian.org>
+Date: Wed, 26 Jul 2017 07:56:24 +0200
+Subject: Makefiles,
+ configure scripts and other build stuff adapted for debian package
+ creation
 
-if [ $# -ne 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-case "$1" in
-    -patch) patch -f --no-backup-if-mismatch -p1 < $0;;
-    -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
+---
+ Makefile | 17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
 
-exit 0
- at DPATCH@
---- spamoracle-1.4.orig/Makefile
-+++ spamoracle-1.4/Makefile
+diff --git a/Makefile b/Makefile
+index 294bd17..6102f2a 100644
+--- a/Makefile
++++ b/Makefile
 @@ -1,16 +1,16 @@
  ### Configuration section
  
@@ -41,7 +32,7 @@ exit 0
  
  ### End of configuration section
  
-@@ -30,9 +30,14 @@
+@@ -30,9 +30,14 @@ NATLIBS=$(BYTELIBS:.cma=.cmxa)
  all: spamoracle
  
  install:
diff --git a/debian/patches/0002-Remove-characters-which-are-not-allowed-in-manpages.patch b/debian/patches/0002-Remove-characters-which-are-not-allowed-in-manpages.patch
new file mode 100644
index 0000000..b1cddc9
--- /dev/null
+++ b/debian/patches/0002-Remove-characters-which-are-not-allowed-in-manpages.patch
@@ -0,0 +1,21 @@
+From: Samuel Mimram <smimram at debian.org>
+Date: Wed, 26 Jul 2017 07:58:00 +0200
+Subject: Remove characters which are not allowed in manpages
+
+---
+ spamoracle.1 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/spamoracle.1 b/spamoracle.1
+index dad3328..36f4708 100644
+--- a/spamoracle.1
++++ b/spamoracle.1
+@@ -604,7 +604,7 @@ For instance, the following text:
+ .ft 3
+ .nf
+ .sp
+-SUMMER in English is written "�t�" in French ���
++SUMMER in English is written "ete" in French
+ .ft
+ .LP
+ .RE
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 83a9eb1..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,2 +0,0 @@
-build
-manpage
diff --git a/debian/patches/manpage.dpatch b/debian/patches/manpage.dpatch
deleted file mode 100755
index f682f16..0000000
--- a/debian/patches/manpage.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage.dpatch by Samuel Mimram <smimram at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove '�' characters which are not allowed in manpages.
-
- at DPATCH@
-diff -urNad spamoracle-1.4~/spamoracle.1 spamoracle-1.4/spamoracle.1
---- spamoracle-1.4~/spamoracle.1	2003-10-03 13:02:22.000000000 +0200
-+++ spamoracle-1.4/spamoracle.1	2006-01-03 22:44:41.000000000 +0100
-@@ -604,7 +604,7 @@
- .ft 3
- .nf
- .sp
--SUMMER in English is written "�t�" in French ���
-+SUMMER in English is written "ete" in French
- .ft
- .LP
- .RE
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9af7acc
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-Makefiles-configure-scripts-and-other-build-stuff-ad.patch
+0002-Remove-characters-which-are-not-allowed-in-manpages.patch
diff --git a/debian/rules b/debian/rules
index 3c5fcec..5785726 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 include /usr/share/ocaml/ocamlvars.mk
-include /usr/share/dpatch/dpatch.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -15,65 +14,21 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
 
-ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
-OCAML_INTERPRETER=
-else
-OCAML_INTERPRETER=ocaml-base-nox-$(OCAML_ABI)
-endif
-
-configure: 
+%:
+	dh $@ --with ocaml
 
-build: build-stamp
-build-stamp: patch-stamp
-	dh_testdir
+.PHONY: override_dh_auto_build
+override_dh_auto_build:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	$(MAKE) spamoracle
 else
 	$(MAKE) spamoracle.byte
 endif
-	touch build-stamp
 
-clean: unpatch
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	$(MAKE) clean
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
 ifeq ($(OCAML_HAVE_OCAMLOPT),yes)
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/spamoracle
 else
 	$(MAKE) install.byte DESTDIR=$(CURDIR)/debian/spamoracle
 endif
-
-binary-indep: 
-
-binary-arch: build install
-	dh_testdir -s
-	dh_testroot -s
-	dh_installdocs -s
-	dh_installexamples -s
-	dh_installmenu -s
-	dh_installcron -s
-	dh_installman -s
-	dh_installinfo -s
-	dh_installchangelogs -s
-	dh_link -s
-	dh_strip -s -X spamoracle.byte
-	dh_compress -s
-	dh_fixperms -s
-	dh_installdeb -s
-	dh_shlibdeps -s
-	dh_gencontrol -s -- \
-	  -VF:OCamlABI="$(OCAML_ABI)" \
-	  -VF:OCamlInterpreter="$(OCAML_INTERPRETER)"
-	dh_md5sums -s
-	dh_builddeb -s
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
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/local-options b/debian/source/local-options
new file mode 100644
index 0000000..c4cf480
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1,2 @@
+abort-on-upstream-changes
+unapply-patches

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/spamoracle.git

