[Pkg-ocaml-maint-commits] [jocaml] 01/02: Fix call to quilt so that all patches are applied

Mehdi Dogguy mehdi at moszumanska.debian.org
Thu May 8 23:39:08 UTC 2014


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

mehdi pushed a commit to branch master
in repository jocaml.

commit 45a3beea49151f671930f8b55ef97a1f80de212d
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Fri May 9 01:20:00 2014 +0200

    Fix call to quilt so that all patches are applied
---
 debian/changelog | 6 ++++++
 debian/rules     | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c057fc8..ded7efc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jocaml (4.01.0-2) UNRELEASED; urgency=medium
+
+  * Fix quilt call so that all patches are applied.
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Fri, 09 May 2014 01:21:53 +0200
+
 jocaml (4.01.0-1) unstable; urgency=medium
 
   * New upstream release (Closes: #731399).
diff --git a/debian/rules b/debian/rules
index 4b6ab9b..c1f371b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,7 @@ OCAMLC := $(if $(wildcard /usr/bin/ocamlc.opt),/usr/bin/ocamlc.opt,/usr/bin/ocam
 override_dh_auto_configure:
 	OCAMLINIT_SED=$(OCAMLINIT_OPTS) dh_ocamlinit
 	tar xf /usr/src/ocaml-source-$(OCAML_ABI).tar ocaml-$(OCAML_ABI)/debian-patches
+	QUILT_PATCHES=debian/patches quilt push -a
 	for patch in `ls -1 ocaml-$(OCAML_ABI)/debian-patches/*.patch`; do	\
 		case $$patch in							\
 			*Put-manpages-in-section-3o-instead-of-3*|*Add-const-qualifiers-in-Tcl-Tk-bindings*) \
@@ -25,7 +26,7 @@ override_dh_auto_configure:
 				quilt import -f -d n $$patch;;			\
 		esac								\
 	done
-	dh_quilt_patch
+	quilt push -a
 	for ext in sub guess; do \
 		if [ -f /usr/share/misc/config.$$ext ]; then \
 			cp -f /usr/share/misc/config.$$ext $(CURDIR)/config/gnu/config.$$ext; \

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



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