From 7bab4959e09ce33b26ef0860f03f2000bca55bfa Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Tue, 25 Dec 2007 12:49:13 +0000 Subject: [PATCH] [svn-inject] Applying Debian modifications to trunk --- debian/changelog | 228 +++++++++++++++++++++++++++++++++ debian/compat | 1 + debian/control | 17 +++ debian/copyright | 48 +++++++ debian/patches/correct-linking | 44 +++++++ debian/patches/man-section | 78 +++++++++++ debian/patches/series | 2 + debian/rules | 70 ++++++++++ debian/tclcurl.examples | 1 + debian/tclcurl.files | 1 + debian/tclcurl.manpages | 1 + 11 files changed, 491 insertions(+) create mode 100644 debian/changelog create mode 100644 debian/compat create mode 100644 debian/control create mode 100644 debian/copyright create mode 100644 debian/patches/correct-linking create mode 100644 debian/patches/man-section create mode 100644 debian/patches/series create mode 100755 debian/rules create mode 100644 debian/tclcurl.examples create mode 100644 debian/tclcurl.files create mode 100644 debian/tclcurl.manpages diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..9cfba2c --- /dev/null +++ b/debian/changelog @@ -0,0 +1,228 @@ +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. + + -- Sven Hoexter Sat, 15 Dec 2007 15:21:37 +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..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..def8e68 --- /dev/null +++ b/debian/control @@ -0,0 +1,17 @@ +Source: tclcurl +Section: interpreters +Priority: extra +Maintainer: Sven Hoexter +Build-Depends: debhelper (>> 5), tcl-dev, libcurl4-gnutls-dev (>= 7.17.1), quilt, bc +Homepage: http://personal1.iddeo.es/andresgarci/tclcurl/english/index.html +Standards-Version: 3.7.3 + +Package: tclcurl +Architecture: any +Suggests: libcurl4-gnutls-dev +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..3084a6e --- /dev/null +++ b/debian/copyright @@ -0,0 +1,48 @@ +This package was debianized by Domenico Andreoli on +Wed, 26 Sep 2001 00:51:25 +0200. + +It was downloaded from + http://personal1.iddeo.es/andresgarci/tclcurl/english/index.html + +Upstream Author: Andres Garcia + +Copyright: + + 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/patches/correct-linking b/debian/patches/correct-linking new file mode 100644 index 0000000..05e4ecb --- /dev/null +++ b/debian/patches/correct-linking @@ -0,0 +1,44 @@ +Index: TclCurl-7.17.1/configure +=================================================================== +--- TclCurl-7.17.1.orig/configure 2007-12-15 15:14:05.000000000 +0100 ++++ TclCurl-7.17.1/configure 2007-12-15 15:15:34.000000000 +0100 +@@ -6494,7 +6494,16 @@ + echo "${ECHO_T}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 +Index: TclCurl-7.17.1/configure.in +=================================================================== +--- TclCurl-7.17.1.orig/configure.in 2007-12-15 15:14:07.000000000 +0100 ++++ TclCurl-7.17.1/configure.in 2007-12-15 15:15:55.000000000 +0100 +@@ -127,7 +127,16 @@ + 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' \ ++ `]) ++ + + #-------------------------------------------------------------------- + # A few miscellaneous platform-specific items: diff --git a/debian/patches/man-section b/debian/patches/man-section new file mode 100644 index 0000000..4c77b68 --- /dev/null +++ b/debian/patches/man-section @@ -0,0 +1,78 @@ +Index: TclCurl-7.17.1/doc/tclcurl.html +=================================================================== +--- TclCurl-7.17.1.orig/doc/tclcurl.html 2007-12-15 15:01:43.000000000 +0100 ++++ TclCurl-7.17.1/doc/tclcurl.html 2007-12-15 15:01:51.000000000 +0100 +@@ -1,7 +1,7 @@ + Manpage of TclCurl + +

TclCurl

+-Section: TclCurl Easy Interface (n)
Updated: 1 November 2007
++Section: TclCurl Easy Interface (3)
Updated: 1 November 2007
+ +   +

NAME

