Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Hello RT, I'm requesting pre-approval for an upload of wicd to unstable (targeted to testing). Please see the attached patch. It fixes a RC bug, and a couple other easy bugs (which don't affect the functionality of the package in a significant way). If the diff is OK, I'll upload the package, and please unblock it for migration to testing. Thanks for your hard work, David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 ----|---- http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174
diff --git a/debian/changelog b/debian/changelog index 3ceb288..e4c976a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +wicd (1.7.2.4-3) UNRELEASED; urgency=low + + * Fix debian/watch + * Recommend rfkill in wicd-daemon (Closes: #683559) + * Substitute dependency on dhcp3-client with isc-dhcp-client + (Closes: #680976) + * Fix handling of /etc/resolv.conf when it's a symlink (Closes: #691973) + + -- David Paleino <da...@debian.org> Thu, 01 Nov 2012 00:30:25 +0100 + wicd (1.7.2.4-2) unstable; urgency=high * Fix comments inside /etc/default/wicd (Closes: #668327) diff --git a/debian/control b/debian/control index b0639f0..6bc40a8 100644 --- a/debian/control +++ b/debian/control @@ -47,7 +47,7 @@ Depends: , dbus , wpasupplicant , wireless-tools - , dhcpcd | dhcp3-client | pump | udhcpc + , dhcpcd | isc-dhcp-client | pump | udhcpc , net-tools | ethtool , net-tools | iproute , adduser @@ -57,6 +57,7 @@ Depends: , python-wicd (= ${source:Version}) Pre-Depends: debconf (>= 1.5.34) Recommends: wicd-gtk (= ${source:Version}) | wicd-curses (= ${source:Version}) | wicd-cli (= ${source:Version}) | wicd-client + , rfkill Suggests: pm-utils Breaks: wicd (<= 1.6.2.2-4) Replaces: wicd (<= 1.6.2.2-4) diff --git a/debian/patches/01-remove_unused_icons.patch b/debian/patches/01-remove_unused_icons.patch index 7361f66..022a095 100644 --- a/debian/patches/01-remove_unused_icons.patch +++ b/debian/patches/01-remove_unused_icons.patch @@ -5,7 +5,7 @@ Don't install rarely-used icons, save disk space --- wicd.orig/setup.py +++ wicd/setup.py -@@ -535,15 +535,11 @@ try: +@@ -538,15 +538,11 @@ try: if not wpath.no_install_man: data.append((wpath.mandir + 'man1/', [ 'man/wicd-client.1' ])) data.append((wpath.icons + 'scalable/apps/', ['icons/scalable/wicd-gtk.svg'])) diff --git a/debian/patches/02-workaround_dhclient_bug.patch b/debian/patches/02-workaround_dhclient_bug.patch index 8f46a1e..d4119fa 100644 --- a/debian/patches/02-workaround_dhclient_bug.patch +++ b/debian/patches/02-workaround_dhclient_bug.patch @@ -10,7 +10,7 @@ Forwarded: no --- wicd.orig/wicd/wnettools.py +++ wicd/wicd/wnettools.py -@@ -284,7 +284,7 @@ class BaseInterface(object): +@@ -285,7 +285,7 @@ class BaseInterface(object): client_dict = { "dhclient" : diff --git a/debian/patches/04-fix_resolv.conf_backup-restore.patch b/debian/patches/04-fix_resolv.conf_backup-restore.patch new file mode 100644 index 0000000..25903d6 --- /dev/null +++ b/debian/patches/04-fix_resolv.conf_backup-restore.patch @@ -0,0 +1,40 @@ +From: David Paleino <da...@debian.org> +Subject: fix handling of resolv.conf when it's a symlink +Forwarded: not-needed +Origin: upstream +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=691973 + +--- + wicd/wicd-daemon.py | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +--- wicd.orig/wicd/wicd-daemon.py ++++ wicd/wicd/wicd-daemon.py +@@ -1703,7 +1703,11 @@ def main(argv): + # don't back up if .orig exists, probably there cause + # wicd exploded + if not os.path.exists(backup_location): +- shutil.copy2('/etc/resolv.conf', backup_location) ++ if os.path.islink('/etc/resolv.conf'): ++ dest = os.readlink('/etc/resolv.conf') ++ os.symlink(dest, backup_location) ++ else: ++ shutil.copy2('/etc/resolv.conf', backup_location) + os.chmod(backup_location, 0644) + except IOError: + print 'error backing up resolv.conf' +@@ -1750,7 +1754,13 @@ def main(argv): + + # restore resolv.conf on quit + try: +- shutil.move(wpath.varlib + 'resolv.conf.orig', '/etc/resolv.conf') ++ backup_location = wpath.varlib + 'resolv.conf.orig' ++ if os.path.islink(backup_location): ++ dest = os.readlink(backup_location) ++ os.remove('/etc/resolv.conf') ++ os.symlink(dest, '/etc/resolv.conf') ++ else: ++ shutil.move(backup_location, '/etc/resolv.conf') + os.chmod('/etc/resolv.conf', 0644) + except IOError: + print 'error restoring resolv.conf' diff --git a/debian/patches/series b/debian/patches/series index f05b26d..d6f65fb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ 01-remove_unused_icons.patch 02-workaround_dhclient_bug.patch 03-fix_sanitation_bug.patch +04-fix_resolv.conf_backup-restore.patch 26-support_etc-network_scripts.patch 32-prefer_gksu.patch diff --git a/debian/watch b/debian/watch index dfe7336..f16b03c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 opts=uversionmangle=s/%7E/~/ \ https://launchpad.net/wicd/+download \ - https://launchpad.net/wicd/\d.\d/\d.\d.\d/\+download/wicd-(\d+.*)\.tar\.(?:gz|bz2) + https://launchpad.net/wicd/\d.\d/\d+.*/\+download/wicd-(\d+.*)\.tar\.(?:gz|bz2)
signature.asc
Description: PGP signature