diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:00:09 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2018-08-24 11:06:47 +0200 |
| commit | b7db94545968c37886b7111d8c85f62eb063fbb4 (patch) | |
| tree | 7c2aedd497b1fdcb26bf9d49f98cc63a530baf2e /debian/rules | |
| parent | 9d5cdc3adde9e7e57bf5a0e754e563b6a9e8e513 (diff) | |
| parent | caf1db9d6fbc056cc6c76a24574890f6c7895f3d (diff) | |
Import Debian changes 1.12.2-0ubuntu3
network-manager (1.12.2-0ubuntu3) cosmic; urgency=medium
* debian/rules:
- use --with-libnm-glib, the default reversed since that's a legacy
library but we still need it for unity-control-center
network-manager (1.12.2-0ubuntu2) cosmic; urgency=medium
* debian/patches/git-newglib-test.patch:
- backport upstream commit to fix the tests with the new glib
network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium
* New upstream version
* d/p/libnm-register-empty-NMClient-and-NetworkManager-when-loa.patch,
d/p/e91f1a7d2a6b8400b6b331d5b72287dcb5164a39.patch,
d/p/git_thunderbolt_connect.patch:
- removed, those changes are in the new version
* Backport Debian changes
* Update symbols file for libnm0
* Enable iwd support
* Drop version requirements when oldstable ships a newer version
* Drop dh_strip override, the dbgsym migration is done
* Rebase patches
* Make sure the example server.conf is actually installed
* Update install path for plugins, it now includes a version number
* Drop libnl3 build dependency.
Upstream has copied the code directly from libnl3 for the few functions it
needs with a few small modifications.
* Drop libiw build dependency.
Hasn't been needed for a long time and was simply a left over from older
releases.
* Bump Standards-Version to 4.1.5
* Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372)
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/debian/rules b/debian/rules index 119c2946..bc6331c6 100755 --- a/debian/rules +++ b/debian/rules @@ -37,6 +37,8 @@ override_dh_auto_configure: --with-selinux \ --with-tests \ --with-libaudit \ + --with-iwd \ + --with-libnm-glib \ --without-dhcpcanon \ --enable-polkit \ --enable-polkit-agent \ @@ -56,7 +58,6 @@ override_dh_auto_configure: override_dh_install: find debian/tmp -name '*.la' -print -delete - rm debian/tmp/usr/share/doc/NetworkManager/examples/server.conf rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager dh_install @@ -73,9 +74,6 @@ override_dh_installinit: override_dh_makeshlibs: dh_makeshlibs -X/usr/lib/$(DEB_HOST_MULTIARCH)/NetworkManager/ -X/usr/lib/pppd/ -override_dh_strip: - dh_strip --dbgsym-migration='network-manager-dbg (<< 1.1.91-2~)' - override_dh_systemd_start: dh_link -pnetwork-manager \ lib/systemd/system/NetworkManager.service \ |