[Pkg-octave-commit] [SCM] Debian packaging for octave branch, master, updated. 3.2.2-2-41-gd5e1500

Thomas Weber tweber at debian.org
Sat Aug 20 16:24:37 UTC 2011


The following commit has been merged in the master branch:
commit 5fefc6e45d08d356b69e6cd6d347f1a80046d79a
Author: Thomas Weber <tweber at debian.org>
Date:   Wed Aug 17 19:46:05 2011 +0200

    Drop outdated curl header (fix for 637787)

diff --git a/debian/changelog b/debian/changelog
index b8d9074..d194b21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+octave3.2 (3.2.4-11) UNRELEASED; urgency=low
+
+  * New patch: drop_old_curl_header: curl no longer ships types.h (closes:
+    #637787) 
+
+ -- Thomas Weber <tweber at debian.org>  Wed, 17 Aug 2011 19:40:07 +0200
+
 octave3.2 (3.2.4-10) unstable; urgency=low
 
   * New patches
diff --git a/debian/in/series b/debian/in/series
index cc80239..0f54d3d 100644
--- a/debian/in/series
+++ b/debian/in/series
@@ -9,6 +9,7 @@ termios-h-check-3.0.diff
 no-argout-intersect.diff
 datenum-vector-input-any-orientation.diff
 :][V_3_2:
+drop_old_curl_header
 scale_image_point_color
 fix-interp2
 50_octave-bug-tempfile.diff
diff --git a/debian/patches/drop_old_curl_header b/debian/patches/drop_old_curl_header
new file mode 100644
index 0000000..9877247
--- /dev/null
+++ b/debian/patches/drop_old_curl_header
@@ -0,0 +1,10 @@
+--- a/src/DLD-FUNCTIONS/urlwrite.cc
++++ b/src/DLD-FUNCTIONS/urlwrite.cc
+@@ -46,7 +46,6 @@
+ #if defined (HAVE_CURL)
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ // Write callback function for curl.

-- 
Debian packaging for octave



More information about the Pkg-octave-commit mailing list