From 81a1c7417100d3a51087ba3435dcd301750c8b84 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 11 May 2016 18:20:23 +0200 Subject: Rebase patches --- debian/changelog | 1 + .../Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index f1cc1c6c..6fc651f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ network-manager (1.2.2-1) UNRELEASED; urgency=medium * New upstream release. + * Rebase patches. -- Michael Biebl Wed, 11 May 2016 18:05:42 +0200 diff --git a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch index bd8fec08..971b042a 100644 --- a/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch +++ b/debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch @@ -18,7 +18,7 @@ Closes: #742933 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index ab2993a..18d0beb 100644 +index 7bb3779..93adf26 100644 --- a/configure.ac +++ b/configure.ac @@ -474,8 +474,9 @@ fi @@ -33,10 +33,10 @@ index ab2993a..18d0beb 100644 ;; consolekit) diff --git a/src/Makefile.am b/src/Makefile.am -index bf668d7..670c29e 100644 +index aa35eef..2495bbc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -481,6 +481,7 @@ AM_CPPFLAGS += \ +@@ -482,6 +482,7 @@ AM_CPPFLAGS += \ $(SELINUX_CFLAGS) \ $(LIBAUDIT_CFLAGS) \ $(SYSTEMD_LOGIN_CFLAGS) \ @@ -44,7 +44,7 @@ index bf668d7..670c29e 100644 $(SYSTEMD_JOURNAL_CFLAGS) \ $(SYSTEMD_NM_CFLAGS_PATHS) \ \ -@@ -514,6 +515,7 @@ libNetworkManager_la_LIBADD = \ +@@ -515,6 +516,7 @@ libNetworkManager_la_LIBADD = \ $(GUDEV_LIBS) \ $(LIBNL_LIBS) \ $(SYSTEMD_LOGIN_LIBS) \ -- cgit 1.3.0-6-gf8a5