aboutsummaryrefslogtreecommitdiffstats
path: root/debian/patches/bitlbee.conf.diff
diff options
context:
space:
mode:
authorSven Moritz Hallberg <pesco@khjk.org>2009-03-12 20:33:28 +0100
committerSven Moritz Hallberg <pesco@khjk.org>2009-03-12 20:33:28 +0100
commit673a54c5a78afd1dd41b4cd8811df5ab65042583 (patch)
treebffaa961139ac2be20f0875ef0ed37c87d6b18a9 /debian/patches/bitlbee.conf.diff
parent823de9d44f262ea2364ac8ec6a1e18e0f7dab658 (diff)
parent9e768da723b4a770967efa0d4dcaf58ccef8917f (diff)
pretty blind try at merging in the latest trunk
Diffstat (limited to 'debian/patches/bitlbee.conf.diff')
-rw-r--r--debian/patches/bitlbee.conf.diff13
1 files changed, 13 insertions, 0 deletions
diff --git a/debian/patches/bitlbee.conf.diff b/debian/patches/bitlbee.conf.diff
new file mode 100644
index 00000000..b80bcb4c
--- /dev/null
+++ b/debian/patches/bitlbee.conf.diff
@@ -0,0 +1,13 @@
+=== modified file 'bitlbee.conf'
+--- debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-26 22:33:54 +0000
++++ debian/bitlbee/etc/bitlbee/bitlbee.conf 2008-08-27 23:18:13 +0000
+@@ -23,7 +23,7 @@
+ ## If BitlBee is started by root as a daemon, it can drop root privileges,
+ ## and change to the specified user.
+ ##
+-# User = bitlbee
++User = bitlbee
+
+ ## DaemonPort/DaemonInterface:
+ ##
+