From a21cdbd2314e8bb9cc65cb7758f2af6da8f1e132 Mon Sep 17 00:00:00 2001 From: Mark Janssen Date: Thu, 30 Sep 2004 09:44:30 +0000 Subject: [PATCH] Working to release... check documents and Makefiles Update version numbers to 1.2.0 git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@58 bc163920-b10d-0410-b2c5-a5491ca2ceef --- Makefile | 4 ++-- Makefile.cygwin | 4 +++- Makefile.darwin | 7 ++++--- Makefile.no-gnu-getopts | 4 +++- _copyright.inc | 2 +- cmdline.c | 2 +- debian/changelog | 7 +++++++ debian/copyright | 2 +- 8 files changed, 22 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 0356c4d..ff090f9 100755 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ CC = gcc CFLAGS = -Wall -DHAVE_GETOPT_LONG LDFLAGS = -INSTALLPATH = $(DESTDIR)/usr/bin -MANPATH = $(DESTDIR)/usr/man/man1 +INSTALLPATH = $(DESTDIR)/usr/local/bin +MANPATH = $(DESTDIR)/usr/local/man/man1 PROGNAME = proxytunnel OBJ = proxytunnel.o \ diff --git a/Makefile.cygwin b/Makefile.cygwin index 2d762fe..edefc8e 100755 --- a/Makefile.cygwin +++ b/Makefile.cygwin @@ -5,7 +5,8 @@ CC = gcc CFLAGS = -Wall -DHAVE_GETOPT_LONG -DCYGWIN LDFLAGS = -INSTALLPATH = /usr/local/bin +INSTALLPATH = $(DESTDIR)/usr/local/bin +MANPATH = $(DESTDIR)/usr/local/man/man1 PROGNAME = proxytunnel OBJ = proxytunnel.o \ @@ -25,3 +26,4 @@ clean: install: mkdir -p $(INSTALLPATH) install -g root -m755 -o root $(PROGNAME) $(INSTALLPATH)/$(PROGNAME) + install -g root -m644 -o root debian/$(PROGNAME).1 $(MANPATH)/$(PROGNAME).1 diff --git a/Makefile.darwin b/Makefile.darwin index cb9992a..0ddfc4d 100755 --- a/Makefile.darwin +++ b/Makefile.darwin @@ -1,12 +1,12 @@ # Makefile for proxytunnel # # Please uncomment the appropriate settings -# Customized for MacOS-X (Darwin) -CC = cc +CC = gcc CFLAGS = -Wall -DDARWIN LDFLAGS = -INSTALLPATH = /usr/local/bin +INSTALLPATH = $(DESTDIR)/usr/local/bin +MANPATH = $(DESTDIR)/usr/local/man/man1 PROGNAME = proxytunnel OBJ = proxytunnel.o \ @@ -26,3 +26,4 @@ clean: install: mkdir -p $(INSTALLPATH) install -g root -m755 -o root $(PROGNAME) $(INSTALLPATH)/$(PROGNAME) + install -g root -m644 -o root debian/$(PROGNAME).1 $(MANPATH)/$(PROGNAME).1 diff --git a/Makefile.no-gnu-getopts b/Makefile.no-gnu-getopts index a1723ef..6ee4e6a 100755 --- a/Makefile.no-gnu-getopts +++ b/Makefile.no-gnu-getopts @@ -5,7 +5,8 @@ CC = gcc CFLAGS = -Wall LDFLAGS = -INSTALLPATH = /usr/local/bin +INSTALLPATH = $(DESTDIR)/usr/local/bin +MANPATH = $(DESTDIR)/usr/local/man/man1 PROGNAME = proxytunnel OBJ = proxytunnel.o \ @@ -25,3 +26,4 @@ clean: install: mkdir -p $(INSTALLPATH) install -g root -m755 -o root $(PROGNAME) $(INSTALLPATH)/$(PROGNAME) + install -g root -m644 -o root debian/$(PROGNAME).1 $(MANPATH)/$(PROGNAME).1 diff --git a/_copyright.inc b/_copyright.inc index 9e6df32..7083fbd 100644 --- a/_copyright.inc +++ b/_copyright.inc @@ -1,4 +1,4 @@ -/* Proxytunnel - (C) 2001-2002 Jos Visser / Mark Janssen */ +/* Proxytunnel - (C) 2001-2004 Jos Visser / Mark Janssen */ /* Contact: josv@osp.nl / maniac@maniac.nl */ /* diff --git a/cmdline.c b/cmdline.c index fd99c17..9762c43 100755 --- a/cmdline.c +++ b/cmdline.c @@ -1,4 +1,4 @@ -/* Proxytunnel - (C) 2001-2002 Jos Visser / Mark Janssen */ +/* Proxytunnel - (C) 2001-2004 Jos Visser / Mark Janssen */ /* Contact: josv@osp.nl / maniac@maniac.nl */ /* diff --git a/debian/changelog b/debian/changelog index c27b06d..3455d62 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +proxytunnel (1.2.0-1) unstable; urgency=low + + * Added patch by Fred Donck to store proxy username + and password in environment variables. + + -- Mark Janssen Thu Sep 30 11:22:03 CEST 2004 + proxytunnel (1.1.2-1) unstable; urgency=low * More cleaning up, added manpage. diff --git a/debian/copyright b/debian/copyright index 5dc6e82..6ab2883 100644 --- a/debian/copyright +++ b/debian/copyright @@ -7,7 +7,7 @@ Upstream Author(s): Mark Janssen and Jos Visser Copyright: -Proxytunnel is (C) Copyright 2001, 2002 Mark Janssen and Jos Visser +Proxytunnel is (C) Copyright 2001, 2004 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