summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2013-07-19 19:31:57 +0200
committerMichael Biebl <biebl@debian.org>2013-07-19 19:32:41 +0200
commitd271d2b8ff710b6b2672134d2b9911816d44dc42 (patch)
tree6c531a98a5cc36159ae8e3c1cef0801525c33c67
parent33562ece98025381bc98f4b97a0f0ba81a874913 (diff)
downloadconsolekit-d271d2b8ff710b6b2672134d2b9911816d44dc42.tar.gz
Acknowledge non-maintainer upload, thanks Christoph and Petr.
-rw-r--r--debian/changelog14
-rw-r--r--debian/patches/99-kfreebsd-empty-env.patch11
-rw-r--r--debian/patches/series1
3 files changed, 26 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 15ebb70..4ba6fcc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+consolekit (0.4.6-2) UNRELEASED; urgency=low
+
+ * Acknowledge non-maintainer upload, thanks Christoph and Petr.
+
+ -- Michael Biebl <biebl@debian.org> Fri, 19 Jul 2013 19:27:49 +0200
+
consolekit (0.4.6-1) experimental; urgency=low
* New upstream release.
@@ -8,6 +14,14 @@ consolekit (0.4.6-1) experimental; urgency=low
-- Michael Biebl <biebl@debian.org> Fri, 19 Jul 2013 16:47:42 +0200
+consolekit (0.4.5-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Include patch by Petr Salinger to ignore empty environments.
+ (Closes: #570015)
+
+ -- Christoph Egger <christoph@debian.org> Mon, 30 Jul 2012 13:57:55 +0200
+
consolekit (0.4.5-3) unstable; urgency=low
* Strip debian/tmp/ from .install files.
diff --git a/debian/patches/99-kfreebsd-empty-env.patch b/debian/patches/99-kfreebsd-empty-env.patch
new file mode 100644
index 0000000..4ed65ea
--- /dev/null
+++ b/debian/patches/99-kfreebsd-empty-env.patch
@@ -0,0 +1,11 @@
+--- consolekit/src/ck-sysdeps-freebsd.c
++++ consolekit/src/ck-sysdeps-freebsd.c
+@@ -261,6 +261,8 @@
+ for (i = 0; penv[i] != NULL; i++) {
+ char **vals;
+
++ if (!penv[i][0]) continue;
++
+ vals = g_strsplit (penv[i], "=", 2);
+ if (vals != NULL) {
+ g_hash_table_insert (hash,
diff --git a/debian/patches/series b/debian/patches/series
index b4644d4..7970731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
# Debian patches for consolekit
03-cleanup_console_tags.patch
+99-kfreebsd-empty-env.patch