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

« back to all changes in this revision

Viewing changes to debian/patches/02ctcp_version_reply.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
* 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:
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## ctcp_version_reply.dpatch by Gerfried Fuchs <rhonda@debian.at>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: remove $sysname $sysarch from default version reply, BTS #373094
6
 
 
7
 
@DPATCH@
8
 
diff -urNad irssi-0.8.12~/src/irc/core/ctcp.c irssi-0.8.12/src/irc/core/ctcp.c
9
 
--- irssi-0.8.12~/src/irc/core/ctcp.c   2007-10-06 11:38:20.000000000 +0200
10
 
+++ irssi-0.8.12/src/irc/core/ctcp.c    2007-10-17 21:46:47.000000000 +0200
11
 
@@ -328,8 +328,10 @@
12
 
 {
13
 
        ctcp_cmds = NULL;
14
 
 
15
 
+       /* remove $sysname $sysarch from default version reply, too much info,
16
 
+        * see debian bug #373094 */
17
 
        settings_add_str("misc", "ctcp_version_reply",
18
 
-                        PACKAGE_TARNAME" v$J - running on $sysname $sysarch");
19
 
+                        PACKAGE_TARNAME" v$J");
20
 
        settings_add_str("misc", "ctcp_userinfo_reply", "$Y");
21
 
        settings_add_int("flood", "max_ctcp_queue", 5);
22