← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/irssi/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/90irc-ubuntu-com.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2008-02-05 23:17:04 UTC
  • Revision ID: james.westby@ubuntu.com-20080205231704-gl9bsdgdfweyk3ff
Tags: 0.8.12-3ubuntu1
https://launchpad.net/bugs/181641
* Merge from debian unstable, remaining changes (LP: #181641):
  - Added debian/patches/90irc-ubuntu-com.dpatch (Launchpad #52690).
    New with this merge: We now also apply this patch.
  - Modify Maintainer value to match the DebianMaintainerField spec.
  - debian/irssi.prerm: Don't remove alternative on upgrades (LP #67698).

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/90irc-ubuntu-com.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 90irc-ubuntu-com.dpatch by Colin Watson <cjwatson@ubuntu.com>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad irssi-0.8.10~/irssi.conf irssi-0.8.10/irssi.conf
9
 
--- irssi-0.8.10~/irssi.conf    2005-12-08 17:32:50.000000000 +0000
10
 
+++ irssi-0.8.10/irssi.conf     2006-10-03 17:44:27.000000000 +0100
11
 
@@ -1,4 +1,5 @@
12
 
 servers = (
13
 
+  { address = "irc.ubuntu.com"; chatnet = "Ubuntu"; port = "6667"; },
14
 
   { address = "irc.stealth.net"; chatnet = "IRCnet"; port = "6668"; },
15
 
   { address = "irc.efnet.net"; chatnet = "EFNet"; port = "6667"; },
16
 
   {