[Pkg-kde-commits] rev 332 - in branches/kde-3.3.2: kdemultimedia/debian kdemultimedia/debian/patches kdenetwork/debian kdenetwork/debian/patches
Christopher Martin
chrsmrtn-guest@haydn.debian.org
Fri, 17 Dec 2004 08:43:27 -0700
Author: chrsmrtn-guest
Date: 2004-12-17 08:42:20 -0700 (Fri, 17 Dec 2004)
New Revision: 332
Added:
branches/kde-3.3.2/kdemultimedia/debian/patches/07_xlibs-static-pic.diff
branches/kde-3.3.2/kdenetwork/debian/patches/07_xlibs-static-pic.diff
Removed:
branches/kde-3.3.2/kdemultimedia/debian/patches/06_xlibs-static-pic.diff
branches/kde-3.3.2/kdenetwork/debian/patches/06_xlibs-static-pic.diff
Modified:
branches/kde-3.3.2/kdemultimedia/debian/control
branches/kde-3.3.2/kdemultimedia/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdemultimedia/debian/patches/03_libtool_arm.diff
branches/kde-3.3.2/kdemultimedia/debian/patches/04_am_maintainer_mode.diff
branches/kde-3.3.2/kdemultimedia/debian/patches/05_pedantic-errors.diff
branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff
branches/kde-3.3.2/kdemultimedia/debian/patches/10_dont-define-__64.diff
branches/kde-3.3.2/kdenetwork/debian/control
branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff
branches/kde-3.3.2/kdenetwork/debian/patches/03_libtool_arm.diff
branches/kde-3.3.2/kdenetwork/debian/patches/04_am_maintainer_mode.diff
branches/kde-3.3.2/kdenetwork/debian/patches/05_pedantic-errors.diff
branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff
branches/kde-3.3.2/kdenetwork/debian/patches/10_pppdargs.diff
branches/kde-3.3.2/kdenetwork/debian/rules
Log:
Add new uploader, update kdenetwork/rules,
fiddle with patch aesthetics and numbering.
Nothing important.
Modified: branches/kde-3.3.2/kdemultimedia/debian/control
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/control 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/control 2004-12-17 15:42:20 UTC (rev 332)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Adeodato Simó <asp16@alu.ua.es>
Build-Depends: cdparanoia, debhelper (>> 4.2.0), gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libcdparanoia0-dev, libesd0-dev, libflac-dev, liboggflac-dev, libsamplerate0-dev, libspeex-dev, libtag1-dev (>> 1.3.1), libtiff4-dev, libtunepimp-bin, libtunepimp2-dev, libxaw7-dev, libxine-dev, sharutils, texinfo, xlibs-static-pic
Standards-Version: 3.6.1
Modified: branches/kde-3.3.2/kdemultimedia/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/02_autotools_update.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/02_autotools_update.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,5 +1,5 @@
---- kdemultimedia-3.3.1/admin/compile 2002-09-30 07:18:17.000000000 -0500
-+++ kdemultimedia-patched/admin/compile 2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/compile
++++ kdemultimedia-patched/admin/compile
@@ -1,8 +1,9 @@
#! /bin/sh
-
@@ -181,8 +181,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdemultimedia-3.3.1/admin/config.guess 2004-08-02 09:17:40.000000000 -0500
-+++ kdemultimedia-patched/admin/config.guess 2004-08-25 09:25:50.000000000 -0500
+--- kdemultimedia-orig/admin/config.guess
++++ kdemultimedia-patched/admin/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -244,8 +244,8 @@
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
---- kdemultimedia-3.3.1/admin/depcomp 2003-04-16 16:53:18.000000000 -0500
-+++ kdemultimedia-patched/admin/depcomp 2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/depcomp
++++ kdemultimedia-patched/admin/depcomp
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -716,8 +716,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdemultimedia-3.3.1/admin/install-sh 2003-08-07 04:41:31.000000000 -0500
-+++ kdemultimedia-patched/admin/install-sh 2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/install-sh
++++ kdemultimedia-patched/admin/install-sh
@@ -1,19 +1,38 @@
#!/bin/sh
-#
@@ -1267,8 +1267,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdemultimedia-3.3.1/admin/missing 2002-10-26 11:44:28.000000000 -0500
-+++ kdemultimedia-patched/admin/missing 2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/missing
++++ kdemultimedia-patched/admin/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -1525,8 +1525,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- kdemultimedia-3.3.1/admin/mkinstalldirs 2002-10-26 11:53:16.000000000 -0500
-+++ kdemultimedia-patched/admin/mkinstalldirs 2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/mkinstalldirs
++++ kdemultimedia-patched/admin/mkinstalldirs
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1651,8 +1651,8 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
---- kdemultimedia-3.3.1/admin/ylwrap 2001-10-04 19:46:36.000000000 -0500
-+++ kdemultimedia-patched/admin/ylwrap 2004-11-03 20:01:22.000000000 -0600
+--- kdemultimedia-orig/admin/ylwrap
++++ kdemultimedia-patched/admin/ylwrap
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Modified: branches/kde-3.3.2/kdemultimedia/debian/patches/03_libtool_arm.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/03_libtool_arm.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/03_libtool_arm.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,6 +1,5 @@
-diff -Nrua kdemultimedia-3.2.2/admin/libtool.m4.in kdemultimedia-patched/admin/libtool.m4.in
---- kdemultimedia-3.2.2/admin/libtool.m4.in 2004-04-02 09:41:05.000000000 -0600
-+++ kdemultimedia-patched/admin/libtool.m4.in 2004-04-16 00:37:07.000000000 -0500
+--- kdemultimedia-orig/admin/libtool.m4.in
++++ kdemultimedia-patched/admin/libtool.m4.in
@@ -2180,17 +2180,7 @@
# This must be Linux ELF.
Modified: branches/kde-3.3.2/kdemultimedia/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/04_am_maintainer_mode.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/04_am_maintainer_mode.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,6 +1,5 @@
-diff -Nru kdemultimedia-3.1.4/admin/configure.in.min kdemultimedia-patched/admin/configure.in.min
---- kdemultimedia-3.1.4/admin/configure.in.min 2001-11-07 05:17:28.000000000 -0600
-+++ kdemultimedia-patched/admin/configure.in.min 2003-10-17 22:10:16.000000000 -0500
+--- kdemultimedia-orig/admin/configure.in.min
++++ kdemultimedia-patched/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
Modified: branches/kde-3.3.2/kdemultimedia/debian/patches/05_pedantic-errors.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/05_pedantic-errors.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/05_pedantic-errors.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,6 +1,5 @@
-diff -Nrua kdemultimedia-3.2.92/admin/acinclude.m4.in kdemultimedia-patched/admin/acinclude.m4.in
---- kdemultimedia-3.2.92/admin/acinclude.m4.in 2004-07-28 03:54:09.000000000 -0500
-+++ kdemultimedia-patched/admin/acinclude.m4.in 2004-07-28 03:54:40.000000000 -0500
+--- kdemultimedia-orig/admin/acinclude.m4.in
++++ kdemultimedia-patched/admin/acinclude.m4.in
@@ -2087,9 +2087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
Modified: branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/06_automake-1.9.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,5 +1,5 @@
---- a/admin/detect-autoconf.sh
-+++ b/admin/detect-autoconf.sh
+--- kdemultimedia-orig/admin/detect-autoconf.sh
++++ kdemultimedia-patched/admin/detect-autoconf.sh
@@ -11,7 +11,7 @@
# needed to compile KDE. Do not forget to include the name/version #
# separator if one is present, e.g. -1.2 where - is the separator.
Deleted: branches/kde-3.3.2/kdemultimedia/debian/patches/06_xlibs-static-pic.diff
Added: branches/kde-3.3.2/kdemultimedia/debian/patches/07_xlibs-static-pic.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/07_xlibs-static-pic.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/07_xlibs-static-pic.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -0,0 +1,20 @@
+--- kdemultimedia-orig/mpeglib/configure.in.in
++++ kdemultimedia-patched/mpeglib/configure.in.in
+@@ -88,7 +88,7 @@
+ AC_MSG_RESULT($x11_dga2)
+ if test x$x11_dga2 = xyes; then
+ AC_DEFINE(X11_DGA2,1,[Define if you have XFree4.0 DGA 2.0])
+- DGALIBS="-lXxf86dga"
++ DGALIBS="-lXxf86dga_pic"
+ fi
+
+ AC_MSG_CHECKING(for X11 video extension)
+@@ -118,7 +118,7 @@
+ AC_MSG_RESULT($x11_xvidmode)
+ if test x$x11_xvidmode = xyes; then
+ AC_DEFINE(X11_XVIDMODE,1,[Define if you have XVidModeextension])
+- XVIDMODELIBS="-lXxf86vm"
++ XVIDMODELIBS="-lXxf86vm_pic"
+ fi
+
+
Modified: branches/kde-3.3.2/kdemultimedia/debian/patches/10_dont-define-__64.diff
===================================================================
--- branches/kde-3.3.2/kdemultimedia/debian/patches/10_dont-define-__64.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdemultimedia/debian/patches/10_dont-define-__64.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,5 +1,5 @@
---- a/mpeglib/lib/input/cdromAccess.cpp
-+++ b/mpeglib/lib/input/cdromAccess.cpp
+--- kdemultimedia-orig/mpeglib/lib/input/cdromAccess.cpp
++++ kdemultimedia-patched/mpeglib/lib/input/cdromAccess.cpp
@@ -25,11 +25,13 @@
#ifdef OS_Linux
#include <linux/version.h>
Modified: branches/kde-3.3.2/kdenetwork/debian/control
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/control 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/control 2004-12-17 15:42:20 UTC (rev 332)
@@ -2,7 +2,7 @@
Section: kde
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Uploaders: Christopher L Cheney <ccheney@debian.org>, Riku Voipio <riku.voipio@iki.fi>
+Uploaders: Christopher L Cheney <ccheney@debian.org>, Riku Voipio <riku.voipio@iki.fi>, Adeodato Simó <asp16@alu.ua.es>
Build-Depends: debhelper (>> 4.2.0), docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>> 4:3.3.2), libgadu-dev, libiw-dev, libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, qt3-doc, sharutils, valgrind [i386], xlibs-static-pic, xmms-dev
Standards-Version: 3.6.1
Modified: branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/02_autotools_update.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,5 +1,5 @@
---- a/admin/compile
-+++ b/admin/compile
+--- kdenetwork-orig/admin/compile
++++ kdenetwork-patched/admin/compile
@@ -1,8 +1,9 @@
#! /bin/sh
-
@@ -181,8 +181,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- a/admin/config.guess
-+++ b/admin/config.guess
+--- kdenetwork-orig/admin/config.guess
++++ kdenetwork-patched/admin/config.guess
@@ -3,7 +3,7 @@
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
@@ -244,8 +244,8 @@
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
exit 0 ;;
---- a/admin/depcomp
-+++ b/admin/depcomp
+--- kdenetwork-orig/admin/depcomp
++++ kdenetwork-patched/admin/depcomp
@@ -1,7 +1,9 @@
#! /bin/sh
-
@@ -716,8 +716,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- a/admin/install-sh
-+++ b/admin/install-sh
+--- kdenetwork-orig/admin/install-sh
++++ kdenetwork-patched/admin/install-sh
@@ -1,19 +1,38 @@
#!/bin/sh
-#
@@ -1267,8 +1267,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- a/admin/missing
-+++ b/admin/missing
+--- kdenetwork-orig/admin/missing
++++ kdenetwork-patched/admin/missing
@@ -1,6 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -1525,8 +1525,8 @@
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:
---- a/admin/mkinstalldirs
-+++ b/admin/mkinstalldirs
+--- kdenetwork-orig/admin/mkinstalldirs
++++ kdenetwork-patched/admin/mkinstalldirs
@@ -1,20 +1,32 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -1651,8 +1651,8 @@
+# time-stamp-end: "$"
# End:
-# mkinstalldirs ends here
---- a/admin/ylwrap
-+++ b/admin/ylwrap
+--- kdenetwork-orig/admin/ylwrap
++++ kdenetwork-patched/admin/ylwrap
@@ -1,6 +1,11 @@
#! /bin/sh
# ylwrap - wrapper for lex/yacc invocations.
Modified: branches/kde-3.3.2/kdenetwork/debian/patches/03_libtool_arm.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/03_libtool_arm.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/03_libtool_arm.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,6 +1,5 @@
-diff -Nrua kdenetwork-3.2.2/admin/libtool.m4.in kdenetwork-patched/admin/libtool.m4.in
---- kdenetwork-3.2.2/admin/libtool.m4.in 2004-04-02 09:41:05.000000000 -0600
-+++ kdenetwork-patched/admin/libtool.m4.in 2004-04-16 03:44:45.000000000 -0500
+--- kdenetwork-orig/admin/libtool.m4.in
++++ kdenetwork-patched/admin/libtool.m4.in
@@ -2180,17 +2180,7 @@
# This must be Linux ELF.
Modified: branches/kde-3.3.2/kdenetwork/debian/patches/04_am_maintainer_mode.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/04_am_maintainer_mode.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/04_am_maintainer_mode.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,6 +1,5 @@
-diff -Nru kdenetwork-3.1.4/admin/configure.in.min kdenetwork-patched/admin/configure.in.min
---- kdenetwork-3.1.4/admin/configure.in.min 2001-11-07 05:17:28.000000000 -0600
-+++ kdenetwork-patched/admin/configure.in.min 2003-10-18 00:29:11.000000000 -0500
+--- kdenetwork-orig/admin/configure.in.min
++++ kdenetwork-patched/admin/configure.in.min
@@ -38,6 +38,8 @@
dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs
Modified: branches/kde-3.3.2/kdenetwork/debian/patches/05_pedantic-errors.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/05_pedantic-errors.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/05_pedantic-errors.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,6 +1,5 @@
-diff -Nrua kdenetwork-3.3.0/admin/acinclude.m4.in kdenetwork-patched/admin/acinclude.m4.in
---- kdenetwork-3.3.0/admin/acinclude.m4.in 2004-07-26 09:13:36.000000000 -0500
-+++ kdenetwork-patched/admin/acinclude.m4.in 2004-08-14 18:03:32.000000000 -0500
+--- kdenetwork-orig/admin/acinclude.m4.in
++++ kdenetwork-patched/admin/acinclude.m4.in
@@ -2087,9 +2087,6 @@
save_CXXFLAGS="$CXXFLAGS"
kde_safe_LIBS="$LIBS"
Modified: branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/06_automake-1.9.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,5 +1,5 @@
---- a/admin/detect-autoconf.sh
-+++ b/admin/detect-autoconf.sh
+--- kdenetwork-orig/admin/detect-autoconf.sh
++++ kdenetwork-patched/admin/detect-autoconf.sh
@@ -11,7 +11,7 @@
# needed to compile KDE. Do not forget to include the name/version #
# separator if one is present, e.g. -1.2 where - is the separator.
Deleted: branches/kde-3.3.2/kdenetwork/debian/patches/06_xlibs-static-pic.diff
Added: branches/kde-3.3.2/kdenetwork/debian/patches/07_xlibs-static-pic.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/07_xlibs-static-pic.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/07_xlibs-static-pic.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -0,0 +1,10 @@
+--- kdenetwork-orig/krdc/configure.in.in
++++ kdenetwork-patched/krdc/configure.in.in
+@@ -1,6 +1,6 @@
+ KDE_CHECK_HEADER(X11/extensions/xf86vmode.h, [
+ AC_DEFINE(HAVE_VIDMODE_EXTENSION, 1, [defined if XFree86's VidMode extension is supported])
+- LIBXF86VIDMODE="-lXext -lXxf86vm"
++ LIBXF86VIDMODE="-lXext -lXxf86vm_pic"
+ ], ,
+ [
+ #include <X11/Xlib.h>
Modified: branches/kde-3.3.2/kdenetwork/debian/patches/10_pppdargs.diff
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/patches/10_pppdargs.diff 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/patches/10_pppdargs.diff 2004-12-17 15:42:20 UTC (rev 332)
@@ -1,6 +1,5 @@
-diff -Nrua kdenetwork-3.1.95/kppp/pppdargs.cpp kdenetwork-patched/kppp/pppdargs.cpp
---- kdenetwork-3.1.95/kppp/pppdargs.cpp 2004-01-17 06:54:17.000000000 -0600
-+++ kdenetwork-patched/kppp/pppdargs.cpp 2004-01-27 03:57:55.000000000 -0600
+--- kdenetwork-orig/kppp/pppdargs.cpp
++++ kdenetwork-patched/kppp/pppdargs.cpp
@@ -156,6 +156,8 @@
it != arglist.end();
++it )
Modified: branches/kde-3.3.2/kdenetwork/debian/rules
===================================================================
--- branches/kde-3.3.2/kdenetwork/debian/rules 2004-12-17 15:14:26 UTC (rev 331)
+++ branches/kde-3.3.2/kdenetwork/debian/rules 2004-12-17 15:42:20 UTC (rev 332)
@@ -72,7 +72,8 @@
# run configure with build tree $(objdir)
cd $(objdir) && \
- ../configure $(configkde) --enable-final
+ ../configure $(configkde) --enable-final \
+ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
touch configure-stamp
@@ -208,7 +209,7 @@
dh_fixperms -Xusr/bin/kppp -Xusr/bin/kppplogview
dh_perl
# dh_python
- dh_makeshlibs -V
+ env DH_COMPAT=3 dh_makeshlibs -V
dh_installdeb
dh_shlibdeps -ldebian/kopete/usr/lib:debian/librss1/usr/lib
dh_gencontrol