[Pkg-ocaml-maint-commits] [dose3] 01/01: Drop patch ocaml-4.02.3+gcc-6.2.0

[Ralf Treinen]

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

treinen pushed a commit to branch jessie-backports/master
in repository dose3.

commit a815a89e0410df580bf36173a3826b5ddb1d97ce
Author: Ralf Treinen <treinen at irif.fr>
Date:   Sat Jan 21 11:27:12 2017 +0100

    Drop patch ocaml-4.02.3+gcc-6.2.0
    
    That patch is for stretch, and does not apply to the version of ocaml in jessie
---
 debian/changelog                      |  3 +--
 debian/patches/ocaml-4.02.3+gcc-6.2.0 | 47 -----------------------------------
 debian/patches/series                 |  1 -
 3 files changed, 1 insertion(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40e6b85..6da0a96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,8 @@ dose3 (5.0.1-8~bpo8+1) jessie-backports; urgency=medium
   * Refreshed patches:
     - 0001-check_request_using-can-return-discording-result-bet.patch
     - deb-drop-b-d-arch
-    - ocaml-4.02.3+gcc-6.2.0
 
- -- Ralf Treinen <treinen at debian.org>  Fri, 20 Jan 2017 13:20:20 +0100
+ -- Ralf Treinen <treinen at debian.org>  Sat, 21 Jan 2017 11:26:19 +0100
 
 dose3 (5.0.1-8) unstable; urgency=medium
 
diff --git a/debian/patches/ocaml-4.02.3+gcc-6.2.0 b/debian/patches/ocaml-4.02.3+gcc-6.2.0
deleted file mode 100644
index 9c3f51c..0000000
--- a/debian/patches/ocaml-4.02.3+gcc-6.2.0
+++ /dev/null
@@ -1,47 +0,0 @@
-Author: Johannes Schauer <josch at debian.org>
-Description: fix FTBFS with ocaml 4.02.3-7 and gcc 6.2.0-7
-
-Index: dose3/Makefile
-===================================================================
---- dose3.orig/Makefile	2017-01-20 13:18:31.547361450 +0100
-+++ dose3/Makefile	2017-01-20 13:18:31.543361408 +0100
-@@ -8,8 +8,8 @@
- DIST_TARBALL = $(DIST_DIR).tar.gz
- 
- #VERBOSE := -classic-display
--OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY
--APPFLAGS := $(VERBOSE) -j 10
-+OBFLAGS := $(VERBOSE) -j 10 -no-links -cflags -warn-error,FPSXY $(PICOPTS)
-+APPFLAGS := $(VERBOSE) -j 10 $(PICOPTS)
- #OBFLAGS := $(OBFLAGS) -tag debug
- #OBFLAGS := $(OBFLAGS) -tag profile
- #OBFLAGS := $(OBFLAGS) -classic-display
-@@ -274,7 +274,7 @@
- 	@git log --pretty=format:'%aN        %aE' | LC_ALL=C sort -u | awk -F'\t' '{printf("\t%s <%s>\n",$$1,$$2)}';
- 
- doc: all
--	$(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT)
-+	$(OCAMLBUILD) -package unix scripts/pack.$(OCAMLEXT) $(PICOPTS)
- 	scripts/doc.sh $(OCAMLEXT)
- 	dot -Grotate=0 -Tsvg -o dose3.docdir/index.svg dose3.docdir/index.dot
- 	(cd doc && $(MAKE) all)
-Index: dose3/Makefile.config.in
-===================================================================
---- dose3.orig/Makefile.config.in	2017-01-20 13:18:31.547361450 +0100
-+++ dose3/Makefile.config.in	2017-01-20 13:18:31.543361408 +0100
-@@ -63,6 +63,7 @@
- 
- ifeq ("@OCAMLEXT@","native")
-   OCAMLBUILD=@OCAMLBUILD@
-+  PICOPTS=-lflags -runtime-variant,_pic
-   ifeq ("@OCAML_SYSTEM@","mingw")
-     INSTALLOPTS=-s --strip-program=i686-w64-mingw32-strip
-   else
-@@ -78,6 +79,7 @@
-   endif
- else
-   OCAMLBUILD=@OCAMLBUILD@ -byte-plugin
-+  PICOPTS=
-   INSTALLOPTS=
- endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index de3f5e5..91044b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ binaries-prefix-edos
 0007-applications-deb-buildcheck.ml-fix-regression-that-l.patch
 0008-Catch-expection-in-diagnostic.ml.patch
 input-xz-files
-ocaml-4.02.3+gcc-6.2.0
 architecture-tuples
 architectures-dpkg-1.18.15
 deb-drop-b-d-arch

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