[SCM] Image Reduction and Analysis Facility branch, debian, updated. 457b1e7b8f3328a95d279f9c122c33dd1e8ab65c

Ole Streicher debian at liska.ath.cx
Mon Jun 3 14:33:10 UTC 2013


The following commit has been merged in the debian branch:
commit d35274bddd1d1608e16bd8eb1233a0911d3365bc
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Jun 3 10:51:06 2013 +0200

    Remove unused third party code changes

diff --git a/debian/patches/voclient.patch b/debian/patches/voclient.patch
index 6abe098..50f7f4d 100644
--- a/debian/patches/voclient.patch
+++ b/debian/patches/voclient.patch
@@ -152,36 +152,6 @@
  	/bin/rm -f SWIG* libvot* php_libvot.h
  	/bin/rm -f sampJava.[co]
  	/bin/rm -f sampPerl.[co]
---- a/vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/lib/curl_transport/curlmulti.c
-+++ b/vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/lib/curl_transport/curlmulti.c
-@@ -17,7 +17,6 @@
- #endif
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #include <curl/multi.h>
- 
---- a/vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/lib/curl_transport/curltransaction.c
-+++ b/vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/lib/curl_transport/curltransaction.c
-@@ -15,7 +15,6 @@
- #include "version.h"
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- 
- #include "curlversion.h"
---- a/vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/lib/curl_transport/xmlrpc_curl_transport.c
-+++ b/vendor/voclient/libsamp/libxrpc/xmlrpc-c-1.16.29/lib/curl_transport/xmlrpc_curl_transport.c
-@@ -83,7 +83,6 @@
- #include "xmlrpc-c/time_int.h"
- 
- #include <curl/curl.h>
--#include <curl/types.h>
- #include <curl/easy.h>
- #include <curl/multi.h>
- 
 --- a/vendor/voclient/libvo/Makefile
 +++ b/vendor/voclient/libvo/Makefile
 @@ -70,11 +70,14 @@

-- 
Image Reduction and Analysis Facility



More information about the debian-science-commits mailing list