Created by Loïc Minier and last modified
Get this branch:
bzr branch lp:~oem-solutions-group/network-manager/ubuntu.hardy.07
Members of OEM Solutions Group can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

OEM Solutions Group

Recent revisions

2857. By Alexander Sack

* merge further ifupdown unmanagedautoconnect fixes from ubuntu0.7 branch

2856. By Alexander Sack

(merge) rev 2956 from lp:~network-manager/network-manager/ubuntu.0.7 to hardy branch

* fix LP: #279262 - [regression] network-manager unmanaged mode sets devices
  to unmanaged that were managed in hardy; for unmanaged mode we make IFUPDOWN
  system config plugin only blacklist devices that have a "auto" entry in
  - add debian/patches/012-IFUPDOWN-unmanage-autoconnect-only.patch
  - update debian/patches/series
* new upstream snapshot Sat 2008-10-18 10:58:59 +0000 (rev 3648)
  from lp:~vcs-imports/network-manager/main. Includes:
  + (bzr3642) proper wireless capability detection
    - update src/nm-device-wifi.c
  + update translations nb
* More cherry-picks:
  + (bzr3650) Updated Belarusian Latin translation.
    - update <email address hidden>
* Changes in upstream snapshot that don't affect directly produced binary
  + (bzr3645) NA/openvpn: support .cer and .crt certificates for openvpn (related
    to LP: #270762)
    - update vpn-daemons/openvpn/properties/auth-helpers.c
  + (bzr3646) NA/openvpn: The "Certificates (TLS)" tab should also be
    present for NM_OPENVPN_CONTYPE_PASSWORD (LP: #280429)
    - update vpn-daemons/openvpn/properties/auth-helpers.c
  + updated vpn translations es, sv
* new upstream snapshot Wed 2008-10-15 22:47:38 +0000 (bzrrev 3641)
- a few more follow up fixes for routing routing/subnet/vpn handling.
new upstream snapshot Wed 2008-10-15 02:46:26 +0000 (bzrrev 3637); topic:
- more vpn and routing fixes
* drop upstreamed IFUPDOWN patches
  - delete debian/patches/003-IFUPDOWN-remove-unused-callbacks.loom.patch
  - delete debian/patches/004-IFUPDOWN-devtracking.loom.patch
  - delete debian/patches/005-IFUPDOWN-unmanaged-mode.loom.patch
  - delete debian/patches/006-IFUPDOWN-parse-system-settings.loom.patch
  - delete debian/patches/007-IFUPDOWN-managed-mode.loom.patch
* adjust patches that didnt apply cleanly anymore
  - update debian/patches/008-BACKEND-debian-fallback-to-generic-loopback.loom.patch
* fix eventual restart races by --retry'ing at least 5 seconds for NM to stop
  in init script

* debian/network-manager.postinst:
  - Set startup priority to be lower than Ubiquity to allow only-ubiquity
    installs to have network access. (LP: #277302)

2855. By Alexander Sack

* fix hardy PPA build by going for automake 1.10 and explictily adding
  libxml-parser-perl to build depends
  - update debian/rules
  - update debian/control

2854. By Alexander Sack

(merge) 0.7~~svn20081008t224042-0ubuntu3 to ubuntu/intrepid

2853. By Alexander Sack

(merge) RELEASE 0.7~~svn20081008t224042-0ubuntu2 to ubuntu/intrepid

2852. By Alexander Sack

* merge RELEASE 0.7~~svn20081008t224042-0ubuntu1 to ubuntu/intrepid

2851. By Alexander Sack

* MERGE RELEASE 0.7~~svn20081004t225044-0ubuntu1 to ubuntu/intrepid

2850. By Alexander Sack

* update hostname fix patch to always use the value from /etc/hostname
  - update debian/patches/lp276253_fix_system_hostname.patch

2849. By Alexander Sack

* LP: #276253 - NM 0.7 sets hostname to localhost.localdomain instead of
  what is in /etc/hostname - we fallback to hostname configured in
  /etc/hostname even when no distro specific system plugin is enabled.
  - add debian/patches/fix_system_hostname.patch
  - update debian/patches/series

2848. By Alexander Sack

(merge) RELEASE 0.7~~svn20080928t225540+eni0-0ubuntu1 to ubuntu/intrepid

Branch metadata

Branch format:
Branch format 6
Repository format:
Bazaar pack repository format 1 (needs bzr 0.92)
This branch contains Public information 
Everyone can see this information.