+Index: TclCurl-7.17.1/doc/tclcurl.n +=================================================================== +--- TclCurl-7.17.1.orig/doc/tclcurl.n 2007-12-15 15:01:46.000000000 +0100 ++++ TclCurl-7.17.1/doc/tclcurl.n 2007-12-15 15:01:59.000000000 +0100 +@@ -1,7 +1,7 @@ + .\" You can view this file with: + .\" nroff -man [file] + .\" Adapted from libcurl docs by fandom@telefonica.net +-.TH TclCurl n "1 November 2007" "TclCurl 7.17.1" "TclCurl Easy Interface" ++.TH TclCurl 3 "1 November 2007" "TclCurl 7.17.1" "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 +Index: TclCurl-7.17.1/doc/tclcurl_multi.html +=================================================================== +--- TclCurl-7.17.1.orig/doc/tclcurl_multi.html 2007-12-15 15:01:43.000000000 +0100 ++++ TclCurl-7.17.1/doc/tclcurl_multi.html 2007-12-15 15:01:51.000000000 +0100 +@@ -1,7 +1,7 @@ + Manpage of TclCurl + +

TclCurl

+-Section: TclCurl Multi Interface (n)
Updated: 1 November 2007
++Section: TclCurl Multi Interface (3)
Updated: 1 November 2007
+ +   +

NAME

+Index: TclCurl-7.17.1/doc/tclcurl_multi.n +=================================================================== +--- TclCurl-7.17.1.orig/doc/tclcurl_multi.n 2007-12-15 15:01:46.000000000 +0100 ++++ TclCurl-7.17.1/doc/tclcurl_multi.n 2007-12-15 15:01:59.000000000 +0100 +@@ -1,7 +1,7 @@ + .\" You can view this file with: + .\" nroff -man [file] + .\" Adapted from libcurl docs by fandom@telefonica.net +-.TH TclCurl n "19 July 2007" "TclCurl 7.16.4" "TclCurl Multi Interface" ++.TH TclCurl 3 "19 July 2007" "TclCurl 7.16.4" "TclCurl Multi Interface" + .SH NAME + TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE or LDAP syntax. + .SH SYNOPSIS +Index: TclCurl-7.17.1/doc/tclcurl_share.html +=================================================================== +--- TclCurl-7.17.1.orig/doc/tclcurl_share.html 2007-12-15 15:01:43.000000000 +0100 ++++ TclCurl-7.17.1/doc/tclcurl_share.html 2007-12-15 15:01:51.000000000 +0100 +@@ -1,7 +1,7 @@ + Manpage of TclCurl + +

TclCurl

+-Section: TclCurl share data api (n)
Updated: 1 November 2007
++Section: TclCurl share data api (3)
Updated: 1 November 2007
+ +   +

NAME

+Index: TclCurl-7.17.1/doc/tclcurl_share.n +=================================================================== +--- TclCurl-7.17.1.orig/doc/tclcurl_share.n 2007-12-15 15:01:46.000000000 +0100 ++++ TclCurl-7.17.1/doc/tclcurl_share.n 2007-12-15 15:01:59.000000000 +0100 +@@ -1,7 +1,7 @@ + .\" You can view this file with: + .\" nroff -man [file] + .\" Adapted from libcurl docs by fandom@telefonica.net +-.TH TclCurl n "1 November 2007" "TclCurl 7.17.1" "TclCurl share data api" ++.TH TclCurl 3 "1 November 2007" "TclCurl 7.17.1" "TclCurl share data api" + .SH NAME + TclCurl: - get a URL with FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, FILE or LDAP syntax. + .SH SYNOPSIS diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..f25af7d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +correct-linking +man-section diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..48d1e84 --- /dev/null +++ b/debian/rules @@ -0,0 +1,70 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +LDFLAGS += -Wl,-z,defs -Wl,--as-needed + + +configure: patch configure-stamp +configure-stamp: + dh_testdir + ./configure \ + --host=${DEB_HOST_GNU_TYPE} \ + --build=${DEB_BUILD_GNU_TYPE} \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --enable-threads + touch configure-stamp + +build: configure build-stamp +build-stamp: configure-stamp + dh_testdir + $(MAKE) + touch build-stamp + +clean: cleaner unpatch +cleaner: + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) distclean + rm -f build-stamp configure-stamp + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + $(MAKE) DESTDIR=`pwd`/debian/tmp install + dh_movefiles + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs Changes.txt + dh_installexamples + dh_installman + dh_installchangelogs ChangeLog.txt + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + tcltk-depends + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep build clean configure install 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 -- 2.39.5