From: Sven Hoexter Date: Sat, 17 Oct 2015 20:14:31 +0000 (+0200) Subject: Merge tag 'upstream/7.22.0+hg20151017' X-Git-Tag: debian/7.22.0+hg20151017-1~5 X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Ftclcurl.git;a=commitdiff_plain;h=8fe9e487b76cf5338013cbf22d1bdaad14f85b2b;hp=05e44d9eab9941095dac034505a4efef30734498 Merge tag 'upstream/7.22.0+hg20151017' Upstream version 7.22.0+hg20151017 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..845ca06 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.pc diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..3d5f55c --- /dev/null +++ b/debian/README.source @@ -0,0 +1,3 @@ +This package uses quilt to manage the patches in debian/patches. +For further information please install the quilt package and read +/usr/share/doc/quilt/README.source. diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..eddfca7 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,329 @@ +tclcurl (7.22.0-3) unstable; urgency=low + + * Remove d/watch. The old download location is no longer available. + * Update d/copyright and add the link to Steve Havelkas bitbuck repository. + + -- Sven Hoexter Tue, 21 Jul 2015 21:02:35 +0200 + +tclcurl (7.22.0-2) unstable; urgency=low + + * Point the Homepage field to a mirror of the last website to cater + http://duck.debian.net/ and the DUCK challenge. + * Bump Standards-Version to 3.9.6. + * s/transfered/transferred/ in several manpages as suggest by lintian. + + -- Sven Hoexter Tue, 21 Jul 2015 19:42:25 +0200 + +tclcurl (7.22.0-1) unstable; 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. + * Remove overrides for dh_clean and dh_installexamples. All the + build artefacts which required special handling are no longer + included in the upstream tarball. + * Switch to dh compat level 9, build-depend on debhelper (>= 9). + * Switch LDFLAGS to DEB_LDFLAGS_MAINT_PREPEND. + * Change Standards-Version to 3.9.3 - no changes required. + * Update copyright year and download location in debian/copyright. + * Update homepage in debian/watch and debian/control. + * Continue to move the libs to /usr/lib/tcltk/ for now against + the will of the buildsystem. Original installation path is + now architecture dependend. + + -- Sven Hoexter Sat, 02 Jun 2012 20:48:44 +0200 + +tclcurl (7.19.6-3) unstable; urgency=low + + * Add debian/patches/deprecated-curl-types to no longer include + curl/types.h and curl/easy.h. Both are deprecated and got removed + from recent curl releases. (Closes: #636558) + + -- Sven Hoexter Thu, 04 Aug 2011 19:52:22 +0200 + +tclcurl (7.19.6-2) unstable; urgency=low + + * Bumb Standards-Version to 3.9.2 - no changes. + * Add ${misc:Depends} to the binary package. + * Update homepage url to a generic hostname. + * Update VCS-* to the new git repository. + * Convert to dh: + + Build-Depend on debhelper (>= 8). + + Increase compat level to 8. + + Shorten debian/rules to the bare essentials. + + Override dh_makeshlibs call to add tcltk-depends. + + Override dh_clean to not remove several left-overs included upstream. + + Override dh_installexamples to not install a.tcl~. + + Emtpy override for dh_auto_test, the referenced all.tcl doesn't exist; + Most of the tests require network access anyway, which isn't given + on the buildds. + * Add debian/source/format -> 1.0. + * Add a watch file. + * Add debian/patches/(man-hyphen-as-minus|man-spelling) to fix several + manpage issue flagged by lintian. + + -- Sven Hoexter Thu, 28 Apr 2011 13:51:13 +0200 + +tclcurl (7.19.6-1) unstable; urgency=low + + * New upstream release. + + Build-Depend at least on libcurl4 (>= 7.19.6). + + Refresh patches/correct-linking. + * Bumb Standards-Version to 3.8.3 - no changes. + * Change maintainer e-mail to my @d.o address. + + -- Sven Hoexter Wed, 11 Nov 2009 23:26:11 +0100 + +tclcurl (7.19.0-1) unstable; urgency=low + + * New upstream release. + + Refresh all patches. + + Build-Depend at least on libcurl4 (>= 7.19.0). + * Update mail address of the upstream maintainer in debian/copyright. + * Bump Standards-Version to 3.8.2. + + Add a debian/README.source file. + * Update debian/copyright with copyright information for Makefile.in + and tclconfig/tcl.m4. Thanks to Ondrej Certik for the pointer in + mysqltcl which has to applied here aswell. + * Add description header to all patches. + * Add patches/example-shebang. This patch adds a working shebang line + to those example files that carry one (Thanks to Sergei). + * Set the permissions for the example files to 644, except for those + with a working shebang line (Thanks to Sergei). + + -- Sven Hoexter Wed, 05 Aug 2009 21:30:47 +0200 + +tclcurl (7.17.1-1) unstable; urgency=low + + * New upstream release to support curl 7.17.1 features. + * Following lintian advice for debian-rules-ignores-make-clean-error. + * Moved the Homepage from the Description into the new Homepage field. + * Removed man-quoting patch; got applied upstream. + * Standards-Version: 3.7.3 - no changes required. + * Build depend on tcl-dev instead of tcl8.4-dev. + * Refreshed man-section and correct-linking patch. + * Added LDFLAGS += -Wl,-z,defs -Wl,--as-needed so that I can shorten + the correct-linking patch to kerberos related libs. + * Switched to use tcltk-depends to depend on the right Tcl version. + * Added Vcs-Svn field to debian/control. + * Reworked debian/rules to make it a bit clearer what happens. + * Adopt the new Tcl/Tk policy and move the lib into /usr/lib/tcltk. + * Added patch reformat-tclcurl3 to prevent confusion of man. + * Updated the copyright file and formated it to make lintian happy. + + -- Sven Hoexter Wed, 13 Feb 2008 21:21:39 +0100 + +tclcurl (7.16.2-1) unstable; urgency=low + + * New upstream release + * Changed version to the one used upstream to follow libcurl version + * Updated libcurl build-dep to the new libcurl version (closes: #423448) + * Added bc to build-dep + * Reorganisation of packaging; I'm now using quilt which should ease the + patch management a lot. I've only adopted those patches I really know + about why they're needed so it's completly possible that I've lost + something. + + -- Sven Hoexter Tue, 22 May 2007 17:39:30 +0200 + +tclcurl (0.15.3-3) unstable; urgency=low + + * Applied a patch to generic/tclcurl.c (provided by Andres Garcia) + to solve some pointer warnings from gcc 4.1 which may lead to + wrong code. + See also: http://people.debian.org/~tbm/logs/pointer/ + + -- Sven Hoexter Sat, 21 Oct 2006 12:06:30 +0200 + +tclcurl (0.15.3-2) unstable; urgency=low + + * Change to compat level 5 + * Change to Standards-Version 3.7.2 - nothing todo + * Corrected some quoting in tclcurl.n + * Added a crude hack to configure.in to strip some libs from the + linking process to lower the auto generated depends for this package + + -- Sven Hoexter Tue, 26 Sep 2006 11:33:44 +0200 + +tclcurl (0.15.3-1) unstable; urgency=low + + * New upstream release + * Upstream added .txt to the Changes and Changelog file + * TclCurl no longer supports Gopher + + -- Sven Hoexter Tue, 18 Apr 2006 08:55:57 +0200 + +tclcurl (0.15.1-1) unstable; urgency=low + + * New upstream release + * Change from DH_COMPAT 3 to DH_COMPAT 4 and moved it from rules + into the compat file. + * Incorporating Luk Claes NMU + * remerged the modifications to configure and Makefile.in partly by hand + * I'm going to adopt this package (closes: #228231) + + + -- Sven Hoexter Wed, 29 Mar 2006 15:34:56 +0200 + +tclcurl (0.14.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix syntax error in tcl.m4 (Closes: #356871). + + -- Luk Claes Mon, 27 Mar 2006 19:28:19 +0200 + +tclcurl (0.14.1-1) unstable; urgency=low + + * New upstream release. + * Switched to libcurl3-gnutls-dev build dependency. + + -- Domenico Andreoli Tue, 18 Oct 2005 14:35:11 +0200 + +tclcurl (0.14.0-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Mon, 20 Jun 2005 12:42:47 +0200 + +tclcurl (0.13.2-1) unstable; urgency=low + + * New upstream release. + * Updated build dependency on libcurl3-dev >= 7.13.2. + + -- Domenico Andreoli Fri, 22 Apr 2005 11:57:50 +0200 + +tclcurl (0.12.2-3) unstable; urgency=low + + * tclcurl package now suggests libcurl3-dev instead of libcurl2-dev. + + -- Domenico Andreoli Sat, 11 Dec 2004 22:18:26 +0100 + +tclcurl (0.12.2-2) unstable; urgency=low + + * Updated build dependency on libcurl3-dev >= 7.12.2. + + -- Domenico Andreoli Wed, 10 Nov 2004 00:34:22 +0100 + +tclcurl (0.12.2-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Sat, 6 Nov 2004 13:07:36 +0100 + +tclcurl (0.12.0-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Sun, 18 Jul 2004 23:50:54 +0200 + +tclcurl (0.11.0-1) unstable; urgency=low + + * New upstream release (closes: #227799). + * I am again the maintainer but only until somebody adopts it. + * Updated build depends on newer versions of curl and Tcl 8.4. + * Updated standards version to 3.6.1. + * Enabled multi-threads support. + + -- Domenico Andreoli Sun, 15 Feb 2004 16:37:31 +0100 + +tclcurl (0.10.5-2) unstable; urgency=low + + * Updated standards version to new debian-policy version. + * Updated build depends to new debhelper version, and new libcurl2-dev + version. + + -- Deedra Waters Sun, 10 Aug 2003 15:27:36 -0400 + +tclcurl (0.10.5-1) unstable; urgency=low + + * New upstream release. + * Fixed a typo in the long description. + + -- Deedra Waters Tue, 10 Jun 2003 10:26:22 -0400 + +tclcurl (0.10.4-2) unstable; urgency=low + + * Adopted this package from it's maintainer (closes: #188361). + * Fixed some things in the rules file to make it clean up nicer. + * Updated the standards to the current version. + + -- Deedra Waters Sun, 4 May 2003 17:02:36 -0400 + +tclcurl (0.10.4-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Sat, 5 Apr 2003 00:53:30 +0200 + +tclcurl (0.10.3-1) unstable; urgency=low + + * New upstream release. + * Updated build dependencies in order to use new libcurl2-dev package. + * It now suggests libcurl2-dev for documentation. + * Improved long description. + + -- Domenico Andreoli Thu, 6 Feb 2003 02:51:01 +0100 + +tclcurl (0.10.1-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Tue, 15 Oct 2002 23:57:54 +0200 + +tclcurl (0.9.8-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Fri, 28 Jun 2002 01:06:46 +0200 + +tclcurl (0.9.6-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Mon, 6 May 2002 14:42:22 +0200 + +tclcurl (0.9.5-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Wed, 3 Apr 2002 13:16:13 +0200 + +tclcurl (0.9.3-2) unstable; urgency=low + + * Removed a useless (for Debian systems) check in Makefile.in. BTW + this bypasses a segmentation fault during the build process on arm. + + -- Domenico Andreoli Mon, 18 Feb 2002 16:10:40 +0100 + +tclcurl (0.9.3-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Tue, 29 Jan 2002 18:08:06 +0100 + +tclcurl (0.9.2-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Tue, 11 Dec 2001 19:22:21 +0100 + +tclcurl (0.9-2) unstable; urgency=low + + * Build-Depends now contains "libcurl-dev (>= 7.9.1-3) | libcurl-ssl-dev + (>= 7.9.1-3)" instead of only "libcurl-dev (>= 7.9-1) | libcurl-ssl-dev + (>= 7.9-1)" (closes: #120293). + + -- Domenico Andreoli Thu, 22 Nov 2001 15:47:03 +0100 + +tclcurl (0.9-1) unstable; urgency=low + + * New upstream release. + + -- Domenico Andreoli Fri, 9 Nov 2001 16:27:42 +0100 + +tclcurl (0.8-1) unstable; urgency=low + + * Initial release (closes: #113467). + + -- Domenico Andreoli Wed, 26 Sep 2001 00:51:25 +0200 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +9 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..6da28a4 --- /dev/null +++ b/debian/control @@ -0,0 +1,20 @@ +Source: tclcurl +Section: interpreters +Priority: extra +Maintainer: Sven Hoexter +Build-Depends: debhelper (>= 9), tcl-dev, libcurl4-gnutls-dev (>= 7.22.0), + quilt, bc +Homepage: http://mirror.yellow5.com/tclcurl/ +Standards-Version: 3.9.6 +Vcs-Git: git://git.sven.stormbind.net/git/sven/tclcurl.git +Vcs-Browser: http://git.sven.stormbind.net/?p=sven/tclcurl.git + +Package: tclcurl +Architecture: any +Suggests: libcurl4-gnutls-dev +Depends: ${misc:Depends}, ${shlibs:Depends}, ${tclsh:Depends} +Description: Tcl bindings to libcurl + This module enables the use of libcurl in Tcl scripts. Please refer to + the libcurl documentation available in the libcurl4-gnutls-dev package. + . + NOTE: the SSL support is provided by GnuTLS. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..808edcc --- /dev/null +++ b/debian/copyright @@ -0,0 +1,66 @@ +This package was debianized by Domenico Andreoli on +Wed, 26 Sep 2001 00:51:25 +0200. + +It is currently maintained by Sven Hoexter . + +It was downloaded from + http://personal.telefonica.terra.es/web/getleft/tclcurl/download.html +Some patches were integrated in this repository: + https://bitbucket.org/smh377/tclcurl + +Current upstream author: Steve Havelka +Original upstream author: Andres Garcia + +Copyright: + +Most files are under following copyright: + Copyright (c) 2001-2011 Andres Garcia + + +The following files have a different copyright holder under the same license +as the rest: + +Makefile.in +tclconfig/tcl.m4 + Copyright (c) 1999-2000 Scriptics Corporation. + Copyright (c) 2002-2005 ActiveState Corporation. + + + This software is copyrighted by Andres Garcia Garcia and other parties + parties. The following terms apply to all files associated with the + software unless explicitly disclaimed in individual files. + + The authors hereby grant permission to use, copy, modify, distribute, + and license this software and its documentation for any purpose, provided + that existing copyright notices are retained in all copies and that this + notice is included verbatim in any distributions. No written agreement, + license, or royalty fee is required for any of the authorized uses. + Modifications to this software may be copyrighted by their authors + and need not follow the licensing terms described here, provided that + the new terms are clearly indicated on the first page of each file where + they apply. + + IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY + FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES + ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY + DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + + THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, + INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE + IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE + NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR + MODIFICATIONS. + + GOVERNMENT USE: If you are acquiring this software on behalf of the + U.S. government, the Government shall have only "Restricted Rights" + in the software and related documentation as defined in the Federal + Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you + are acquiring the software on behalf of the Department of Defense, the + software shall be classified as "Commercial Computer Software" and the + Government shall have only "Restricted Rights" as defined in Clause + 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the + authors grant the U.S. Government and others acting in its behalf + permission to use and distribute the software in accordance with the + terms specified in this license. diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..cec628c --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,2 @@ +[DEFAULT] +pristine-tar = True diff --git a/debian/patches/correct-linking b/debian/patches/correct-linking new file mode 100644 index 0000000..11fcaae --- /dev/null +++ b/debian/patches/correct-linking @@ -0,0 +1,43 @@ +Strip out a few libs from the linker to lower the amount of direct depedencies +for this package. +See: http://lists.debian.org/debian-devel-announce/2006/09/msg00018.html +--- a/configure ++++ b/configure +@@ -4939,7 +4939,16 @@ fi + $as_echo "yes" >&6; } + + +- vars="`$curlpath/curl-config --libs`" ++# We need to modify this original line to strip a few things ++# See: http://lists.debian.org/debian-devel-announce/2006/09/msg00018.html ++ ++ vars="`$curlpath/curl-config --libs|sed \ ++ -e 's/\-lkrb5\>//g' \ ++ -e 's/\-lgssapi_krb5//g' \ ++ -e 's/\-lk5crypto//g' \ ++ -e 's/\-lkrb5support//g' \ ++ `" ++ + for i in $vars; do + if test "${TEA_PLATFORM}" = "windows" -a "$GCC" = "yes" ; then + # Convert foo.lib to -lfoo for GCC. No-op if not *.lib +--- a/configure.in ++++ b/configure.in +@@ -134,7 +134,16 @@ if test "${CURL_VERSION}" != "" ; then + fi + AC_MSG_RESULT(yes) + +-TEA_ADD_LIBS([`$curlpath/curl-config --libs`]) ++# We need to modify this original line to strip a few things ++# See: http://lists.debian.org/debian-devel-announce/2006/09/msg00018.html ++ ++TEA_ADD_LIBS([`$curlpath/curl-config --libs|sed \ ++ -e 's/\-lkrb5\>//g' \ ++ -e 's/\-lgssapi_krb5//g' \ ++ -e 's/\-lk5crypto//g' \ ++ -e 's/\-lkrb5support//g' \ ++ `]) ++ + + #-------------------------------------------------------------------- + # __CHANGE__ diff --git a/debian/patches/example-shebang b/debian/patches/example-shebang new file mode 100644 index 0000000..39f22da --- /dev/null +++ b/debian/patches/example-shebang @@ -0,0 +1,26 @@ +Set the shebang to '/usr/bin/wish' for those example files +that carry a shebang line. +--- a/tests/multi/auto.tcl ++++ b/tests/multi/auto.tcl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/wish8.4 ++#!/usr/bin/wish + + package require TclCurl + +--- a/tests/multi/autoGUI.tcl ++++ b/tests/multi/autoGUI.tcl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/wish8.4 ++#!/usr/bin/wish + + package require TclCurl + +--- a/tests/multi/cancelTrans.tcl ++++ b/tests/multi/cancelTrans.tcl +@@ -1,4 +1,4 @@ +-#!/usr/local/bin/wish8.4 ++#!/usr/bin/wish + + package require TclCurl + diff --git a/debian/patches/man-hyphen-as-minus b/debian/patches/man-hyphen-as-minus new file mode 100644 index 0000000..0a355c1 --- /dev/null +++ b/debian/patches/man-hyphen-as-minus @@ -0,0 +1,95 @@ +Fix several hyphen-as-minus problems flagged by lintian. +--- a/doc/tclcurl.n ++++ b/doc/tclcurl.n +@@ -397,7 +397,7 @@ HTTP proxies. + .B -proxyport + Use this option to set the proxy port to use unless it is specified in + the proxy string by \fB-proxy\fP. If not specified, TclCurl will default +--to using port 1080 for proxies. ++to using port 1080 for proxies. + + .TP + .B -proxytype +@@ -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 +-of seconds. Set to '0' to completely disable caching, or '-1' to make the ++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. + + The name resolve functions of various libc implementations don't re-read name +@@ -762,7 +762,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 +-to 0 will make libcurl refuse any redirect. Set it to -1 for an infinite ++to 0 will make libcurl refuse any redirect. Set it to \-1 for an infinite + number of redirects (which is the default) + + .TP +@@ -1342,7 +1342,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). + +-For FTP, set this option to -1 to make the transfer start from the end of the ++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). + + When doing uploads with FTP, the resume position is where in the local/source +@@ -1537,7 +1537,7 @@ HOST+PORT will instead use your provided + + You can remove names from the DNS cache again, to stop providing these fake + resolves, by including a string in the linked list that uses the format +-"-HOST:PORT". The host name must be prefixed with a dash, and the host name ++"\-HOST:PORT". The host name must be prefixed with a dash, and the host name + and port number must exactly match what was already added previously. + + .TP +@@ -2078,7 +2078,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 + 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 +@@ -2187,7 +2187,7 @@ Returns the last received proxy response + .TP + .B filetime + Returns the remote time of the retrieved document (in number of seconds +-since 1 jan 1970 in the GMT/UTC time zone). If you get -1, ++since 1 jan 1970 in the GMT/UTC time zone). If you get \-1, + 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. +@@ -2304,7 +2304,7 @@ requests. Note that this may be more tha + .TP + .B sslverifyresult + Returns the result of the certification verification that was requested +-(using the -sslverifypeer option to configure). ++(using the \-sslverifypeer option to configure). + + .TP + .B sslengines +@@ -2316,7 +2316,7 @@ engines may be available at run-time. + .B contentlengthdownload + Returns the content-length of the download. This is the value read from the + .B Content-Length: +-field. If the size isn't known, it returns -1. ++field. If the size isn't known, it returns \-1. + + .TP + .B contentlengthupload +--- a/doc/tclcurl_multi.n ++++ b/doc/tclcurl_multi.n +@@ -186,7 +186,7 @@ you can use the + command, it will return the number of transfers currently active. + .sp + .B RETURN VALUE +-The number of active transfers or '-1' in case of error. ++The number of active transfers or '\-1' in case of error. + + .SH multiHandle getinfo + This procedure returns very simple information about the transfers, you diff --git a/debian/patches/man-section b/debian/patches/man-section new file mode 100644 index 0000000..2b2b96a --- /dev/null +++ b/debian/patches/man-section @@ -0,0 +1,67 @@ +Add a section number to the manpages. +--- a/doc/tclcurl.html ++++ b/doc/tclcurl.html +@@ -1,7 +1,7 @@ + Manpage of TclCurl + +

