[Pkg-ocaml-maint-commits] [approx] 05/08: incorporate patch into upstream version

[Eric Cooper]

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

ecc-guest pushed a commit to branch master
in repository approx.

commit 08f60e206074f034525d5fea8ab99f6e9684227a
Author: Eric Cooper <ecc at cmu.edu>
Date:   Sat Jun 21 17:27:47 2014 -0400

    incorporate patch into upstream version
---
 ...od-of-passing-options-to-curl-to-avoid-FH.patch | 29 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 30 deletions(-)

diff --git a/debian/patches/0001-change-method-of-passing-options-to-curl-to-avoid-FH.patch b/debian/patches/0001-change-method-of-passing-options-to-curl-to-avoid-FH.patch
deleted file mode 100644
index f188543..0000000
--- a/debian/patches/0001-change-method-of-passing-options-to-curl-to-avoid-FH.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From b0561a0317912d38653c0b8407890ddcb86009e3 Mon Sep 17 00:00:00 2001
-From: Eric Cooper <ecc at cmu.edu>
-Date: Thu, 12 Dec 2013 14:06:02 -0500
-Subject: [PATCH 1/2] change method of passing options to curl to avoid FHS
- violation (closes: #732021)
-
-Signed-off-by: Eric Cooper <ecc at cmu.edu>
----
- doc/FAQ | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/FAQ b/doc/FAQ
-index bcd0c51..142cbe8 100644
---- a/doc/FAQ
-+++ b/doc/FAQ
-@@ -81,8 +81,8 @@ Passing environment variables to approx
- 
- Passing options to the curl(1) command used by approx
- 
--  You can specify options in a .curlrc file in the approx user's home directory
--  (/var/cache/approx/ by default).
-+  Use the above method to pass the CURL_HOME environment variable to approx,
-+  and use the file $CURL_HOME/.curlrc to specify the desired curl options.
- 
-   For example, adding the line "--ipv4" to this file will force curl to
-   resolve hostnames to IPv4 addresses only.
--- 
-1.8.5.1
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ed7a572..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-change-method-of-passing-options-to-curl-to-avoid-FH.patch

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