Created by Mathieu Trudel-Lapierre on 2012-02-28 and last modified on 2015-08-28
Get this branch:
bzr branch lp:~network-manager/network-manager/ubuntu
Members of Network-manager can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information


Recent revisions

987. By Mathieu Trudel-Lapierre 37 minutes ago

releasing package network-manager version 1.0.4-0ubuntu2

986. By Mathieu Trudel-Lapierre 2 hours ago

* debian/patches/only-ignore-host-side-veth.patch: remove unused patch; NM
  doesn't automatically try to manage any side of veth devices anymore.
* debian/patches/disable_general_with_expect_test.patch: disable
  test_general_with_expect; which is flaky on ppc64el and arm64.
* debian/tests/nm:
  - Enable mucho logging when running tests, this helps a lot debugging when
    the tests fail.
  - Skip wifi tests for now; they appear to be broken, possibly due to
    changes in wpa 2.4's interaction with mac80211_hwsim.
  - test_manual_ip4 is an expectedFailure. It's not manual at all; and the
    DHCP requests fail to complete.
  - auto_detect_eth is an expectedFailure, both ends of the veth interfaces
    are now unmanaged which causes the tests to fail. These tests will need
    to be rewritten/adapted to the way the world really works.
  - Allow for more than one activeConnection available; this is slightly
    more solid when running tests locally in case other connections come up
    automatically along with the tested ones (bridges, etc.)
  - Check for expected connection UUID in the list of active connections
    UUIDs rather than verifying that the two match exactly.
* debian/patches/series: clean up; remove some old commented-out patches.
* debian/patches: removed a bunch of old patch cruft.

985. By Mathieu Trudel-Lapierre on 2015-08-22

releasing package network-manager version 1.0.4-0ubuntu1

984. By Mathieu Trudel-Lapierre on 2015-08-20

debian/NetworkManager.conf: temporarily disable the ofono plugin, it needs
more porting (and possibly some g_type_ensure hack).

983. By Mathieu Trudel-Lapierre on 2015-08-20

Drop delta of installing test scripts.

982. By Mathieu Trudel-Lapierre on 2015-08-20

Reshuffle configure switches to make the diff smaller.

981. By Mathieu Trudel-Lapierre on 2015-08-20

* Resynchronise with Debian; remaining changes:
  - debian/control: Updated Vcs tags; enabled autopkgtests.
  - debian/control: Build-Depends on libgnutls-dev and libgcrypt20-dev.
  - debian/control: reshuffle Depends for network-manager due to main
    inclusion requirements, and add Breaks for old versions of plugins.
  - debian/control: network-manager Conflicts with connman.
  - debian/control: update network-manager Description since we don't ship
    with team support yet, and dnsmasq-base isn't optional.
  - debian/ifblacklist_migrate.sh: update to better handle interfaces stanza.
  - debian/libnm*-dev.install: ship vala bindings.
  - debian/NetworkManager.conf: enable the ofono plugin and dnsmasq use as a
    local DNS cache.
  - debian/network-manager.dirs: add /etc/NetworkManager/dnsmasq.d.
  - debian/network-manager.install: add files for the ofono plugin.
  - debian/network-manager.install: add Apport hook.
  - debian/network-manager.links: link....
  - debian/network-manager.postinst: Don't need to migrate from sysvinit,
    just keep removing the sysvinit script symlinks.
  - debian/network-manager.postinst: Don't add the netdev group.
  - debian/network-manager.postinst: Notify the user a reboot may be
    required after upgrade.
  - debian/network-manager.upstart: ship an upstart job for NM.
  - debian/rules: configure: disable libteam.
  - debian/rules: configure: enable building vala bindings.
  - debian/rules: configure: enable running tests during the build.
  - debian/rules: don't install sysvinit scripts.
  - debian/rules: install test scripts.
  - debian/rules: copy over dnsmasq configuration files.
  - debian/rules: don't restart NetworkManager on upgrade.
  - debian/rules: run NM's unit tests in dh_auto_test via dbus-test-runner.
  - debian/source_network-manager.py: ship an Apport hook.
  - debian/tests: Ship autopkgtests for automated functional testing.

980. By Mathieu Trudel-Lapierre on 2015-08-20

debian/patches/conditional_libteam_tests.patch: make team device tests as
conditional to libteam being available as the support for the devices.

979. By Mathieu Trudel-Lapierre on 2015-08-20

Refreshed all patches.

978. By Mathieu Trudel-Lapierre on 2015-08-18

* Patches removed because applied upstream:
  - 0006-tui-fix-Wi-Fi-section-of-nmtui-connect-list-in-non-U.patch
  - 0007-core-fix-checks-for-default-routes-by-comparing-the-.patch
  - 0009-Support-building-against-libsystemd-library.patch
  - 0010-tui-fix-requesting-and-displaying-secrets.patch
  - 0011-tui-fix-updating-of-NmtPasswordFields-passwords-bgo-.patch
  - 0012-fix-arping-path.patch
  - 0013-fix-dhclient-abnormal-exit-due-to-SIGPIPE.patch
  - 0014-log-DHCLIENT-exit-status-better.patch
  - fix_default_routes.patch
  - git_assert_test-remote-settings-client_746a13bd.patch
  - git_fix_crash_test-remote-settings-client_98e7145f.patch
  - git_fix_nmcli_multiple_wifi.patch
  - git_ignore_cache_routes_faa7d8ab.patch
  - git_primary_connection_type_aab7fbfc.patch

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.