diff -u kdenetwork-3.5.9/debian/changelog kdenetwork-3.5.9/debian/changelog --- kdenetwork-3.5.9/debian/changelog +++ kdenetwork-3.5.9/debian/changelog @@ -1,3 +1,9 @@ +kdenetwork (4:3.5.9-0ubuntu1.1~hardy1) hardy-proposed; urgency=low + + * Corrects FTBFS on lpia (LP: #267991) + + -- Michael Casadevall Tue, 09 Sep 2008 03:22:27 +0000 + kdenetwork (4:3.5.9-0ubuntu1) hardy; urgency=low * New upstream release only in patch2: unchanged: --- kdenetwork-3.5.9.orig/debian/patches/98_ftbfs_fix.diff +++ kdenetwork-3.5.9/debian/patches/98_ftbfs_fix.diff @@ -0,0 +1,41 @@ +diff -Nur -x '*.orig' -x '*~' kdenetwork-3.5.9/configure.in kdenetwork-3.5.9.new/configure.in +--- kdenetwork-3.5.9/configure.in 2008-09-09 03:06:30.000000000 +0000 ++++ kdenetwork-3.5.9.new/configure.in 2008-09-09 03:16:04.000000000 +0000 +@@ -932,9 +932,7 @@ + + #ifndef STREAMS + +- #if defined(linux) +- #include +- #elif defined(__DragonFly__) ++ #if defined(__DragonFly__) + #include + #else + #include /* BSD, NeXT, etc. */ +diff -Nur -x '*.orig' -x '*~' kdenetwork-3.5.9/kppp/opener.cpp kdenetwork-3.5.9.new/kppp/opener.cpp +--- kdenetwork-3.5.9/kppp/opener.cpp 2008-02-13 09:37:48.000000000 +0000 ++++ kdenetwork-3.5.9.new/kppp/opener.cpp 2008-09-09 03:16:32.000000000 +0000 +@@ -72,8 +72,6 @@ + # include + # include + # include +-# elif defined HAVE_LINUX_IF_PPP_H +-# include + # endif + #else + # include +diff -Nur -x '*.orig' -x '*~' kdenetwork-3.5.9/kppp/pppstats.cpp kdenetwork-3.5.9.new/kppp/pppstats.cpp +--- kdenetwork-3.5.9/kppp/pppstats.cpp 2008-02-13 09:37:48.000000000 +0000 ++++ kdenetwork-3.5.9.new/kppp/pppstats.cpp 2008-09-09 03:16:59.000000000 +0000 +@@ -71,10 +71,7 @@ + #endif + #include /* *BSD, Linux, NeXT, Ultrix etc. */ + #ifndef HAVE_NET_IF_PPP_H +- #ifdef HAVE_LINUX_IF_PPP_H +- #include +- #include +- #elif defined(__DragonFly__) ++ #if defined(__DragonFly__) + #include + #include + #endif only in patch2: unchanged: --- kdenetwork-3.5.9.orig/debian/patches/99_autoconf.diff +++ kdenetwork-3.5.9/debian/patches/99_autoconf.diff @@ -0,0 +1,35 @@ +diff -Nur -x '*.orig' -x '*~' kdenetwork-3.5.9/configure kdenetwork-3.5.9.new/configure +--- kdenetwork-3.5.9/configure 2008-09-09 03:06:30.000000000 +0000 ++++ kdenetwork-3.5.9.new/configure 2008-09-09 03:19:25.000000000 +0000 +@@ -43428,9 +43428,7 @@ + + #ifndef STREAMS + +- #if defined(linux) +- #include +- #elif defined(__DragonFly__) ++ #if defined(__DragonFly__) + #include + #else + #include /* BSD, NeXT, etc. */ +@@ -43755,7 +43753,7 @@ + do + for j in openssl/ssl.h; + do +- echo "configure: 43758: $i/$j" >&5 ++ echo "configure: 43756: $i/$j" >&5 + if test -r "$i/$j"; then + echo "taking that" >&5 + ssl_incdir=$i +@@ -48196,11 +48194,6 @@ + + { (exit 0); exit 0; } + _ACEOF +-if test "x$with_fast_perl" = "xyes"; then +- perl -i.bak $ac_aux_dir/conf.change.pl $CONFIG_STATUS \ +- || mv $CONFIG_STATUS.bak $CONFIG_STATUS +- rm -f $CONFIG_STATUS.bak +-fi + chmod +x $CONFIG_STATUS + ac_clean_files=$ac_clean_files_save +