Merged revisions 10758-10831 via svnmerge from

/branches/wvstreams_4_2


git-svn-id: file:///home/apenwarr/alumnit-svn/public/releases/freesw@10832 6619c942-59fa-0310-bf43-a07aaa81d9ac

Makefile

@@ -32,9 +32,12 @@ include $(TOPDIR)/wvrules.mk
 default: all papchaptest
 all: wvdial.a wvdial wvdialconf pppmon
 
-wvdial.a: wvdialer.o wvdialtext.o wvmodemscan.o wvpapchap.o wvdialbrain.o \
+wvdial.a: wvdialer.o wvmodemscan.o wvpapchap.o wvdialbrain.o \
 	wvdialmon.o
 
+ifeq ($(WVSTREAMS_LIB),)
+ LIBUNICONF:=-luniconf
+endif
 wvdial wvdialconf papchaptest pppmon: wvdial.a $(LIBUNICONF)
 
 install-bin: all

debian/changelog

@@ -1,3 +1,20 @@
+wvdial (1.56-1) unstable; urgency=low
+
+  * New upstream release.
+    - Understand "no answer" from modem.  (Closes: Bug#181098)
+    - wvdialconf defaults to editing /etc/wvdial.conf.  (Closes: Bug#201671)
+    - You can set options on the command line.  (Closes: Bug#246697)
+    - Support crippled serial ports again.  (Closes: Bug#294999)
+  * Don't clobber too much on a purge.  (Closes: Bug#236616)
+  * Use Debhelper 4.  (Closes: Bug#332948)
+  * Postinst now uses chown properly.  (Closes: Bug#332949)
+  * Lintian clean.  (Closes: Bug#332950)
+  * Allow WvDial to configure itself non-interactively.
+  * Acknowledge non-maintainer upload.
+    (Closes: Bug#289129, Bug#291506, Bug#289236, Bug#331511)
+
+ -- Simon Law <sfllaw@debian.org>  Fri,  2 Dec 2005 01:30:40 -0500
+
 wvdial (1.54.0-1.1) unstable; urgency=high
 
   * Non-maintainer upload.

debian/control

@@ -2,14 +2,14 @@ Source: wvdial
 Section: comm
 Priority: optional
 Maintainer: Simon Law <sfllaw@debian.org>
-Uploaders: Baruch Even <baruch@debian.org>, James Morrison <phython@debian.org>, Patrick Patterson <ppatters@debian.org>
-Build-Depends: debhelper (>> 4.0), libwvstreams-dev (>= 5.0), pkg-config
-Standards-Version: 3.6.1
+Uploaders: James Morrison <phython@debian.org>, Patrick Patterson <ppatters@debian.org>
+Build-Depends: debhelper (>> 4.0), libwvstreams-dev (>= 4.0), pkg-config
+Standards-Version: 3.6.2.1
 
 Package: wvdial
 Architecture: any
 Depends: ppp (>= 2.3.0), ${shlibs:Depends}
-Description: PPP dialer with built-in intelligence.
+Description: PPP dialer with built-in intelligence
  WvDial sacrifices some of the flexibility of programs like "chat" in order
  to make your dialup configuration easier.  When you install this package,
  your modem will be detected automatically and you need to specify just

debian/rules

@@ -10,7 +10,8 @@
 build: build-stamp
 build-stamp:
 	dh_testdir
-	$(MAKE) CXXOPTS="-fno-implement-inlines -fno-rtti -fno-exceptions"
+	$(MAKE) CXXOPTS="-fno-implement-inlines -fno-rtti -fno-exceptions" \
+		VERBOSE=1
 	touch build-stamp
 
 clean:
@@ -30,13 +31,14 @@ binary-arch: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	$(MAKE) prefix=`pwd`/debian/tmp/usr \
-		PPPDIR=`pwd`/debian/tmp/etc/ppp/peers \
+	$(MAKE) prefix=`pwd`/debian/wvdial/usr \
+		PPPDIR=`pwd`/debian/wvdial/etc/ppp/peers \
 		install-bin
-	cp debian/pon.wvdial debian/poff.wvdial debian/tmp/usr/bin/
+	cp debian/pon.wvdial debian/poff.wvdial debian/wvdial/usr/bin/
 	dh_installdocs
 	dh_installman
 	dh_installchangelogs ChangeLog
+	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms

debian/wvdial.manpages

@@ -1,3 +1,4 @@
 wvdial.1
 wvdialconf.1
 wvdial.conf.5
+pon.wvdial.1

pon.wvdial.1

@@ -1,17 +1,20 @@
-.TH PON.WVDIAL 1 "Sept 2003" "Worldvisions WvDial -- pon/poff"
-
+.TH PON.WVDIAL 1 "December 2005" "WvDial"
+.\"
 .SH NAME
 pon.wvdial - A pon replacement.
 .br
 poff.wvdial - A poff replacement.
-
+.\"
 .SH DESCRIPTION
 .B pon.wvdial
 .br
+.TR
 .B poff.wvdial
 .br
+.RS
 Replacement scripts for pon and poff.
-
+.RE
+\."
 .SH SEE ALSO
 .BR wvdial (1),
 .BR pon (1),