summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Rhodes <drubo@drubo.net>2016-03-30 17:43:27 (GMT)
committerJesse Rhodes <drubo@drubo.net>2016-03-30 17:43:27 (GMT)
commit75cbe4e74146d1db4051c337a5362ac21f471516 (patch)
tree0083ce716da2613638ddeb53ad544b153e9a1034
parent6614e31caf1fe796f455827a524f7333bb6964b5 (diff)
update ubuntu server/channel defaults
-rw-r--r--debian/patches/0001-Ubuntu-server-defaults.patch31
-rw-r--r--debian/patches/ubuntu.series2
2 files changed, 16 insertions, 17 deletions
diff --git a/debian/patches/0001-Ubuntu-server-defaults.patch b/debian/patches/0001-Ubuntu-server-defaults.patch
index 9ecde63..e65bc02 100644
--- a/debian/patches/0001-Ubuntu-server-defaults.patch
+++ b/debian/patches/0001-Ubuntu-server-defaults.patch
@@ -1,23 +1,22 @@
Description: Ubuntu server and channel defaults
- Duplicate freenode as Ubuntu Servers (freenode),
- suggest to join #ubuntu on connect.
- .
- hexchat (2.12.0-1) unstable; urgency=medium
- .
+ Revised addition of irc.ubuntu.com with #ubuntu
+ suggestion
Author: Jesse Rhodes <drubo@drubo.net>
---- a/src/common/servlist.c
-+++ b/src/common/servlist.c
-@@ -160,7 +160,7 @@ static const struct defaultserver def[]
- /* Self signed */
- {0, "irc.fdfnet.net"},
-
-+ {"Ubuntu Servers (freenode)", 0, 0, 0, LOGIN_SASL, 0, TRUE},
-+ {0, "irc.ubuntu.com"},
+--- hexchat-2.12.0.orig/src/common/servlist.c
++++ hexchat-2.12.0/src/common/servlist.c
+@@ -165,6 +165,9 @@ static const struct defaultserver def[]
/* irc. points to chat. but many users and urls still reference it */
{0, "irc.freenode.net"},
-@@ -957,7 +957,7 @@ servlist_load_defaults (void)
+
++ {"Ubuntu Servers (freenode)", 0, 0, 0, LOGIN_SASL, 0, TRUE},
++ {0, "irc.ubuntu.com"},
++
+ {"Furnet", 0, 0, 0, 0, 0, TRUE},
+ {0, "irc.furnet.org"},
+
+@@ -957,7 +960,7 @@ servlist_load_defaults (void)
{
int i = 0, j = 0;
ircnet *net = NULL;
@@ -26,8 +25,8 @@ Author: Jesse Rhodes <drubo@drubo.net>
while (1)
{
---- a/src/fe-gtk/joind.c
-+++ b/src/fe-gtk/joind.c
+--- hexchat-2.12.0.orig/src/fe-gtk/joind.c
++++ hexchat-2.12.0/src/fe-gtk/joind.c
@@ -246,9 +246,9 @@ joind_show_dialog (server *serv)
G_CALLBACK (joind_ok_cb), serv);
diff --git a/debian/patches/ubuntu.series b/debian/patches/ubuntu.series
index 43aae4e..f115a08 100644
--- a/debian/patches/ubuntu.series
+++ b/debian/patches/ubuntu.series
@@ -1,2 +1,2 @@
-0001-Debian-server-defaults.patch
+0001-Ubuntu-server-defaults.patch
0003-build-both-python-plugins.patch