From 04204c95104c0343f084c3bef7095da439fb9049 Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Sat, 2 Jun 2012 19:18:01 +0200 Subject: [PATCH] Refresh all patches. --- debian/changelog | 1 + debian/patches/correct-linking | 2 +- debian/patches/man-hyphen-as-minus | 22 +++++++++--------- debian/patches/man-section | 36 +++++++++++++++--------------- debian/patches/man-spelling | 16 ++++++------- debian/patches/reformat-tclcurl3 | 6 ++--- 6 files changed, 42 insertions(+), 41 deletions(-) diff --git a/debian/changelog b/debian/changelog index f5e9b86..5a91e27 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ tclcurl (7.22.0-1) UNRELEASED; urgency=low * New upstream release + Remove debian/patches/deprecated-curl-types - fixed upstream. + Build-depend on libcurl4-gnutls-dev (>= 7.22.0). + + Refresh all patches. -- Sven Hoexter Sat, 02 Jun 2012 19:02:30 +0200 diff --git a/debian/patches/correct-linking b/debian/patches/correct-linking index d7068de..11fcaae 100644 --- a/debian/patches/correct-linking +++ b/debian/patches/correct-linking @@ -3,7 +3,7 @@ for this package. See: http://lists.debian.org/debian-devel-announce/2006/09/msg00018.html --- a/configure +++ b/configure -@@ -7290,7 +7290,16 @@ fi +@@ -4939,7 +4939,16 @@ fi $as_echo "yes" >&6; } diff --git a/debian/patches/man-hyphen-as-minus b/debian/patches/man-hyphen-as-minus index 6279360..086102d 100644 --- a/debian/patches/man-hyphen-as-minus +++ b/debian/patches/man-hyphen-as-minus @@ -1,7 +1,7 @@ Fix several hyphen-as-minus problems flagged by lintian. --- a/doc/tclcurl.n +++ b/doc/tclcurl.n -@@ -294,7 +294,7 @@ too low might cause unnecessary connecti +@@ -460,7 +460,7 @@ too low might cause unnecessary connecti .TP .B -dnscachetimeout Pass the timeout in seconds. Name resolves will be kept in memory for this number @@ -9,8 +9,8 @@ Fix several hyphen-as-minus problems flagged by lintian. +of seconds. Set to '0' to completely disable caching, or '\-1' to make the cached entries remain forever. By default, TclCurl caches this info for 60 seconds. - .TP -@@ -498,7 +498,7 @@ is meaningful only when setting \fB-f + The name resolve functions of various libc implementations don't re-read name +@@ -761,7 +761,7 @@ is meaningful only when setting \fB-f Sets the redirection limit. If that many redirections have been followed, the next redirect will cause an error. This option only makes sense if the \fB-followlocation\fP option is used at the same time. Setting the limit @@ -19,7 +19,7 @@ Fix several hyphen-as-minus problems flagged by lintian. number of redirects (which is the default) .TP -@@ -1026,7 +1026,7 @@ Pass the offset in number of bytes that +@@ -1341,7 +1341,7 @@ Pass the offset in number of bytes that Set this option to 0 to make the transfer start from the beginning (effectively disabling resume). @@ -27,17 +27,17 @@ Fix several hyphen-as-minus problems flagged by lintian. +For FTP, set this option to \-1 to make the transfer start from the end of the target file (useful to continue an interrupted upload). - .TP -@@ -1626,7 +1626,7 @@ Internal error. A function was called wi + When doing uploads with FTP, the resume position is where in the local/source +@@ -2077,7 +2077,7 @@ Internal error. A function was called wi Interface error. A specified outgoing interface could not be used. .IP 47 Too many redirects. When following redirects, TclCurl hit the maximum amount, set -your limit with --maxredirs +your limit with \-\-maxredirs .IP 48 - Unknown TELNET option specified. - .IP 49 -@@ -1720,7 +1720,7 @@ Returns the last received proxy response + An option passed to TclCurl is not recognized/known. Refer to the appropriate + documentation. This is most likely a problem in the program that uses +@@ -2186,7 +2186,7 @@ Returns the last received proxy response .TP .B filetime Returns the remote time of the retrieved document (in number of seconds @@ -46,7 +46,7 @@ Fix several hyphen-as-minus problems flagged by lintian. it can be because of many reasons (unknown, the server hides it or the server doesn't support the command that tells document time etc) and the time of the document is unknown. -@@ -1824,7 +1824,7 @@ requests. Note that this may be more tha +@@ -2303,7 +2303,7 @@ requests. Note that this may be more tha .TP .B sslverifyresult Returns the result of the certification verification that was requested @@ -57,7 +57,7 @@ Fix several hyphen-as-minus problems flagged by lintian. .B sslengines --- a/doc/tclcurl_multi.n +++ b/doc/tclcurl_multi.n -@@ -174,7 +174,7 @@ you can use the +@@ -186,7 +186,7 @@ you can use the command, it will return the number of transfers currently active. .sp .B RETURN VALUE diff --git a/debian/patches/man-section b/debian/patches/man-section index 7c136f0..2b2b96a 100644 --- a/debian/patches/man-section +++ b/debian/patches/man-section @@ -5,8 +5,8 @@ Add a section number to the manpages. Manpage of TclCurl

