Bug#289236: wvdial - patch for RC bug

[Frank Lichtenheld]

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.0 +0100
+++ wvdial-1.54.0/debian/changelog  2005-01-21 10:13:31.0 +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/control2005-01-21 09:42:24.0 +0100
+++ wvdial-1.54.0/debian/control2005-01-21 09:47:45.0 +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.0 +0100
+++ wvdial-1.54.0/Makefile  2005-01-21 10:28:16.0 +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.mk2003-11-14 20:46:13.0 +0100
+++ wvdial-1.54.0/wvrules.mk2005-01-21 10:08:06.0 +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.

Bug#289236: wvdial - patch for RC bug

[Patrick Patterson]

Go for it - I'm still waiting for keyring-maint to re-enable my account :/

Pat.

On Thursday 20 January 2005 16:50, Frank Lichtenheld wrote:
> On Fri, Jan 07, 2005 at 11:47:33PM +0100, Artur R. Czechowski wrote:
> > There are two issues concerning this bug:
> >   1) missed dependency in libwvstreams-dev (#
>
> Fixed in unstable.
>
> >   2) files in libxplc0.3.10-dev are in location not under standard search
> >  path
>
> [...]
>
> > The 2nd issue requires one small change:
> >
> > --- rules.orig 2003-11-14 20:46:13.0 +0100
> > +++ rules 2005-01-07 23:46:21.0 +0100
> > @@ -10,7 +10,7 @@
> >  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"
> > CPPFLAGS="-I/usr/include/xplc-0.3.10" touch build-stamp
>
> The Right Thing(tm) would probably be to modify the upstream Makefile
> to use `pkg-config --cflags libwvstreams` for determining the include
> directories.
>
> If there aren't any objections I will upload a NMU tomorrow to fix
> this issue.
>
> Gruesse,

-- 
Patrick Patterson
Technical Ambassador
Net Integration Technologies R&D


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Bug#289236: wvdial - patch for RC bug

[Frank Lichtenheld]

On Fri, Jan 07, 2005 at 11:47:33PM +0100, Artur R. Czechowski wrote:
> There are two issues concerning this bug:
>   1) missed dependency in libwvstreams-dev (#

Fixed in unstable.

>   2) files in libxplc0.3.10-dev are in location not under standard search
>  path
[...]
> The 2nd issue requires one small change:
> 
> --- rules.orig2003-11-14 20:46:13.0 +0100
> +++ rules 2005-01-07 23:46:21.0 +0100
> @@ -10,7 +10,7 @@
>  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" 
> CPPFLAGS="-I/usr/include/xplc-0.3.10"
>   touch build-stamp

The Right Thing(tm) would probably be to modify the upstream Makefile
to use `pkg-config --cflags libwvstreams` for determining the include
directories.

If there aren't any objections I will upload a NMU tomorrow to fix
this issue.

Gruesse,
-- 
Frank Lichtenheld <[EMAIL PROTECTED]>
www: http://www.djpig.de/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]