← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/04nickmask-mask.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2007-11-02 18:13:28 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20071102181328-vg4v2tuqeviu16g9
Tags: 0.8.12-2ubuntu1
https://launchpad.net/bugs/67698
* Merge with Debian, remaining Ubuntu changes:
  - Added debian/patches/90irc-ubuntu-com.dpatch (Launchpad #52690).
  - Modify Maintainer value to match the DebianMaintainerField spec.
  - debian/irssi.prerm: Do not alternative. LP: #67698.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/04nickmask-mask.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## nickmask-mask.dpatch by Gerfried Fuchs <rhonda@debian.at>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: report -mask instead of -nickmask in /hilight listing, BTS #417397
 
6
 
 
7
@DPATCH@
 
8
diff -urNad irssi-0.8.12~/src/fe-common/core/hilight-text.c irssi-0.8.12/src/fe-common/core/hilight-text.c
 
9
--- irssi-0.8.12~/src/fe-common/core/hilight-text.c     2007-10-06 11:38:19.000000000 +0200
 
10
+++ irssi-0.8.12/src/fe-common/core/hilight-text.c      2007-10-18 08:27:43.000000000 +0200
 
11
@@ -479,7 +479,7 @@
 
12
                if (rec->word) g_string_append(options, "-word ");
 
13
        }
 
14
 
 
15
-       if (rec->nickmask) g_string_append(options, "-nickmask ");
 
16
+       if (rec->nickmask) g_string_append(options, "-mask ");
 
17
        if (rec->fullword) g_string_append(options, "-fullword ");
 
18
        if (rec->regexp) {
 
19
                g_string_append(options, "-regexp ");