[Pkg-ocaml-maint-commits] [jocaml] 01/02: Import OCaml's patches in reverse order to apply them in the correct order (Closes: #749863).

Mehdi Dogguy mehdi at moszumanska.debian.org
Sun Jun 1 14:46:44 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 74ac21647eb2b580bc4cdacc4ca563832bcdf97a
Author: Mehdi Dogguy <mehdi at debian.org>
Date:   Sun Jun 1 16:37:58 2014 +0200

    Import OCaml's patches in reverse order to apply them in the correct order (Closes: #749863).
---
 debian/changelog | 7 +++++++
 debian/rules     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 0950839..ba2c286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jocaml (4.01.0-3) UNRELEASED; urgency=low
+
+  * Import OCaml's patches in reverse order to apply them in the correct
+    order (Closes: #749863).
+
+ -- Mehdi Dogguy <mehdi at debian.org>  Sun, 01 Jun 2014 16:36:46 +0200
+
 jocaml (4.01.0-2) unstable; urgency=medium
 
   * Fix quilt call so that all patches are applied.
diff --git a/debian/rules b/debian/rules
index c1f371b..21743c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ 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	\
+	for patch in `ls -1 ocaml-$(OCAML_ABI)/debian-patches/*.patch | sort -r`; do	\
 		case $$patch in							\
 			*Put-manpages-in-section-3o-instead-of-3*|*Add-const-qualifiers-in-Tcl-Tk-bindings*) \
 				echo "Skipping $$patch";;			\

-- 
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