TclCurl

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

NAME

+--- a/doc/tclcurl.n ++++ b/doc/tclcurl.n +@@ -1,7 +1,7 @@ + .\" You can view this file with: + .\" nroff -man [file] + .\" Adapted from libcurl docs by fandom@telefonica.net +-.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, 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: 03 September 2011
++Section: TclCurl Multi Interface (3)
Updated: 03 September 2011
+ +   +

NAME

+--- a/doc/tclcurl_multi.n ++++ b/doc/tclcurl_multi.n +@@ -1,7 +1,7 @@ + .\" You can view this file with: + .\" nroff -man [file] + .\" Adapted from libcurl docs by fandom@telefonica.net +-.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, 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: 03 October 2011
++Section: TclCurl share data api (3)
Updated: 03 October 2011
+ +   +

NAME

+--- a/doc/tclcurl_share.n ++++ b/doc/tclcurl_share.n +@@ -1,7 +1,7 @@ + .\" You can view this file with: + .\" nroff -man [file] + .\" Adapted from libcurl docs by fandom@telefonica.net +-.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, LDAP, + LDAPS, IMAP, IMAPS, POP, POP3, SMTP, SMTPS and gopher syntax. diff --git a/debian/patches/man-spelling b/debian/patches/man-spelling new file mode 100644 index 0000000..4bf59ac --- /dev/null +++ b/debian/patches/man-spelling @@ -0,0 +1,148 @@ +Fix a few spelling issue flagged by lintian. +Index: tclcurl/doc/tclcurl.n +=================================================================== +--- tclcurl.orig/doc/tclcurl.n ++++ tclcurl/doc/tclcurl.n +@@ -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 +-curlHandle. This enables TclCurl to use persistant connections when ++curlHandle. This enables TclCurl to use persistent connections when + possible. + .sp + .B RETURN VALUE +@@ -192,7 +192,7 @@ empty or it may be thousands of bytes. + + .TP + .B -file +-File in which the transfered data will be saved. ++File in which the transferred data will be saved. + + .TP + .B -readproc +@@ -213,13 +213,13 @@ server end and the transfer will end the + + .TP + .B -infile +-File from which the data will be transfered. ++File from which the data will be transferred. + + .TP + .B -progressproc + Name of the Tcl procedure that will invoked by TclCurl with a frequent + interval during operation (roughly once per second or sooner), no matter if data +-is being transfered or not. Unknown/unused ++is being transferred or not. Unknown/unused + argument values passed to the callback will be set to zero (like if you + only download data, the upload size will remain 0), the prototype of the + procedure must be: +@@ -260,20 +260,20 @@ where \fBinfoType\fP specifies what kind + + .TP + .B -chunkbgnproc +-Name of the procedure that will be called before a file will be transfered by ++Name of the procedure that will be called before a file will be transferred by + ftp, it should match the following prototype: + .sp + .B ChunkBgnProc {remains} + .sp + +-Where remains is the number of files left to be transfered (or skipped) ++Where remains is the number of files left to be transferred (or skipped) + + This callback makes sense only when using the \fB-wildcard\fP option. + + .TP + .B -chunkbgnvar + Name of the variable in the global scope that will contain the data of the file about +-to be transfered. If you don't use this option '::fileData' will be used. ++to be transferred. If you don't use this option '::fileData' will be used. + + The available data is: filename, filetype (file, directory, symlink, device block, device char, + named pipe, socket, door or error if it couldn't be identified), time, perm, uid, gid, +@@ -281,7 +281,7 @@ size, hardlinks and flags. + + .TP + .B -chunkendproc +-Name of the procedure that will be called after a file is transfered (or skipped) ++Name of the procedure that will be called after a file is transferred (or skipped) + by ftp, it should match the following prototype: + .sp + .B ChunkEndProc {} +@@ -479,7 +479,7 @@ to using the share interface instead! Se + + .TP + .B -buffersize +-Pass your prefered size for the receive buffer in TclCurl. The main point of this ++Pass your preferred size for the receive buffer in TclCurl. The main point of this + 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. +@@ -657,7 +657,7 @@ TclCurl will automatically select the on + + .TP + .B anysafe +-It may use anything but basic, TclCurl will automaticly select the ++It may use anything but basic, TclCurl will automatically select the + one it finds most secure. + .RE + +@@ -972,7 +972,7 @@ a single option and thus you need to con + Set multiple cookies in one string like this: "name1=content1; name2=content2;" + etc. + +-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. + +@@ -1468,7 +1468,7 @@ than or equal to the parameter value. De + + .TP + .B -maxconnects +-Sets the persistant connection cache size in all the protocols that support ++Sets the persistent connection cache size in all the protocols that support + 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 +@@ -2020,7 +2020,7 @@ FTP can't get host. Couldn't resolve the + FTP couldn't set type. Couldn't change transfer method to either binary or + ascii. + .IP 18 +-Partial file. Only a part of the file was transfered, this happens when ++Partial file. Only a part of the file was transferred, this happens when + the server first reports an expected transfer size and then delivers data + that doesn't match the given size. + .IP 19 +@@ -2221,7 +2221,7 @@ negotiations that are specific to the pa + .TP + .B starttransfertime + Returns the time, in seconds, it took from the start until the first byte +-is just about to be transfered. This includes the \fBpretransfertime\fP, ++is just about to be transferred. This includes the \fBpretransfertime\fP, + and also the time the server needs to calculate the result. + + .TP +@@ -2413,7 +2413,7 @@ to pause the transfer. + Resumes a transfer paused with \fBcurlhandle pause\fP + + .SH curl::transfer +-In case you do not want to use persistant connections you can use this ++In case you do not want to use persistent connections you can use this + command, it takes the same arguments as the \fIcurlHandle\fP \fBconfigure\fP + and will init, configure, perform and cleanup a connection for you. + +Index: tclcurl/doc/tclcurl_multi.n +=================================================================== +--- tclcurl.orig/doc/tclcurl_multi.n ++++ tclcurl/doc/tclcurl_multi.n +@@ -223,7 +223,7 @@ the multi handle. + + The \fBcommand\fP option allows you to specify a command to invoke after all the easy + handles have finished their transfers, even though I say it is an option, the truth is +-you must use this command to cleanup all the handles, otherwise the transfered files ++you must use this command to cleanup all the handles, otherwise the transferred files + may not be complete. + + This support is still in a very experimental state, it may still change without warning. diff --git a/debian/patches/reformat-tclcurl3 b/debian/patches/reformat-tclcurl3 new file mode 100644 index 0000000..887d70d --- /dev/null +++ b/debian/patches/reformat-tclcurl3 @@ -0,0 +1,73 @@ +Fix some formating errors in the manpages. +--- a/doc/tclcurl.n ++++ b/doc/tclcurl.n +@@ -347,7 +347,7 @@ allows you to have a TclCurl built to su + specific transfers to only be allowed to use a subset of them. + + Accepted protocols are 'http', 'https', 'ftp', 'ftps', 'scp', 'sftp', 'telnet', 'ldap', +-'ldaps','dict', 'file','tftp', 'imap', 'imaps', 'pop', 'pop3', 'smtp', 'smtps', 'gopher' ++\&'ldaps', 'dict', 'file','tftp', 'imap', 'imaps', 'pop', 'pop3', 'smtp', 'smtps', 'gopher' + and 'all'. + + .TP +@@ -402,7 +402,7 @@ the proxy string by \fB-proxy\fP. If not + .TP + .B -proxytype + Pass the type of the proxy. Available options are 'http', 'http1.0', 'socks4', 'socks4a', +-'socks5' and 'socks5h', with the HTTP one being the default. ++\&'socks5' and 'socks5h', with the HTTP one being the default. + + If you set it to \fIhttp1.0\fP, it will only affect how libcurl speaks to a proxy + when CONNECT is used. The HTTP version used for "regular" HTTP requests is instead +@@ -661,7 +661,8 @@ It may use anything but basic, TclCurl w + one it finds most secure. + .RE + +-.TP -tlsauthtype ++.TP ++.B -tlsauthtype + Use it to tell TclCurl which authentication method(s) you want it to use for TLS authentication. + .RS + .TP 5 +@@ -961,10 +962,10 @@ response will be treated as a valid HTTP + + .TP + .B -cookie +-Pass a string as parameter. It will be used to +-set a cookie in the http request. The format of the string should be +-'[NAME]=[CONTENTS];'. Where NAME is the cookie name and CONTENTS is +-what the cookie should contain. ++Pass a string as parameter. ++It will be used to set a cookie in the http request. The format of ++the string should be '[NAME]=[CONTENTS];'. Where NAME is the cookie ++name and CONTENTS is what the cookie should contain. + + 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. +@@ -1771,7 +1772,7 @@ are also acceptable separators but colon + used as operators. + + For OpenSSL and GnuTLS valid examples of cipher lists include 'RC4-SHA', 'SHA1+DES', +-'TLSv1' and 'DEFAULT'. The default list is normally set when you compile OpenSSL. ++\&'TLSv1' and 'DEFAULT'. The default list is normally set when you compile OpenSSL. + + You will find more details about cipher lists on this URL: + http://www.openssl.org/docs/apps/ciphers.html +@@ -1781,7 +1782,7 @@ etc. With NSS you don't add/remove ciphe + ciphers are disabled and only those passed in are enabled. + + You'll find more details about the NSS cipher lists on this URL: +- http://directory.fedora.redhat.com/docs/mod_nss.html ++ + + .TP + .B -sslsessionidcache +@@ -1976,7 +1977,7 @@ same handle. Let it return first before + you want parallel transfers, you must use several curl handles. + .TP + .B RETURN VALUE +-'0' if all went well, non-zero if it didn't. In case of error, if the ++\&'0' if all went well, non-zero if it didn't. In case of error, if the + .I errorbuffer + was set with + .I configure diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d37947f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,6 @@ +example-shebang +man-section +reformat-tclcurl3 +man-spelling +man-hyphen-as-minus +correct-linking diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..f3638f8 --- /dev/null +++ b/debian/rules @@ -0,0 +1,42 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DEB_LDFLAGS_MAINT_PREPEND := -Wl,-z,defs -Wl,--as-needed +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + +%: + dh $@ --with quilt + +override_dh_auto_configure: + dh_auto_configure -- \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-threads \ + --with-tcl=/usr/lib \ + --with-tclinclude=/usr/include/tcl \ + +override_dh_auto_install: + dh_auto_install --destdir=$(CURDIR)/debian/tclcurl + + mkdir $(CURDIR)/debian/tclcurl/usr/lib/tcltk + mv $(CURDIR)/debian/tclcurl/usr/lib/$(DEB_HOST_MULTIARCH)/TclCurl* \ + $(CURDIR)/debian/tclcurl/usr/lib/tcltk + rm -rf \ + $(CURDIR)/debian/tclcurl/usr/share/man/mann \ + $(CURDIR)/debian/tclcurl/usr/bin \ + $(CURDIR)/debian/tclcurl/usr/include \ + $(CURDIR)/debian/tclcurl/usr/lib/$(DEB_HOST_MULTIARCH) + + chmod 644 \ + $(CURDIR)/tests/*.tcl \ + $(CURDIR)/tests/multi/double.tcl \ + $(CURDIR)/tests/multi/single.tcl + +override_dh_auto_test: + +override_dh_makeshlibs: + dh_makeshlibs + tcltk-depends diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..d3827e7 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +1.0 diff --git a/debian/tclcurl.examples b/debian/tclcurl.examples new file mode 100644 index 0000000..e7e1fb0 --- /dev/null +++ b/debian/tclcurl.examples @@ -0,0 +1 @@ +tests/* diff --git a/debian/tclcurl.files b/debian/tclcurl.files new file mode 100644 index 0000000..2964de6 --- /dev/null +++ b/debian/tclcurl.files @@ -0,0 +1 @@ +usr/lib/ diff --git a/debian/tclcurl.manpages b/debian/tclcurl.manpages new file mode 100644 index 0000000..57b8354 --- /dev/null +++ b/debian/tclcurl.manpages @@ -0,0 +1 @@ +doc/*.n