[Pkg-cli-apps-commits] [SCM] smuxi branch, master, updated. debian/0.8-2-3-g40838c4

[Mirco Bauer]

The following commit has been merged in the master branch:
commit a518eb9abfc19dbec9724edd88e1cb1942844a5e
Author: Mirco Bauer <meebey at meebey.net>
Date:   Sun Mar 20 16:26:08 2011 +0100

    Refreshed quilt patches

diff --git a/debian/patches/debian_default_settings.patch b/debian/patches/debian_default_settings.patch
old mode 100755
new mode 100644
index dc02c27..74a5b2c
--- a/debian/patches/debian_default_settings.patch
+++ b/debian/patches/debian_default_settings.patch
@@ -1,9 +1,8 @@
-Index: smuxi-0.6.3/src/Engine/Config/Config.cs
+Index: git/src/Engine/Config/Config.cs
 ===================================================================
-diff -urNad smuxi-0.6.3~/src/Engine/Config/Config.cs smuxi-0.6.3/src/Engine/Config/Config.cs
---- smuxi-0.6.3~/src/Engine/Config/Config.cs	2008-12-28 23:01:43.000000000 +0100
-+++ smuxi-0.6.3/src/Engine/Config/Config.cs	2009-01-07 21:21:08.000000000 +0100
-@@ -257,6 +257,7 @@
+--- git.orig/src/Engine/Config/Config.cs	2011-03-20 16:24:08.000000000 +0100
++++ git/src/Engine/Config/Config.cs	2011-03-20 16:24:22.000000000 +0100
+@@ -315,6 +315,7 @@
              Get(prefix + "OnConnectCommands",
                  new string[] {
                      "/join #smuxi",
diff --git a/debian/patches/ubuntu_default_settings.patch b/debian/patches/ubuntu_default_settings.patch
index 39b940a..28944ef 100644
--- a/debian/patches/ubuntu_default_settings.patch
+++ b/debian/patches/ubuntu_default_settings.patch
@@ -1,6 +1,8 @@
---- git.orig/src/Engine/Config/Config.cs
-+++ git/src/Engine/Config/Config.cs
-@@ -353,6 +353,12 @@
+Index: git/src/Engine/Config/Config.cs
+===================================================================
+--- git.orig/src/Engine/Config/Config.cs	2011-03-20 16:25:10.000000000 +0100
++++ git/src/Engine/Config/Config.cs	2011-03-20 16:25:10.000000000 +0100
+@@ -354,6 +354,12 @@
              Get(prefix + "Password", String.Empty);
              Get(prefix + "UseEncryption", false);
              Get(prefix + "ValidateServerCertificate", false);

-- 
smuxi