diff options
author | Michael Biebl <biebl@debian.org> | 2016-05-11 18:27:10 +0200 |
---|---|---|
committer | Michael Biebl <biebl@debian.org> | 2016-05-11 18:27:13 +0200 |
commit | 86b3bebc9758594e1018e4b486a56cbd4e630b22 (patch) | |
tree | 818669be75051875db3bdb470043d21d9ad54e64 | |
parent | f6f1c51ed44ca71c0cbf7d1afbdd0abdd4dd426e (diff) |
Rebase patches
-rw-r--r-- | debian/changelog | 1 | ||||
-rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 00b49df4..de9989eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager-applet (1.2.2-1) UNRELEASED; urgency=medium * New upstream release. + * Rebase patches. -- Michael Biebl <biebl@debian.org> Wed, 11 May 2016 18:26:38 +0200 diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 70ca3d9d..a7eeb213 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,10 +12,10 @@ Closes: #471191 1 file changed, 6 insertions(+) diff --git a/src/applet.c b/src/applet.c -index 0fe14e7..bc95ad2 100644 +index 72ac5c9..b5fe9cd 100644 --- a/src/applet.c +++ b/src/applet.c -@@ -2619,6 +2619,12 @@ applet_update_icon (gpointer user_data) +@@ -2610,6 +2610,12 @@ applet_update_icon (gpointer user_data) applet_get_device_icon_for_state (applet, &pixbuf, &icon_name_free, &dev_tip_free); icon_name = icon_name_free; dev_tip = dev_tip_free; |