about summary refs log tree commit diff
path: root/debian/changelog
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2020-01-29 10:37:20 +0100
committerSebastien Bacher <seb128@ubuntu.com>2020-01-29 10:37:20 +0100
commitff7ca6f26bc6763f53920c85e2c3b66259003527 (patch)
tree19de30bc725005d8972eb08d500c1b01d7c35101 /debian/changelog
parent5a09f7759860f4f2a9bb01471ca8099cd705bc10 (diff)
parent55780b62324ba5492ce2670817fc0a8c209cc138 (diff)
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog15
1 files changed, 11 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 97081a58..d8bf0064 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-network-manager (1.22.2-2ubuntu1) UNRELEASED; urgency=medium
+network-manager (1.22.4-1ubuntu1) UNRELEASED; urgency=medium
 
   * New upstream version, merged from Debian
-  * debian/patches/libnm-Check-self-still-NMManager-or-not.patch:
-    - removed undocumented change that doesn't apply after refactoring
 
- -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 13 Jan 2020 16:10:02 +0100
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 29 Jan 2020 10:37:03 +0100
+
+network-manager (1.22.4-1) unstable; urgency=medium
+
+  * New upstream version 1.22.4
+  * Rebase patches
+  * n-dhcp4: fix integer context in n_dhcp4_client_probe_transition_nak() on
+    32 bit
+
+ -- Michael Biebl <biebl@debian.org>  Wed, 15 Jan 2020 03:00:29 +0100
 
 network-manager (1.22.2-2) unstable; urgency=medium