TclCurl

--Section: Easy inteface (n)
Updated: 8 September 2008
-+Section: Easy inteface (3)
Updated: 8 September 2008
+-Section: Easy inteface (n)
Updated: 03 October 2011
++Section: Easy inteface (3)
Updated: 03 October 2011
 

NAME

@@ -16,19 +16,19 @@ Add a section number to the manpages. .\" You can view this file with: .\" nroff -man [file] .\" Adapted from libcurl docs by fandom@telefonica.net --.TH TclCurl n "8 September 2008" "TclCurl 7.19.0 "TclCurl Easy Interface" -+.TH TclCurl 3 "8 September 2008" "TclCurl 7.19.0 "TclCurl Easy Interface" +-.TH TclCurl n "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" ++.TH TclCurl 3 "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" .SH NAME - TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE or LDAP syntax. - .SH SYNOPSIS + TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE, LDAP, + LDAPS, IMAP, IMAPS, POP, POP3, SMTP, SMTPS and gopher syntax. --- a/doc/tclcurl_multi.html +++ b/doc/tclcurl_multi.html @@ -1,7 +1,7 @@ Manpage of TclCurl

TclCurl

--Section: TclCurl Multi Interface (n)
Updated: 8 September 2008
-+Section: TclCurl Multi Interface (3)
Updated: 8 September 2008
+-Section: TclCurl Multi Interface (n)
Updated: 03 September 2011
++Section: TclCurl Multi Interface (3)
Updated: 03 September 2011
 

NAME

@@ -38,19 +38,19 @@ Add a section number to the manpages. .\" You can view this file with: .\" nroff -man [file] .\" Adapted from libcurl docs by fandom@telefonica.net --.TH TclCurl n "8 September 2008" "TclCurl 7.19.0" "TclCurl Multi Interface" -+.TH TclCurl 3 "8 September 2008" "TclCurl 7.19.0" "TclCurl Multi Interface" +-.TH TclCurl n "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" ++.TH TclCurl 3 "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" .SH NAME - TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE or LDAP syntax. - .SH SYNOPSIS + TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE, LDAP, + LDAPS, IMAP, IMAPS, POP, POP3, SMTP, SMTPS and gopher syntax. --- a/doc/tclcurl_share.html +++ b/doc/tclcurl_share.html @@ -1,7 +1,7 @@ Manpage of TclCurl

TclCurl

--Section: TclCurl share data api (n)
Updated: 8 September 2008
-+Section: TclCurl share data api (3)
Updated: 8 September 2008
+-Section: TclCurl share data api (n)
Updated: 03 October 2011
++Section: TclCurl share data api (3)
Updated: 03 October 2011
 

NAME

