summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog11
-rw-r--r--debian/control4
-rw-r--r--debian/patches/99-kfreebsd-empty-env.patch6
-rw-r--r--debian/patches/series1
4 files changed, 16 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index d8c9173..510061c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-consolekit (0.4.6-4) unstable; urgency=medium
+consolekit (0.4.6-5) unstable; urgency=medium
[ Steve Langasek ]
* 03-cleanup_console_tags.patch: call g_dir_close() when we're done, fixing
@@ -12,6 +12,15 @@ consolekit (0.4.6-4) unstable; urgency=medium
-- Martin Pitt <mpitt@debian.org> Wed, 23 Apr 2014 16:37:49 +0200
+consolekit (0.4.6-4) unstable; urgency=low
+
+ * Change Maintainer to myself as per Michael's invitation
+ (https://lists.debian.org/debian-bsd/2014/02/msg00224.html)
+ * Fix VT switching and credential checks on GNU/kFreeBSD. (Closes: #734070)
+ * Use Linux versions of ck-system-restart and ck-system-stop on GNU/kFreeBSD.
+
+ -- Robert Millan <rmh@debian.org> Wed, 19 Feb 2014 00:27:27 +0100
+
consolekit (0.4.6-3) unstable; urgency=low
* Upload to unstable.
diff --git a/debian/control b/debian/control
index 9a11dd7..61c3e71 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
Source: consolekit
Section: admin
Priority: optional
-Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
-Uploaders: Michael Biebl <biebl@debian.org>
+Maintainer: Robert Millan <rmh@debian.org>
Build-Depends: debhelper (>= 9),
autotools-dev,
pkg-config,
@@ -16,6 +15,7 @@ Build-Depends: debhelper (>= 9),
libpam0g-dev,
libpolkit-gobject-1-dev (>= 0.92),
zlib1g-dev,
+ libbsd-dev (>= 0.3.0~) [kfreebsd-any],
dh-autoreconf
Standards-Version: 3.9.5
Vcs-Git: git://git.debian.org/git/pkg-utopia/consolekit.git
diff --git a/debian/patches/99-kfreebsd-empty-env.patch b/debian/patches/99-kfreebsd-empty-env.patch
index 4ed65ea..ebab639 100644
--- a/debian/patches/99-kfreebsd-empty-env.patch
+++ b/debian/patches/99-kfreebsd-empty-env.patch
@@ -1,9 +1,9 @@
---- consolekit/src/ck-sysdeps-freebsd.c
-+++ consolekit/src/ck-sysdeps-freebsd.c
+--- a/src/ck-sysdeps-freebsd.c
++++ b/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);
diff --git a/debian/patches/series b/debian/patches/series
index 852e0db..fe6be8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
03-cleanup_console_tags.patch
04-long_device_names.patch
99-kfreebsd-empty-env.patch
+misc_kfreebsd_fixes.diff