lp:~ubuntu-branches/ubuntu/utopic/network-manager-openvpn/utopic-201405040311

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/utopic/network-manager-openvpn

Ubuntu branches: Pending requested 2014-05-04

Diff: 1042 lines (+2/-1020) (has conflicts)

2 files modified

.pc/01-export-user-nobody.patch/properties/import-export.c (+0/-1018)
properties/import-export.c (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

22. By Stéphane Graber on 2014-05-02

releasing version 0.9.8.4-2ubuntu1

21. By Stéphane Graber on 2014-05-02

Merge from Debian unstable

20. By Stéphane Graber on 2014-05-02

Merging shared upstream rev into target branch.

19. By Stéphane Graber on 2014-03-06

Fix IPv6 DNS support. Return IPv6 DNS servers are now passed to
Network Manager and the list of domains is also now passed for both IPv4
and IPv6 so that split DNS works as expected.

18. By Mathieu Trudel-Lapierre on 2014-03-06

debian/patches/enable_ipv6.patch: allow openvpn to tunnel IPv6.
(LP: #777161)

17. By Jeremy Bícha on 2013-06-10

* Sync with Debian. Remaining changes:
  - Recommends: network-manager-openvpn-gnome or
    plasma-widget-networkmanagement.
  - Drop Vcs-* fields.
  - debian/patches/gtk_table_to_gtk_grid.patch: port GtkTable uses in vpn
    password dialog to a GtkGrid.
* Dropped changes:
  - debian/patches/auth_dialog_libexecdir.patch: Applied in new version

16. By Jeremy Bícha on 2013-05-07

* Sync with Debian. Remaining changes:
  - Recommends: network-manager-openvpn-gnome or
    plasma-widget-networkmanagement.
  - Drop Vcs-* fields.
  - debian/patches/gtk_table_to_gtk_grid.patch: port GtkTable uses in vpn
    password dialog to a GtkGrid.
  - debian/patches/auth_dialog_libexecdir.patch: specify libexecdir as
    /usr/lib/NetworkManager for the auth dialog to be able to spawn it
    properly in GNOME Shell
* Dropped changes:
  - debian/patches/deprecated_g_type_init.patch: Applied in new version

15. By Michael Biebl on 2011-11-12

* New upstream release.
* debian/control
  - Bump Build-Depends on libnm-*-dev and network-manager-dev to (>= 0.9.2).
* Enable default hardening options from dpkg-buildflags.
  - Use buildflags.mk snippet in debian/rules.
  - Add Build-Depends on dpkg-dev (>= 1.6.1).

14. By Michael Biebl on 2011-10-16

* debian/watch: Track .xz tarballs.
* Build against GTK 3.

13. By Michael Biebl on 2011-09-16

Upload to unstable.