@@ -60,8 +60,8 @@ Add a section number to the manpages. .\" You can view this file with: .\" nroff -man [file] .\" Adapted from libcurl docs by fandom@telefonica.net --.TH TclCurl n "8 September 2008" "TclCurl 7.19.0" "TclCurl share data api" -+.TH TclCurl 3 "8 September 2008" "TclCurl 7.19.0" "TclCurl share data api" +-.TH TclCurl n "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" ++.TH TclCurl 3 "3 October 2011" "TclCurl 7.22.0 "TclCurl Easy Interface" .SH NAME - TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE or LDAP syntax. - .SH SYNOPSIS + TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE, LDAP, + LDAPS, IMAP, IMAPS, POP, POP3, SMTP, SMTPS and gopher syntax. diff --git a/debian/patches/man-spelling b/debian/patches/man-spelling index 31f1b93..56e6ca0 100644 --- a/debian/patches/man-spelling +++ b/debian/patches/man-spelling @@ -1,7 +1,7 @@ Fix a few spelling issue flagged by lintian. --- a/doc/tclcurl.n +++ b/doc/tclcurl.n -@@ -50,7 +50,7 @@ curl and this call MUST have a correspon +@@ -52,7 +52,7 @@ curl and this call MUST have a correspon .I cleanup when the operation is completed. You should perform all your sequential file transfers using the same @@ -10,7 +10,7 @@ Fix a few spelling issue flagged by lintian. possible. .sp .B RETURN VALUE -@@ -308,7 +308,7 @@ to using the share interface instead! Se +@@ -479,7 +479,7 @@ to using the share interface instead! Se .TP .B -buffersize @@ -19,7 +19,7 @@ Fix a few spelling issue flagged by lintian. would be that the write callback gets called more often and with smaller chunks. This is just treated as a request, not an order. You cannot be guaranteed to actually get the given size. -@@ -437,7 +437,7 @@ TclCurl will automatically select the on +@@ -657,7 +657,7 @@ TclCurl will automatically select the on .TP .B anysafe @@ -28,16 +28,16 @@ Fix a few spelling issue flagged by lintian. one it finds most secure. .RE -@@ -697,7 +697,7 @@ a single option and thus you need to con +@@ -971,7 +971,7 @@ a single option and thus you need to con Set multiple cookies in one string like this: "name1=content1; name2=content2;" etc. --Note that this option sets the cookie header explictly in the outgoing request(s). -+Note that this option sets the cookie header explicitly in the outgoing request(s). +-This option sets the cookie header explictly in the outgoing request(s). ++This option sets the cookie header explicitly in the outgoing request(s). If multiple requests are done due to authentication, followed redirections or similar, they will all get this cookie passed on. -@@ -1148,7 +1148,7 @@ than or equal to the parameter value. De +@@ -1467,7 +1467,7 @@ than or equal to the parameter value. De .TP .B -maxconnects @@ -46,7 +46,7 @@ Fix a few spelling issue flagged by lintian. persistent conecctions. The set amount will be the maximum amount of simultaneous connections that TclCurl may cache in this easy handle. Default is 5, and there isn't much point in changing this value unless you are perfectly aware of how this -@@ -1916,7 +1916,7 @@ to pause the transfer. +@@ -2412,7 +2412,7 @@ to pause the transfer. Resumes a transfer paused with \fBcurlhandle pause\fP .SH curl::transfer diff --git a/debian/patches/reformat-tclcurl3 b/debian/patches/reformat-tclcurl3 index 8fcdbd7..cc33d23 100644 --- a/debian/patches/reformat-tclcurl3 +++ b/debian/patches/reformat-tclcurl3 @@ -1,7 +1,7 @@ Fix some formating errors in the manpages. --- a/doc/tclcurl.n +++ b/doc/tclcurl.n -@@ -687,10 +687,10 @@ response will be treated as a valid HTTP +@@ -961,10 +961,10 @@ response will be treated as a valid HTTP .TP .B -cookie @@ -16,7 +16,7 @@ Fix some formating errors in the manpages. If you need to set mulitple cookies, you need to set them all using a single option and thus you need to concatenate them all in one single string. -@@ -1384,7 +1384,7 @@ are also acceptable separators but colon +@@ -1771,7 +1771,7 @@ are also acceptable separators but colon used as operators. For OpenSSL and GnuTLS valid examples of cipher lists include 'RC4-SHA', 'SHA1+DES', @@ -25,7 +25,7 @@ Fix some formating errors in the manpages. You will find more details about cipher lists on this URL: http://www.openssl.org/docs/apps/ciphers.html -@@ -1530,7 +1530,7 @@ same handle. Let it return first before +@@ -1976,7 +1976,7 @@ same handle. Let it return first before you want parallel transfers, you must use several curl handles. .TP .B RETURN VALUE -- 2.39.5