diff -Nru bennugd-module-curl-1.0.3/debian/bennugd-module-curl.dirs bennugd-module-curl-1.1/debian/bennugd-module-curl.dirs --- bennugd-module-curl-1.0.3/debian/bennugd-module-curl.dirs 2012-01-05 16:09:33.000000000 +0000 +++ bennugd-module-curl-1.1/debian/bennugd-module-curl.dirs 2012-01-27 10:14:31.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/bennugd +usr/lib/i386-linux-gnu/bennugd usr/share/doc/bennugd-module-curl diff -Nru bennugd-module-curl-1.0.3/debian/bennugd-module-curl.install bennugd-module-curl-1.1/debian/bennugd-module-curl.install --- bennugd-module-curl-1.0.3/debian/bennugd-module-curl.install 2012-01-05 16:09:48.000000000 +0000 +++ bennugd-module-curl-1.1/debian/bennugd-module-curl.install 2012-01-27 10:14:41.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/bennugd/*.so +usr/lib/i386-linux-gnu/bennugd/*.so usr/share/doc/bennugd-module-curl/*.prg.gz diff -Nru bennugd-module-curl-1.0.3/debian/bennugd-module-curl.links bennugd-module-curl-1.1/debian/bennugd-module-curl.links --- bennugd-module-curl-1.0.3/debian/bennugd-module-curl.links 2012-01-05 16:10:11.000000000 +0000 +++ bennugd-module-curl-1.1/debian/bennugd-module-curl.links 2012-01-27 10:14:56.000000000 +0000 @@ -1 +1 @@ -usr/lib/bennugd/mod_curl.so usr/lib/bennugd/libmod_curl.so +usr/lib/i386-linux-gnu/bennugd/mod_curl.so usr/lib/i386-linux-gnu/bennugd/libmod_curl.so diff -Nru bennugd-module-curl-1.0.3/debian/changelog bennugd-module-curl-1.1/debian/changelog --- bennugd-module-curl-1.0.3/debian/changelog 2012-01-07 04:43:56.000000000 +0000 +++ bennugd-module-curl-1.1/debian/changelog 2012-01-27 10:15:20.000000000 +0000 @@ -1,3 +1,10 @@ +bennugd-module-curl (1.1) oneiric; urgency=low + + * Updated to the latest version of the code. + * Changes for multiarch support + + -- Joseba García Etxebarria Fri, 27 Jan 2012 09:57:07 +0100 + bennugd-module-curl (1.0.3) oneiric; urgency=low * You don't really need the developer packages for running the lib. Ups! diff -Nru bennugd-module-curl-1.0.3/debian/control bennugd-module-curl-1.1/debian/control --- bennugd-module-curl-1.0.3/debian/control 2012-01-07 04:42:49.000000000 +0000 +++ bennugd-module-curl-1.1/debian/control 2012-01-27 10:13:29.000000000 +0000 @@ -2,7 +2,7 @@ Priority: optional Maintainer: Joseba García Etxebarria Build-Depends: debhelper (>= 7), bennugd-core-dev, bennugd-modules-dev, libcurl4-gnutls-dev, libsdl1.2-dev, pkg-config -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Section: libs Package: bennugd-module-curl diff -Nru bennugd-module-curl-1.0.3/debian/rules bennugd-module-curl-1.1/debian/rules --- bennugd-module-curl-1.0.3/debian/rules 2012-01-05 16:28:37.000000000 +0000 +++ bennugd-module-curl-1.1/debian/rules 2012-01-27 10:14:17.000000000 +0000 @@ -60,9 +60,9 @@ # Add here commands to install the package into debian/tmp mkdir -p debian/tmp/usr/share/doc/bennugd-module-curl - mkdir -p debian/tmp/usr/lib/bennugd + mkdir -p debian/tmp/usr/lib/i386-linux-gnu/bennugd cp mod_curl.prg.gz debian/tmp/usr/share/doc/bennugd-module-curl - cp mod_curl.so debian/tmp/usr/lib/bennugd + cp mod_curl.so debian/tmp/usr/lib/i386-linux-gnu/bennugd # Build architecture-independent files here. diff -Nru bennugd-module-curl-1.0.3/mod_curl.c bennugd-module-curl-1.1/mod_curl.c --- bennugd-module-curl-1.0.3/mod_curl.c 2012-01-05 16:07:27.000000000 +0000 +++ bennugd-module-curl-1.1/mod_curl.c 2012-01-27 08:55:56.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Joseba García Echebarria. All rights reserved. + * Copyright (c) 2012 Joseba García Echebarria. All rights reserved. * * This software is provided 'as-is', without any express or implied * warranty. In no event will the authors be held liable for any damages @@ -372,8 +372,10 @@ if(download_info[id].curl == NULL) return -1; + int retval = 0; + // Perform download, this function won't quit until it's done - curl_easy_perform(download_info[id].curl); + retval = curl_easy_perform(download_info[id].curl); // If downloading to a file, close its file descriptor if (download_info[id].outfd != NULL) { @@ -388,7 +390,7 @@ free(download_info[id].chunk.memory); } - return 0; + return retval; } // Map curl_easy_perform @@ -425,5 +427,6 @@ { "CURL_SETOPT" , "IIS" , TYPE_INT , bgd_curl_easy_setopt2 }, { "CURL_SETOPT" , "IIP" , TYPE_INT , bgd_curl_easy_setopt3 }, { "CURL_PERFORM" , "IP" , TYPE_INT , bgd_curl_easy_perform }, +// { "CURL_FETCH" , "I" , TYPE_STRING , bgd_curl_fetch }, { 0 , 0 , 0 , 0 } };