Hi!
> * Alexander Reichle-Schmehl <toli...@debian.org> [110408 14:05]:
> Attached is a (untested) patch (module po changes) to remove modconf
> support. I'll attend to upload an NMU soonish.
Forgot the patch, here it is.
Best Regards,
Alexander
diff -Nru pppoeconf-1.19/debian/changelog pppoeconf-1.19+nmu1/debian/changelog
--- pppoeconf-1.19/debian/changelog 2009-11-07 22:35:14.000000000 +0100
+++ pppoeconf-1.19+nmu1/debian/changelog 2011-04-13 09:45:06.000000000 +0200
@@ -1,3 +1,10 @@
+pppoeconf (1.19+nmu1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Drop depends on modconf (Closes: #613284)
+
+ -- Alexander Reichle-Schmehl <toli...@debian.org> Wed, 13 Apr 2011 09:35:25 +0200
+
pppoeconf (1.19) unstable; urgency=low
* Add support for gksu when X is enabled. (Closes: #548231)
diff -Nru pppoeconf-1.19/debian/control pppoeconf-1.19+nmu1/debian/control
--- pppoeconf-1.19/debian/control 2009-11-07 22:32:09.000000000 +0100
+++ pppoeconf-1.19+nmu1/debian/control 2011-04-13 09:44:32.000000000 +0200
@@ -10,7 +10,7 @@
Package: pppoeconf
Architecture: all
-Depends: ${misc:Depends}, whiptail-provider | whiptail, ppp (>= 2.4.2+20040428-2) | pppoe (>= 3.0), ppp (>= 2.4.1.uus2-4), gettext-base (>= 0.13), sed (>= 3.95), modconf
+Depends: ${misc:Depends}, whiptail-provider | whiptail, ppp (>= 2.4.2+20040428-2) | pppoe (>= 3.0), ppp (>= 2.4.1.uus2-4), gettext-base (>= 0.13), sed (>= 3.95)
Recommends: locales
Suggests: xdialog
Description: configures PPPoE/ADSL connections
diff -Nru pppoeconf-1.19/pppoeconf pppoeconf-1.19+nmu1/pppoeconf
--- pppoeconf-1.19/pppoeconf 2009-11-07 22:26:19.000000000 +0100
+++ pppoeconf-1.19+nmu1/pppoeconf 2011-04-13 09:45:26.000000000 +0200
@@ -2,7 +2,7 @@
# (c) Eduard Bloch <bl...@debian.org>, Gregory Colpart <r...@evolix.fr>
# LICENSE: GPL
# Purpose: initial PPPoE configuration on Debian
-# Depends: ppp, whiptail, gettext, sed, modconf
+# Depends: ppp, whiptail, gettext, sed
export TEXTDOMAINDIR="/usr/share/locale"
export TEXTDOMAIN=pppoeconf
@@ -107,36 +107,6 @@
if test "$list" ; then
test "$DIALOG" = "whiptail" && escmsg=$(gettext 'Or press ESC to abort here.')
number=`echo $list | wc -w| tr -d " "`
- text=$(eval_ngettext \
- 'I found $number ethernet device:
-$list
-
-Are all your ethernet interfaces listed above?
-(If No, modconf will be started so you can load the card drivers manually).
-
-$escmsg' \
- 'I found $number ethernet devices:
-$list
-
-Are all your ethernet interfaces listed above?
-(If No, modconf will be started so you can load the card drivers manually).
-
-$escmsg' \
- "$number" )
- title=$(gettext 'ALL DEVICES FOUND?')
- $DIALOG --title "$title" --clear --yesno "$text" 15 60
- case $? in
- 1)
- # configure and restart
- modconf
- $0
- exit $?
- ;;
- 255)
- rm -rf "$TMP"
- exit 1
- ;;
- esac
INTFILE="`mktemp -t interfaces.pppoeconf.XXXXXX`" || exit 1
export INTFILE
@@ -504,20 +474,7 @@
else
title=$(gettext 'NO INTERFACE FOUND')
- text=$(gettext 'Sorry, no working ethernet card could be found. If you do have an interface card which was not autodetected so far, you probably wish to load the driver manually using the modconf utility. Run modconf now?')
- $DIALOG --title "$title" --clear --yesno "$text" 20 70
- case $? in
- 0)
- # configure and restart
- modconf
- exec $0
- exit $?
- ;;
- 1)
- exit 0
- ;;
- 255)
- exit 1
- ;;
- esac
+ text=$(gettext 'Sorry, no working ethernet card could be found.')
+ $DIALOG --title "$title" --clear --msgbox "$text" 20 70
+ exit 0
fi
