lp://staging/~ubuntu-branches/ubuntu/natty/wicd/natty-201101220052

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp://staging/ubuntu/natty/wicd

Ubuntu branches: Pending requested 2011-01-22

Diff: 314 lines (+300/-0) (has conflicts)

2 files modified

.pc/31-deepcopy+python27-fixes.patch/wicd/configmanager.py (+212/-0)
debian/patches/31-deepcopy+python27-fixes.patch (+88/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

18. By Stefano Rivera on 2010-12-11

* debian/patches/
 - Added 31-deepcopy+python27-fixes.patch for python 2.7
   (credit to Archlinux and Remy Oudompheng - LP: #602825)

17. By David Paleino on 2010-05-29

* debian/patches/series:
  - 26-support_etc-network_scripts.patch disabled, needs more proper
    support (reopen #579497)

16. By David Paleino on 2010-05-25

* Urgency high because of RC #582980
* debian/patches:
  - 25-use_dhcpcd_also_in_Debian.patch refreshed, to make it work
    again with dhcpcd. Thanks to Brad Jorsch (Closes: #582980)
  - 30-make_connection_info_selectable.patch added (Closes: #571579)

15. By David Paleino on 2010-05-24

* debian/control:
  - fixed package descriptions (Closes: #574152)
* debian/patches/:
  - 23-fix_script_macro_expansion.patch ported from upstream,
    fixes bug in script macro expansion.
  - 24-wait_for_DHCP_client.patch added, waits for DHCP's client
    process to end, avoiding zombie processes. Thanks to Marin
    Ivanov for the patch! (Closes: #537195)
  - 25-use_dhcpcd_also_in_Debian.patch added: upstream changed
    the client from dhcpcd to dhcpcd-bin. This patch reverts it,
    so that defaults in /etc/default/dhcpcd are still observed.
    (Closes: #578014)
  - 26-support_etc-network_scripts.patch added, support /etc/network/
    hierarchy for connection scripts (Closes: #579497)
  - 27-fix_resolv.conf_perms.patch added, make sure dhclient.conf has
    0644 permissions (Closes: #582798)
  - 28-announce_dhclient.conf.template.patch added, describe
    /etc/wicd/dhclient.conf.template in wicd(8) (Closes: #582817)
  - 29-document_variables_passed_to_scripts.patch added (Closes: #570891)
* debian/NEWS.Debian updated to announce /etc/wicd/dhclient.conf.template

14. By David Paleino on 2010-03-05

Fix RC bug: daemon doesn't start anymore because copy.deepcopy()
fails with the iniparse object, coming from 20-use_iniparse.patch.
Bug 568326 reopened. (Closes: #572599)

13. By David Paleino on 2010-01-17

* debian/rules:
  - pass --install-layout=deb to python setup.py install
    (Closes: #565536)
* debian/control:
  - break circular dependency, make wicd-daemon only Recommend the
    clients. (Closes: #565608)

12. By David Paleino on 2009-12-05

* debian/control:
  - updated my email address
  - DMUA removed
* debian/config: add --quiet to adduser, don't show messages if
  user is already in netdev (Closes: #556182)
* debian/patches/:
  - 07-workaround_urwid_API_change.patch added, handle API change
    between python-urwid 0.9.8.4 and python-urwid 0.9.9
    (Closes: #557462)
  - 08-fix_help_message.patch added, fix minor issue with help
    message of wicd-curses
  - 09-allow_empty_DNS.patch added, one might run a local
    forwarder and 127.0.0.1 wouldn't work (Closes: #552598)
  - 10-order_scripts_directories.patch added, scripts were run
    in a random order (python's os.listdir())
  - 11-fix_gui_showing_from_tray.patch added, raises the GUI
    also when it was trayed in an iconified state (Closes: #549625)
* debian/links removed, debian/manpages added (Closes: #557173)

11. By David Paleino on 2009-11-07

* debian/po/ja.po updated (Closes: #554838)
* debian/patches/06-dont_bomb_out_on_configparser_error.patch added
  (Closes: #554949)

10. By David Paleino on 2009-10-26

* debian/po/ja.po added, thanks to Hideki Yamane (Closes: #546231)
* debian/control:
  - remove Conflict on network-manager, since both can be used at
    the same time, provided they don't try to control the same
    interface (Closes: #548978)
  - added dependency on dbus (Closes: #540331, #551605)
* debian/patches/05-use_binsh.patch added (Closes: #549443)

9. By Colin Watson on 2009-09-04

Configure with --no-install-acpi, removing acpi-support integration.
We've used pm-utils for some time now (LP: #366119).