Hi toogley, toogley wrote: > i want to fix https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698748 > > According to > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=698748#10 ,this > bug was fixed by upstream. But he didn't say in which version.
Well, the bug was reported against 1.7.2.4-4, the next upstream release after that was 1.7.3. And indeed, "git show upstream/1.7.3" (which shows the diff of the import of that upstream release, i.e. the diff of 1.7.2.4 against 1.7.3) shows the following hunk: diff --git a/in/man=wicd.8.in b/in/man=wicd.8.in index bf63538..686f057 100644 --- a/in/man=wicd.8.in +++ b/in/man=wicd.8.in @@ -51,7 +51,7 @@ The daemon is responsible for making and configuring connections, reading and writing configuration files and logs, and monitoring the connection status. The daemon's job is split between two processes: wicd-daemon.py and monitor.py. All the connection status monitoring, as well as the auto-reconnection logic, -takes place in monitor.py. Everthing else is done by wicd-daemon.py. +takes place in monitor.py. Everything else is done by wicd-daemon.py. The user interface (stored in wicd-gtk), which is made up of a tray icon, a main GUI window, and its child dialogs, gets configuration and network > But if he had merged the fix into the main branch, i wouldn't find > that typo in my local repo. And you haven't found it. > $ cd ~/pkg-wicd && git checkout master > $ grep -r 'Everthing' > README:takes place in monitor.py. Everthing else is done by wicd-daemon.py. What you found was a second incarnation of the same typo in a different file. :-) Regards, Axel -- ,''`. | Axel Beckert <a...@debian.org>, http://people.debian.org/~abe/ : :' : | Debian Developer, ftp.ch.debian.org Admin `. `' | 4096R: 2517 B724 C5F6 CA99 5329 6E61 2FF9 CD59 6126 16B5 `- | 1024D: F067 EA27 26B9 C3FC 1486 202E C09E 1D89 9593 0EDE