[Pkg-kde-commits] rev 1704 - in branches/kde-3.4.0/packages/kdenetwork/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-09-05 23:36:22 +0000 (Mon, 05 Sep 2005)
New Revision: 1704

Added:
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/14_kppp_doc_pointer.diff
Removed:
   branches/kde-3.4.0/packages/kdenetwork/debian/kdnssd.install
Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
   branches/kde-3.4.0/packages/kdenetwork/debian/control
   branches/kde-3.4.0/packages/kdenetwork/debian/kdenetwork-dev.install
   branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian
Log:
Revert some unncessary file includes for the time being (we have no zeroconf
package yet, and there are no apidocs for kdenetwork).

Also add a patch to point kppp users to our README, which I've revamped.


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-05 23:34:32 UTC (rev 1703)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-05 23:36:22 UTC (rev 1704)
@@ -1,9 +1,15 @@
 kdenetwork (4:3.4.2-3) unstable; urgency=low
 
-  * Add new files to respective debian/*.install files
+  +++ Changes by Christopher Martin:
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri,  2 Sep 2005 20:39:19 +0200
+  * Add a patch which ensures that KPPP users who encounter connection errors
+    are pointed to the package's README.Debian, if KPPP has no other
+    suggestions. (Closes: #324867)
 
+  * Improve and expand the kppp.README.Debian.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  4 Sep 2005 13:59:19 -0400
+
 kdenetwork (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Luk Claes:

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-09-05 23:34:32 UTC (rev 1703)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/control	2005-09-05 23:36:22 UTC (rev 1704)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>, Luk Claes <luk at debian.org>
 Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.4.2), libgadu-dev, libiw-dev (>> 27+28pre8), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386], xmms-dev, libxxf86vm-dev
 Standards-Version: 3.6.2
 

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/kdenetwork-dev.install
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/kdenetwork-dev.install	2005-09-05 23:34:32 UTC (rev 1703)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/kdenetwork-dev.install	2005-09-05 23:36:22 UTC (rev 1704)
@@ -66,4 +66,3 @@
 debian/tmp/usr/include/kde/kopete/ui/kopetepassworddialog.h
 debian/tmp/usr/include/kde/kopete/ui/kopetefileconfirmdialog.h
 debian/tmp/usr/include/kde/kopete/ui/kopetecontactaction.h
-debian/tmp/usr/share/doc/kde/HTML/en/kdenetwork-apidocs/common

Deleted: branches/kde-3.4.0/packages/kdenetwork/debian/kdnssd.install

Modified: branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian	2005-09-05 23:34:32 UTC (rev 1703)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/kppp.README.Debian	2005-09-05 23:36:22 UTC (rev 1704)
@@ -1,17 +1,32 @@
-kppp and execution of kppp
-==========================
+Configuring and Running KPPP
+============================
 
-In order to actually use kppp you must first be a part of the "dip" group.
-This is the standard for using ppp in general with Debian.  If you are not a
-member of this group, you will not be able to run pppd or setup connections.
+In order to use KPPP, you must first be a member of the "dip" group.
+Membership in this group is a prerequisite for any and all use of ppp in
+Debian. If you are not a member of this group, you will not be able to run
+the ppp daemon (pppd) or make a dialup connection.
 
-Furthermore, kppp requires that the ppp daemon be run with the "noauth"
-option.  However, pppd's default setting, in /etc/ppp/options, is "auth",
-and for security reasons it should remain so.  To work around this problem,
-uncomment "noauth" in /etc/ppp/peers/kppp-options.  You should then be able
-to connect.
+KPPP also requires that the ppp daemon be run with the "noauth" option.
+However, pppd's default setting, in /etc/ppp/options, is "auth", and for
+security reasons it should remain so. To work around this problem, uncomment
+"noauth" in /etc/ppp/peers/kppp-options. You should then be able to connect.
 
 Note that if "noauth" is uncommented, a setting of "noauth" in
-/etc/ppp/options will conflict with kppp. Note also that uncommenting
+/etc/ppp/options will conflict with KPPP. Note also that uncommenting
 "noauth" opens the possibility that other malicious members of the "dip"
-group could now potentially abuse the ppp daemon with the "noauth" option.
+group might potentially abuse the ppp daemon.
+
+Finally, if you are uncertain as to which device node represents your modem,
+you can try to find out by running "dmesg | grep tty". The output of this
+command will often provide a sufficient hint.
+
+If the answer seems to be that your modem is on a node, such as ttyS14, that
+KPPP does not accept as a configuration option, then you should create a
+symlink from that node to /dev/modem (by running, as root,
+"ln -s /dev/ttyS14 /dev/modem", where ttyS14 is replaced by whatever node your
+modem is on). Then simply configure KPPP to use /dev/modem.
+
+If you use udev, then symlinks in /dev will not be preserved
+across reboots. In this case, you should edit, as root, /etc/udev/links.conf,
+adding a line that resembles "L modem    /dev/ttyS14". You must then either
+reboot, or run "/etc/init.d/udev restart", for the link to be created.

Added: branches/kde-3.4.0/packages/kdenetwork/debian/patches/14_kppp_doc_pointer.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/14_kppp_doc_pointer.diff	2005-09-05 23:34:32 UTC (rev 1703)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/14_kppp_doc_pointer.diff	2005-09-05 23:36:22 UTC (rev 1704)
@@ -0,0 +1,13 @@
+--- kde.orig/kppp/ppplog.cpp
++++ kde.patched/kppp/ppplog.cpp
+@@ -188,7 +188,10 @@
+   }
+ 
+   if (result.isEmpty())
++  {
+     result.append(i18n("Unable to provide help."));
++    result.append("Please refer to /usr/share/doc/kppp/README.Debian for more information.");
++  }
+ }
+ 
+