From cb148da635aa423c7cc283471ad28e4b5844c3ba Mon Sep 17 00:00:00 2001 From: Mark Janssen Date: Wed, 20 Nov 2002 13:29:01 +0000 Subject: [PATCH] =?UTF-8?q?Cleaning=20up=20debian=20entries,=20merging=20p?= =?UTF-8?q?atch=20from=20Lo=EF=BF=BDc=20Le=20Guyader=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@45 bc163920-b10d-0410-b2c5-a5491ca2ceef --- Makefile | 2 +- debian/control | 5 +++-- debian/copyright | 23 ++++++++++++++++++++++- debian/dirs | 2 +- debian/docs | 2 +- debian/rules | 10 +++++----- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index fd8483c..2824dc0 100755 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CC = gcc CFLAGS = -Wall -DHAVE_GETOPT_LONG LDFLAGS = -INSTALLPATH = /usr/local/bin +INSTALLPATH = $(DESTDIR)/usr/bin PROGNAME = proxytunnel OBJ = proxytunnel.o \ diff --git a/debian/control b/debian/control index dfb610d..855eb3e 100644 --- a/debian/control +++ b/debian/control @@ -12,5 +12,6 @@ Suggests: ssh Description: Create tcp tunnels trough HTTPS proxies, for using with SSH Proxytunnel is a program that connects stdin and stdout to an origin server somewhere in the Internet through an industry - standard HTTPS proxy. I originally wrote this program to be used - as an extension to SSH, to be able to SSH to my box at home. + standard HTTPS proxy. It was originally written to be used + as an extension to SSH, to be used to SSH to a box at home. It's possible + to use proxytunnel along with other applications as well. diff --git a/debian/copyright b/debian/copyright index d63c6b1..5dc6e82 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -This package was debianized by Mark Janssen on +This package was debianized by Mark Janssen on Wed, 4 Sep 2002 13:55:15 +0200. It was downloaded from http://proxytunnel.sourceforge.net @@ -8,3 +8,24 @@ Upstream Author(s): Mark Janssen and Jos Visser Copyright: Proxytunnel is (C) Copyright 2001, 2002 Mark Janssen and Jos Visser + +Proxytunnel is covered by the GNU GPL. It can be found in +/usr/share/common-licenses/GPL. Most of the code was written by Jos +Visser and Mark Janssen, the snippet of base64 code came from mutt, +and was written by: Brendan Cully and came with +the following copyright notice: + +/* + * This code is heavily modified from fetchmail (also GPL'd, of + * course) by Brendan Cully . + * + * Original copyright notice: + * + * The code in the fetchmail distribution is Copyright 1997 by Eric + * S. Raymond. Portions are also copyrighted by Carl Harris, 1993 + * and 1995. Copyright retained for the purpose of protecting free + * redistribution of source. + */ + +Other contributors can be found in the CREDITS file + diff --git a/debian/dirs b/debian/dirs index ca882bb..a65408f 100644 --- a/debian/dirs +++ b/debian/dirs @@ -1,2 +1,2 @@ usr/bin -usr/sbin +usr/share/man diff --git a/debian/docs b/debian/docs index 9d64b76..94a0111 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1,2 @@ -LICENSE.txt +CREDITS README diff --git a/debian/rules b/debian/rules index d3dfbaa..16899dd 100755 --- a/debian/rules +++ b/debian/rules @@ -66,16 +66,16 @@ binary-arch: build install dh_testroot # dh_installdebconf dh_installdocs - dh_installexamples - dh_installmenu +# dh_installexamples +# dh_installmenu # dh_installlogrotate # dh_installemacsen # dh_installpam # dh_installmime # dh_installinit - dh_installcron - dh_installman - dh_installinfo +# dh_installcron + dh_installman debian/proxytunnel.1 +# dh_installinfo # dh_undocumented dh_installchangelogs CHANGES dh_link