about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2016-04-12 17:36:01 +0200
committerMichael Biebl <biebl@debian.org>2016-04-12 17:36:05 +0200
commit4ead62023a3b92903ae0f5642146ab605f7bf6d4 (patch)
tree587354aea3a4cc875232249d5133c351c9a7f95a
parent00de75d6c32cd0f3e3f1c8915aeecf167f3073c3 (diff)
Rebase patches
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch2
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index feaf7b29..2392fe71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 network-manager (1.1.94-1) UNRELEASED; urgency=medium
 
   * New upstream release. (1.2 rc2).
+  * Rebase patches.
 
  -- Michael Biebl <biebl@debian.org>  Tue, 12 Apr 2016 17:34:05 +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 cf76f6ab..6e0e14f4 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 7ec52e3..6e217c6 100644
+index 3ef5026..8bf8140 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -474,8 +474,9 @@ fi