NMU patch attached.
Gruesse,
--
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/
diff -Naur wvdial-1.54.0.bak/debian/changelog wvdial-1.54.0/debian/changelog
--- wvdial-1.54.0.bak/debian/changelog 2005-01-21 09:42:24.000000000 +0100
+++ wvdial-1.54.0/debian/changelog 2005-01-21 10:13:31.000000000 +0100
@@ -1,3 +1,14 @@
+wvdial (1.54.0-1.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Recompile with latest libwvstreams-dev (Closes: #291506)
+ * Use pkg-config to get the right compiler flags
+ (Closes: #289236)
+ * While I'm on it, remove .. and ../wvstreams from include paths,
+ since these should probably never be used in a Debian package
+
+ -- Frank Lichtenheld <[EMAIL PROTECTED]> Fri, 21 Jan 2005 09:42:37 +0100
+
wvdial (1.54.0-1) unstable; urgency=low
* New upstream release.
diff -Naur wvdial-1.54.0.bak/debian/control wvdial-1.54.0/debian/control
--- wvdial-1.54.0.bak/debian/control 2005-01-21 09:42:24.000000000 +0100
+++ wvdial-1.54.0/debian/control 2005-01-21 09:47:45.000000000 +0100
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Patrick Patterson <[EMAIL PROTECTED]>
Uploaders: Baruch Even <[EMAIL PROTECTED]>, James Morrison <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), libwvstreams-dev (>= 3.75)
+Build-Depends: debhelper (>> 3.0.0), libwvstreams-dev (>= 4.0.1-1.2),
pkg-config
Standards-Version: 3.5.9.0
Package: wvdial
diff -Naur wvdial-1.54.0.bak/Makefile wvdial-1.54.0/Makefile
--- wvdial-1.54.0.bak/Makefile 2003-11-14 20:46:13.000000000 +0100
+++ wvdial-1.54.0/Makefile 2005-01-21 10:28:16.000000000 +0100
@@ -1,6 +1,6 @@
ifeq ($(TOPDIR),)
TOPDIR=.
- PKGINC=/usr/include/wvstreams /usr/local/include/wvstreams
+ PKGINC=$(shell pkg-config --cflags libwvstreams)
LIBS := $(LIBS) \
$(shell $(CC) -lsupc++ 2>&1 | grep -q "undefined reference" \
&& echo " -lsupc++")
@@ -13,7 +13,7 @@
include $(TOPDIR)/wvrules.mk
-XPATH=.. ../wvstreams/include $(PKGINC)
+XPATH=$(PKGINC)
default: all papchaptest
all: wvdial.a wvdial wvdialconf pppmon
@@ -21,7 +21,7 @@
wvdial.a: wvdialer.o wvdialtext.o wvmodemscan.o wvpapchap.o wvdialbrain.o \
wvdialmon.o
-LIBS += -L../wvstreams -lwvutils -lwvstreams
+LIBS += -lwvutils -lwvstreams
wvdial wvdialconf papchaptest pppmon: wvdial.a
diff -Naur wvdial-1.54.0.bak/wvrules.mk wvdial-1.54.0/wvrules.mk
--- wvdial-1.54.0.bak/wvrules.mk 2003-11-14 20:46:13.000000000 +0100
+++ wvdial-1.54.0/wvrules.mk 2005-01-21 10:08:06.000000000 +0100
@@ -115,7 +115,7 @@
ALLDIRS = $(XPATH)
#VPATH = $(shell echo $(ALLDIRS) | sed 's/[ ][ ]*/:/g')
-INCFLAGS = $(addprefix -I,$(ALLDIRS))
+INCFLAGS = $(addprefix -I,$(patsubst -I%,%,$(ALLDIRS)))
#
# Typical compilation rules.
