Created by Alexander Sack and last modified
Get this branch:
bzr branch lp://staging/~modemmanager/network-manager/ubuntu.0.7.mm
Members of Modem Manager Team can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Modem Manager Team

Recent revisions

2965. By Alexander Sack

patch work for 0.7 merge:
* fix file removal hunks in main MM patch
  - update debian/patches/mm-NetworkManager-r4241-use-modem-manager.patch
* update patches to changed NM API
  - update debian/patches/mm-mbm-do-authenticate.patch
  - update debian/patches/mm-mbm-set-puk.patch
* drop hacky code for getting puk secret; in turn do it the same way getting pin
  is implemented
  - update debian/patches/mm-mbm-set-puk.patch
* drop patch superseeded upstream
  - delete debian/patches/mm-mbm-constructor-remember-path.patch
  - update debian/patches/series

2964. By Alexander Sack

* upgrade Modemmanager support patch to 0.7 compatible version
  - remove debian/patches/mm-NetworkManager-r4209-use-modem-manager.patch
  - add debian/patches/mm-NetworkManager-r4241-use-modem-manager.patch
  - update debian/patches/series

2963. By Alexander Sack

merge 0.7-0ubuntu2 jaunty packaging
rev:2988 from lp:~network-manager/network-manager/ubuntu.0.7

* fix LP: #270584 add the dependency network-manager-dev in
  - update debian/control
* update Standards-Version to 3.8.0
  - update debian/control
* (merge) new upstream release NetworkManager 0.7 final
  - rev 3802 lp:~vcs-imports/network-manager/main/
  + fix LP: #288963 Network Manager fails to connect to a system stored
    network with "set_network_cb(): Couldn't set network config: Did not receive
    correct message.." in intrepid
  + fix LP: #288703 Routes lost on DHCP lease renewal (breaks VPN)
* drop probe v250 modem patch; this should be done in udev-extras; until
  that happens we rely on accurate hal-info
  - delete debian/patches/add_probe_for_v250_modems.patch
  - update debian/patches/series
* drop upstreamed patches
  - delete debian/patches/50_gcc43.patch
  - delete debian/patches/lp282207_set_apn_at_syntax.patch
  - delete debian/patches/lp268667_more_ppp_default_options.patch
  - delete debian/patches/lp278631-initscript-polishing.patch
  - update debian/patches/series
* drop unused patch
  - delete debian/patches/41o_completely_deactivate_stage1.patch
* make manual regristration timeout patch out of automatic one (which
  was applied upstream)
  - rename debian/patches/lp303142_more_time_for_automatic_registration.patch
    => debian/patches/lp303142_more_time_for_manual_registration.patch
* add patch to fix ftbfs
  - add debian/patches/ftbfs_nm_netlink_monitor.patch
  - update debian/patches/series
* [libnm-util-dev] dont try to install nm-setting-ip6-config.h - which is
  supposed to be hidden in 0.7 final
  - update debian/libnm-util-dev.install
* prepatch upstream soname version bump for libnm-util
  - add debian/patches/04-ltversioning.patch
  - update debian/patches/series
  ship the libs in libnm-util1
  - update debian/control
  - rename debian/libnm-util0.install => debian/libnm-util1.install
  and bump so shlibs control file info for libnm-util1
  - update debian/rules
* add easy bzr builddeb support with proper upstream-revision (--show-ids)
  - add .bzr-builddeb/default.conf
* install plugin in ppp 2.4.4 and 2.4.5 directory
  - update debian/network-manager.install
* fix LP: #292054 - Some drivers take too long to associate (Was:
  network-manager 0.7 always asks for WPA passphrase); we workaround
  this driver/wpasupplicant bug by giving association more time
  (e.g. 60sec instead of 25sec)
  - add debian/patches/lp292054_tune_supplicant_timeout_60s.patch
  - update debian/patches/series
* fix LP: #256905 - dbus policy file (nm-avahi-autoipd.conf) not properly
  deployed in package; install nm-avahi-autoipd.conf
  - update debian/network-manager.install
* fix LP: #282207 - [Sierra] NM 0.7 does not set APN for AT&T 3G connection;
  apply fix from Jerone Young
  - add debian/patches/lp282207_set_apn_at_syntax.patch
  - update debian/patches/series
* fix LP: #268667 - not all required ppp options get set on command line
  which makes ppp use bad values from /etc/ppp/options; we backport upstream
  - add debian/patches/lp268667_more_ppp_default_options.patch
  - update debian/patches/series
* fix LP: #291564 - ifupdown network manager does not blacklist/unmanage
  mapped devices in managed=false mode; thanks to Stephan Trebels for the
  - add debian/patches/lp291564_ifupdown_unmanage_mapping_and_iface.patch
  - update debian/patches/series
* fix LP: #291902 - ifupdown plugin should not export any parsed connection
  configuration when running in managed=false mode; we fix this by exporting
  empty connection list in unmanaged mode
  - add debian/patches/lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch
  - update debian/patches/series
* belt-and-braces fix LP: #290468 VPN fails, "/usr/bin/nm-ppp-starter
  missing"; we remove obsolete conffiles in -pptp .preinst; in case user
  modified them they will be renamed to .dpkg-bak; this patch takes care that
  NM doesn't consider files in /etc/NetworkManager/VPN that don't have a
  .name filename suffix.
  - add debian/patches/lp290468_only_consider_name_suffix_VPN_service_files.patch
  - update debian/patches/series
* fix LP: #303142 - 3G [Option] some modems take a while time to register on
  network (CREG); we use g_timeout_add instead of _idle_add to give the
  modem some rest during registration phase.
  - add debian/patches/lp303142_more_time_for_automatic_registration.patch
  - update debian/patches/series

2962. By Alexander Sack

* MBM support - backport missing constants (fix build)
  - add debian/patches/mm-mbm-missing-constants.patch
  - update debian/patches/series

2961. By Alexander Sack

* MBM support - remember device path (patches extracted from Beta 8 release)
  - add debian/patches/mm-mbm-constructor-remember-path.patch
  - update debian/patches/series

2960. By Alexander Sack

* MBM support - do authenticate (patches extracted from Beta 8 release)
  - add debian/patches/mm-mbm-do-authenticate.patch
  - update debian/patches/series

2959. By Alexander Sack

* MBM support - send puk (patches extracted from Beta 8 release)
  - add debian/patches/mm-mbm-set-puk.patch
  - update debian/patches/series

2958. By Alexander Sack

* ModemManager support (patch taken from 0.0+081024t144601 upstrem snapshot)
  - add debian/patches/mm-NetworkManager-r4209-use-modem-manager.patch

2957. By Alexander Sack

* improve debugging output, bind device to connection even in unmanaged mode
  and also if autoconnect==FALSE
  - update debian/patches/012-IFUPDOWN-unmanage-autoconnect-only.patch

2956. By Alexander Sack

* 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

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.