Please find, for review, the debconf templates and packages descriptions for the ppp source package.
This review will last from Saturday, October 06, 2007 to Tuesday, October 16, 2007.
Please send reviews as unified diffs (diff -u) against the original
files. Comments about your proposed changes will be appreciated.
Your review should be sent as an answer to this mail.
When appropriate, I will send intermediate requests for review, with
"[RFRn]" (n>=2) as a subject tag.
When we will reach a consensus, I send a "Last Chance For
Comments" mail with "[LCFC]" as a subject tag.
Finally, the reviewed templates will be sent to the package maintainer
as a bug report, and a mail will be sent to this list with "[BTS]" as
a subject tag.
--- ../ppp.old/debian/ppp-udeb.templates 2007-09-23 07:20:03.737360559 +0200
+++ debian/ppp-udeb.templates 2007-10-02 07:50:47.784844299 +0200
@@ -5,7 +5,7 @@
Template: ppp/no_concentrators
Type: error
-_Description: No concentrator was found
+_Description: No PPPoE concentrator
All network interfaces have been probed, but a PPPoE concentrator was
not detected.
.
As suggested in the Devel. Reference an error/note template synospsis
is suggeste dto be a title rather than a sentence
@@ -16,7 +16,7 @@
Type: string
Default: _
Description: Interface name:
- Please enter the name of the network interface connected to your PPPoE
+ Please enter the name of the network interface connected to the PPPoE
modem.
"Unpersonnalise" (inshort, be neutral about whose system we're talking
about)
Template: ppp/username
@@ -24,7 +24,7 @@
_Description: PPP login:
Please enter the username for the PPP connection.
.
- This information should have been provided to you by your Internet Service
+ This information should have been provided by your Internet Service
Provider.
Ditto.
Maybve "should be provided" or even "is provided".
Template: ppp/password
@@ -32,12 +32,12 @@
_Description: PPP password:
Please enter the password for the PPP connection.
.
- This information should have been provided to you by your Internet Service
+ This information should have been provided by your Internet Service
Provider.
Ditto
Template: ppp/detect_failed
Type: error
-_Description: No Ethernet interface found
+_Description: No Ethernet interface
PPPoE networking cannot be configured because no Ethernet interface was
detected.
.
Ditto than 1st template
@@ -52,9 +52,9 @@
Type: error
_Description: Failed authentication
A PPPoE connection was attempted, but the provided login information was
- incorrect. Because of this the authentication failed.
+ probably incorrect.
The second sentence seems useless and redundant.
.
- Please make sure you type the correct username and password.
+ Please check the username and password you provided.
.
The configuration of PPPoE is aborted. It can be attempted again by
selecting the relevant menu entry.
@@ -62,9 +62,7 @@
Template: ppp/unhandled
Type: error
_Description: Unhandled error
- It seems that the attempt to create a connection resulted in an unhandled
- error. Probably there is some exceptional situation which prevents
- establishing the connection.
+ An unidentified error happened while attempting to create a connection.
More factual....and shorter.
--- ../ppp.old/debian/control 2007-09-23 07:20:03.737360559 +0200
+++ debian/control 2007-10-02 07:53:04.792651929 +0200
@@ -13,11 +13,11 @@
Conflicts: ppp-pam, ppp-udeb, pppdcapiplugin (<= 1:3.7.2005-07-09-2), makedev (<< 2.3.1-56)
Replaces: ppp-pam, ppp-udeb
Suggests: iptables
-Description: Point-to-Point Protocol (PPP) daemon
+Description: Point-to-Point Protocol (PPP) - daemon
Use a "generic family - specific package" synopsis
The Point-to-Point Protocol (PPP) provides a standard way to transmit
datagrams over a serial link, as well as a standard way for the machines
at either end of the link (the "peers") to negotiate various optional
- characteristics of the link. Using PPP, a serial link can be used to
+ characteristics of the link. Using PPP, a serial link can be used to
Remove double spaces.
Package: ppp-dev
Section: devel
Architecture: all
Priority: extra
Depends: ${shlibs:Depends}
-Description: Selected headers from the ppp package
- Contains some files needed to build some packages related to pppd.
+Description: Point-to-Point Protocol (PPP) - development files
+ The Point-to-Point Protocol (PPP) provides a standard way to transmit
+ datagrams over a serial link, as well as a standard way for the machines
+ at either end of the link (the "peers") to negotiate various optional
+ characteristics of the link. Using PPP, a serial link can be used to
+ transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections
+ between the peers.
+ .
+ This package provides files needed to build pppd-related software.
Add the generic paragraph in that package too.
--
Template: debian-installer/ppp-udeb/title
Type: text
# Main menu item
_Description: Configure and start a PPPoE connection
Template: ppp/no_concentrators
Type: error
_Description: No PPPoE concentrator
All network interfaces have been probed, but a PPPoE concentrator was
not detected.
.
The configuration of PPPoE is aborted. It can be attempted again by
selecting the relevant menu entry.
Template: ppp/interface
Type: string
Default: _
Description: Interface name:
Please enter the name of the network interface connected to the PPPoE
modem.
Template: ppp/username
Type: string
_Description: PPP login:
Please enter the username for the PPP connection.
.
This information should have been provided by your Internet Service
Provider.
Template: ppp/password
Type: password
_Description: PPP password:
Please enter the password for the PPP connection.
.
This information should have been provided by your Internet Service
Provider.
Template: ppp/detect_failed
Type: error
_Description: No Ethernet interface
PPPoE networking cannot be configured because no Ethernet interface was
detected.
.
The configuration of PPPoE is aborted. It can be attempted again by
selecting the relevant menu entry.
Template: ppp/detect_progress
Type: text
_Description: Searching for concentrators on ${IFACE}...
Template: ppp/wrong_login
Type: error
_Description: Failed authentication
A PPPoE connection was attempted, but the provided login information was
probably incorrect.
.
Please check the username and password you provided.
.
The configuration of PPPoE is aborted. It can be attempted again by
selecting the relevant menu entry.
Template: ppp/unhandled
Type: error
_Description: Unhandled error
An unidentified error happened while attempting to create a connection.
.
The configuration of PPPoE is aborted. It can be attempted again by
selecting the relevant menu entry.
Template: ppp/please_wait
Type: text
_Description: Please wait...
--- ../ppp.old/debian/ppp-udeb.templates 2007-09-23 07:20:03.737360559 +0200
+++ debian/ppp-udeb.templates 2007-10-02 07:50:47.784844299 +0200
@@ -5,7 +5,7 @@
Template: ppp/no_concentrators
Type: error
-_Description: No concentrator was found
+_Description: No PPPoE concentrator
All network interfaces have been probed, but a PPPoE concentrator was
not detected.
.
@@ -16,7 +16,7 @@
Type: string
Default: _
Description: Interface name:
- Please enter the name of the network interface connected to your PPPoE
+ Please enter the name of the network interface connected to the PPPoE
modem.
Template: ppp/username
@@ -24,7 +24,7 @@
_Description: PPP login:
Please enter the username for the PPP connection.
.
- This information should have been provided to you by your Internet Service
+ This information should have been provided by your Internet Service
Provider.
Template: ppp/password
@@ -32,12 +32,12 @@
_Description: PPP password:
Please enter the password for the PPP connection.
.
- This information should have been provided to you by your Internet Service
+ This information should have been provided by your Internet Service
Provider.
Template: ppp/detect_failed
Type: error
-_Description: No Ethernet interface found
+_Description: No Ethernet interface
PPPoE networking cannot be configured because no Ethernet interface was
detected.
.
@@ -52,9 +52,9 @@
Type: error
_Description: Failed authentication
A PPPoE connection was attempted, but the provided login information was
- incorrect. Because of this the authentication failed.
+ probably incorrect.
.
- Please make sure you type the correct username and password.
+ Please check the username and password you provided.
.
The configuration of PPPoE is aborted. It can be attempted again by
selecting the relevant menu entry.
@@ -62,9 +62,7 @@
Template: ppp/unhandled
Type: error
_Description: Unhandled error
- It seems that the attempt to create a connection resulted in an unhandled
- error. Probably there is some exceptional situation which prevents
- establishing the connection.
+ An unidentified error happened while attempting to create a connection.
.
The configuration of PPPoE is aborted. It can be attempted again by
selecting the relevant menu entry.
--- ../ppp.old/debian/control 2007-09-23 07:20:03.737360559 +0200
+++ debian/control 2007-10-02 07:53:04.792651929 +0200
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: Marco d'Itri <md@linux.it>
-Uploaders: Eddy Petrișor <eddy.petrisor@gmail.com>
+Uploaders: Eddy Petri?or <eddy.petrisor@gmail.com>
Build-Depends: debhelper (>> 4.1.17), libpcap0.8-dev, libpam0g-dev, zlib1g-dev
Standards-Version: 3.7.2.2
@@ -13,11 +13,11 @@
Conflicts: ppp-pam, ppp-udeb, pppdcapiplugin (<= 1:3.7.2005-07-09-2), makedev (<< 2.3.1-56)
Replaces: ppp-pam, ppp-udeb
Suggests: iptables
-Description: Point-to-Point Protocol (PPP) daemon
+Description: Point-to-Point Protocol (PPP) - daemon
The Point-to-Point Protocol (PPP) provides a standard way to transmit
datagrams over a serial link, as well as a standard way for the machines
at either end of the link (the "peers") to negotiate various optional
- characteristics of the link. Using PPP, a serial link can be used to
+ characteristics of the link. Using PPP, a serial link can be used to
transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections
between the peers.
@@ -28,20 +28,27 @@
Depends: ${shlibs:Depends}, ${misc:Depends}, ethernet-card-detection, ppp-modules, di-utils
Provides: configured-network
XB-Installer-Menu-Item: 1700
-Description: Point-to-Point Protocol (PPP) daemon
+Description: Point-to-Point Protocol (PPP) - package for Debian Installer
The Point-to-Point Protocol (PPP) provides a standard way to transmit
datagrams over a serial link, as well as a standard way for the machines
at either end of the link (the "peers") to negotiate various optional
- characteristics of the link. Using PPP, a serial link can be used to
+ characteristics of the link. Using PPP, a serial link can be used to
transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections
between the peers.
.
- ppp-udeb is a minimal ppp package used by the debian-installer.
+ This package is a minimal ppp package used by the Debian Installer.
Package: ppp-dev
Section: devel
Architecture: all
Priority: extra
Depends: ${shlibs:Depends}
-Description: Selected headers from the ppp package
- Contains some files needed to build some packages related to pppd.
+Description: Point-to-Point Protocol (PPP) - development files
+ The Point-to-Point Protocol (PPP) provides a standard way to transmit
+ datagrams over a serial link, as well as a standard way for the machines
+ at either end of the link (the "peers") to negotiate various optional
+ characteristics of the link. Using PPP, a serial link can be used to
+ transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections
+ between the peers.
+ .
+ This package provides files needed to build pppd-related software.
Source: ppp
Section: admin
Priority: optional
Maintainer: Marco d'Itri <md@linux.it>
Uploaders: Eddy Petri?or <eddy.petrisor@gmail.com>
Build-Depends: debhelper (>> 4.1.17), libpcap0.8-dev, libpam0g-dev, zlib1g-dev
Standards-Version: 3.7.2.2
Package: ppp
Section: admin
Architecture: any
Depends: ${shlibs:Depends}, libpam-modules, libpam-runtime (>= 0.76-13.1), netbase, procps
Conflicts: ppp-pam, ppp-udeb, pppdcapiplugin (<= 1:3.7.2005-07-09-2), makedev (<< 2.3.1-56)
Replaces: ppp-pam, ppp-udeb
Suggests: iptables
Description: Point-to-Point Protocol (PPP) - daemon
The Point-to-Point Protocol (PPP) provides a standard way to transmit
datagrams over a serial link, as well as a standard way for the machines
at either end of the link (the "peers") to negotiate various optional
characteristics of the link. Using PPP, a serial link can be used to
transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections
between the peers.
Package: ppp-udeb
XC-Package-Type: udeb
Section: debian-installer
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ethernet-card-detection, ppp-modules, di-utils
Provides: configured-network
XB-Installer-Menu-Item: 1700
Description: Point-to-Point Protocol (PPP) - package for Debian Installer
The Point-to-Point Protocol (PPP) provides a standard way to transmit
datagrams over a serial link, as well as a standard way for the machines
at either end of the link (the "peers") to negotiate various optional
characteristics of the link. Using PPP, a serial link can be used to
transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections
between the peers.
.
This package is a minimal ppp package used by the Debian Installer.
Package: ppp-dev
Section: devel
Architecture: all
Priority: extra
Depends: ${shlibs:Depends}
Description: Point-to-Point Protocol (PPP) - development files
The Point-to-Point Protocol (PPP) provides a standard way to transmit
datagrams over a serial link, as well as a standard way for the machines
at either end of the link (the "peers") to negotiate various optional
characteristics of the link. Using PPP, a serial link can be used to
transmit Internet Protocol (IP) datagrams, allowing TCP/IP connections
between the peers.
.
This package provides files needed to build pppd-related software.
Attachment:
signature.asc
Description: Digital signature