diff -Nru irssi-0.8.15/debian/changelog irssi-0.8.15/debian/changelog --- irssi-0.8.15/debian/changelog 2012-03-28 01:38:49.000000000 +0000 +++ irssi-0.8.15/debian/changelog 2012-04-06 00:31:14.000000000 +0000 @@ -1,10 +1,16 @@ -irssi (0.8.15-4ubuntu3~ppa2~p) precise; urgency=low +irssi (0.8.15-4ubuntu4~ppa1~p) precise; urgency=low + + * synced with ubuntu + + -- pi-rho Thu, 05 Apr 2012 19:24:30 -0500 + +irssi (0.8.15-4ubuntu3~ppa2~uuu) unstable; urgency=low * fixed ssl-breaking patch -- pi-rho Tue, 27 Mar 2012 20:37:51 -0500 -irssi (0.8.15-4ubuntu3~ppa1~uuu) precise; urgency=low +irssi (0.8.15-4ubuntu3~ppa1~uuu) unstable; urgency=low * ppa exploratory build to find how debian broke my irssi @@ -18,7 +24,7 @@ irssi (0.8.15-4ubuntu1) oneiric; urgency=low - * Merge from Debian precise (LP: #796148), remaining changes: + * Merge from Debian unstable (LP: #796148), remaining changes: - debian/patches/03firsttimer_text: + Adapt it so it tells you about connecting to irc.ubuntu.com and joining #ubuntu instead of irc.debian.org and #debian. @@ -26,7 +32,7 @@ -- أحمد المحمودي (Ahmed El-Mahmoudy) Sun, 12 Jun 2011 11:22:36 +0200 -irssi (0.8.15-4) precise; urgency=medium +irssi (0.8.15-4) unstable; urgency=medium * Update bind_utf8-fix patch from upstream bug tracker to fix issue with now broken alt- keybindings (closes: #625690, #627248) @@ -35,7 +41,7 @@ irssi (0.8.15-3ubuntu1) oneiric; urgency=low - * Merge from Debian precise (LP: #776615), remaining changes: + * Merge from Debian unstable (LP: #776615), remaining changes: - debian/patches/03firsttimer_text: + Adapt it so it tells you about connecting to irc.ubuntu.com and joining #ubuntu instead of irc.debian.org and #debian. @@ -43,7 +49,7 @@ -- أحمد المحمودي (Ahmed El-Mahmoudy) Tue, 03 May 2011 19:56:26 +0200 -irssi (0.8.15-3) precise; urgency=low +irssi (0.8.15-3) unstable; urgency=low * Add patch bind_utf8-fix extracted from upstream bug #553 to enable binding utf8 characters. @@ -56,7 +62,7 @@ irssi (0.8.15-2ubuntu1) natty; urgency=low - * Merge from Debian precise (LP: #691448), remaining changes: + * Merge from Debian unstable (LP: #691448), remaining changes: - debian/patches/03firsttimer_text: + Adapt it so it tells you about connecting to irc.ubuntu.com and joining #ubuntu instead of irc.debian.org and #debian. @@ -68,7 +74,7 @@ -- أحمد المحمودي (Ahmed El-Mahmoudy) Fri, 17 Dec 2010 22:38:11 +0100 -irssi (0.8.15-2) precise; urgency=low +irssi (0.8.15-2) unstable; urgency=low * Switch Vcs-* field values to git.deb.at. * Add patch by Pierre Habouzit for crash when $cumode_space is used. Thanks! @@ -78,7 +84,7 @@ irssi (0.8.15-1ubuntu1) maverick; urgency=low - * Merge from Debian precise (LP: #589209), remaining changes: + * Merge from Debian unstable (LP: #589209), remaining changes: - debian/patches/03firsttimer_text: + Adapt it so it tells you about connecting to irc.ubuntu.com and joining #ubuntu instead of irc.debian.org and #debian. @@ -93,7 +99,7 @@ -- Lorenzo De Liso Thu, 03 Jun 2010 16:30:52 +0200 -irssi (0.8.15-1) precise; urgency=low +irssi (0.8.15-1) unstable; urgency=low * New Upstream version, prepared with current autotools (closes: #575295) * Remove David also from Uploaders field on his own will, thanks for the @@ -101,7 +107,7 @@ -- Gerfried Fuchs Sat, 03 Apr 2010 21:37:36 +0200 -irssi (0.8.15~rc1-1) precise; urgency=low +irssi (0.8.15~rc1-1) unstable; urgency=low * New upstream release candidate, containing fixes for: - Make meta-a behavior configurable (closes: #525970) @@ -146,7 +152,7 @@ irssi (0.8.14-1ubuntu1) karmic; urgency=low - * Merge from debian precise, remaining changes: LP: #406890 + * Merge from debian unstable, remaining changes: LP: #406890 - debian/patches: 03firsttimer_text + Adapt it so it tells you about connecting to irc.ubuntu.com and joining #ubuntu instead of irc.debian.org and #debian. @@ -154,7 +160,7 @@ -- Bhavani Shankar Thu, 30 Jul 2009 19:12:55 +0530 -irssi (0.8.14-1) precise; urgency=low +irssi (0.8.14-1) unstable; urgency=low * New upstream release, dropping wallops-fix patch. * Refreshed quilt patches. @@ -164,7 +170,7 @@ irssi (0.8.13-2ubuntu1) karmic; urgency=low - * Merge from debian precise, remaining changes: LP: #389748 + * Merge from debian unstable, remaining changes: LP: #389748 - debian/patches: 03firsttimer_text + Adapt it so it tells you about connecting to irc.ubuntu.com and joining #ubuntu instead of irc.debian.org and #debian. @@ -172,7 +178,7 @@ -- Bhavani Shankar Sat, 20 Jun 2009 05:51:09 +0530 -irssi (0.8.13-2) precise; urgency=medium +irssi (0.8.13-2) unstable; urgency=medium * New patch: - wallops-fix: Fix CVE-2009-1959 off-by-one in event_wallops @@ -182,7 +188,7 @@ irssi (0.8.13-1ubuntu1) karmic; urgency=low - * Merge from debian precise (LP: #372411), remaining changes: + * Merge from debian unstable (LP: #372411), remaining changes: - debian/patches: 03firsttimer_text + Adapt it so it tells you about connecting to irc.ubuntu.com and joining #ubuntu instead of irc.debian.org and #debian. @@ -191,14 +197,14 @@ -- Andres Rodriguez Tue, 05 May 2009 15:50:50 -0500 -irssi (0.8.13-1) precise; urgency=low +irssi (0.8.13-1) unstable; urgency=low * New upstream release. * Refreshed quilt patches. -- Gerfried Fuchs Tue, 14 Apr 2009 16:59:19 +0200 -irssi (0.8.13~rc1-1) precise; urgency=low +irssi (0.8.13~rc1-1) unstable; urgency=low * New upstream release candidate. * Incorporated patches (removed from packaging): help-URL-fix, @@ -215,7 +221,7 @@ irssi (0.8.12-6ubuntu1) jaunty; urgency=low - * Merge from Debian precise (LP: #326002), Ubuntu remaining changes: + * Merge from Debian unstable (LP: #326002), Ubuntu remaining changes: - Added debian/patches/90irc-ubuntu-com.dpatch - debian/patches/03firsttimer_text: + Adapt it so it tells you about connecting to irc.ubuntu.com and @@ -224,7 +230,7 @@ -- Pedro Fragoso Wed, 04 Feb 2009 21:46:19 +0000 -irssi (0.8.12-6) precise; urgency=low +irssi (0.8.12-6) unstable; urgency=low * New patch: - mode-display-fix: Fix mode display in whois with unreal (379 numeric). @@ -237,7 +243,7 @@ irssi (0.8.12-5ubuntu1) jaunty; urgency=low - * Merge from Debian precise (LP: #295270), Ubuntu remaining changes: + * Merge from Debian unstable (LP: #295270), Ubuntu remaining changes: - Added debian/patches/90irc-ubuntu-com.dpatch - debian/patches/03firsttimer_text: + Adapt it so it tells you about connecting to irc.ubuntu.com and @@ -247,7 +253,7 @@ -- Pedro Fragoso Wed, 05 Nov 2008 02:41:00 +0000 -irssi (0.8.12-5) precise; urgency=low +irssi (0.8.12-5) unstable; urgency=low * New patches: - perlembed-fix to fix adjust to perembed documentation, fixing a @@ -267,7 +273,7 @@ irssi (0.8.12-4ubuntu1) intrepid; urgency=low - * Merge from debian precise (LP: #241282), remaining changes: + * Merge from debian unstable (LP: #241282), remaining changes: - Added debian/patches/90irc-ubuntu-com.dpatch (LP: #52690) - debian/patches/03firsttimer_text: + Adapt it so it tells you about connecting to irc.ubuntu.com and @@ -280,7 +286,7 @@ -- Pedro Fragoso Wed, 11 Jun 2008 15:36:34 +0100 -irssi (0.8.12-4) precise; urgency=low +irssi (0.8.12-4) unstable; urgency=low * Remove alternative handling cleanup from before etch release. * Fixed a typo noticed by John Dong, patch typo-authentification @@ -327,7 +333,7 @@ irssi (0.8.12-3ubuntu1) hardy; urgency=low - * Merge from debian precise, remaining changes (LP: #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. @@ -335,7 +341,7 @@ -- Soren Hansen Tue, 05 Feb 2008 23:17:04 +0100 -irssi (0.8.12-3) precise; urgency=low +irssi (0.8.12-3) unstable; urgency=low [ Gerfried Fuchs ] * Switch to quilt to make it possible to produce the following patch without @@ -371,7 +377,7 @@ -- Emilio Pozuelo Monfort Fri, 02 Nov 2007 18:13:28 +0100 -irssi (0.8.12-2) precise; urgency=low +irssi (0.8.12-2) unstable; urgency=low [ Gerfried Fuchs ] * Added Homepage: to control file. @@ -391,7 +397,7 @@ -- Gerfried Fuchs Thu, 18 Oct 2007 08:29:50 +0200 -irssi (0.8.12-1) precise; urgency=low +irssi (0.8.12-1) unstable; urgency=low [ David Pashley ] * Gerfried Fuchs added to Uploaders (Closes: #445840) @@ -427,7 +433,7 @@ -- Colin Watson Tue, 3 Oct 2006 17:46:55 +0100 -irssi (0.8.10-2) precise; urgency=low +irssi (0.8.10-2) unstable; urgency=low * Fix Conflicts and Replaces lines to make backporting to sarge easier * Fix the menu entry (Closes: #274201) @@ -441,20 +447,20 @@ -- David Pashley Fri, 30 Dec 2005 15:12:29 +0000 -irssi (0.8.10-1) precise; urgency=low +irssi (0.8.10-1) unstable; urgency=low * new upstream release -- David Pashley Sat, 10 Dec 2005 21:25:51 +0000 -irssi (0.8.10~rc8-1) precise; urgency=low +irssi (0.8.10~rc8-1) unstable; urgency=low * New upstream (Closes: #340287) * Add dpatch to the build-depends -- David Pashley Wed, 30 Nov 2005 23:10:27 +0000 -irssi (0.8.10~rc6-1) precise; urgency=low +irssi (0.8.10~rc6-1) unstable; urgency=low * New upstream version * Disable the GnuTLS patch for now. @@ -462,7 +468,7 @@ -- David Pashley Fri, 14 Oct 2005 00:39:15 +0100 -irssi (0.8.10~rc5-1) precise; urgency=low +irssi (0.8.10~rc5-1) unstable; urgency=low * Initial packaging to unify irssi-text and irssi-snapshot * Provide a -dev package for building modules (Closes: #184771) diff -Nru irssi-0.8.15/debian/changelog.old irssi-0.8.15/debian/changelog.old --- irssi-0.8.15/debian/changelog.old 2012-03-28 01:38:31.000000000 +0000 +++ irssi-0.8.15/debian/changelog.old 2012-04-06 00:31:13.000000000 +0000 @@ -1,3 +1,9 @@ +irssi (0.8.15-4ubuntu4~ppa1~uuu) unstable; urgency=low + + * synced with ubuntu + + -- pi-rho Thu, 05 Apr 2012 19:24:30 -0500 + irssi (0.8.15-4ubuntu3~ppa2~uuu) unstable; urgency=low * fixed ssl-breaking patch diff -Nru irssi-0.8.15/debian/patches/18-bind_utf8-fix.patch irssi-0.8.15/debian/patches/18-bind_utf8-fix.patch --- irssi-0.8.15/debian/patches/18-bind_utf8-fix.patch 2012-03-27 01:03:06.000000000 +0000 +++ irssi-0.8.15/debian/patches/18-bind_utf8-fix.patch 2012-04-06 00:31:13.000000000 +0000 @@ -1,28 +1,30 @@ -Author: kyak vim:ft=diff: +Author: Marien Zwart Description: fix for binding utf8 keys Origin: other Bug: http://bugs.irssi.org/index.php?do=details&task_id=553 -Index: b/src/fe-common/core/keyboard.c -=================================================================== ---- a/src/fe-common/core/keyboard.c -+++ b/src/fe-common/core/keyboard.c -@@ -569,8 +569,16 @@ int key_pressed(KEYBOARD_REC *keyboard, - } - - first_key = keyboard->key_state == NULL; -- combo = keyboard->key_state == NULL ? g_strdup(key) : -- g_strconcat(keyboard->key_state, "-", key, NULL); -+ /* fix for binding utf8 characters, done by kyak, upstream bug #553 */ -+ if (keyboard->key_state == NULL) { -+ combo = g_strdup(key); -+ } else if (key[1] != '\0' && key[1] != '[') { -+ char wchar[256]; -+ g_snprintf(wchar, sizeof(wchar), "%c-%c", key[0], key[1]); -+ combo = g_strconcat(keyboard->key_state, "-", wchar, NULL); -+ } else { -+ combo = g_strconcat(keyboard->key_state, "-", key, NULL); -+ } - g_free_and_null(keyboard->key_state); - - rec = g_tree_search(key_states, +=== modified file 'src/fe-common/core/keyboard.c' +--- a/src/fe-common/core/keyboard.c 2011-10-13 20:10:30 +0000 ++++ b/src/fe-common/core/keyboard.c 2011-10-14 21:14:28 +0000 +@@ -304,6 +304,20 @@ + /* possibly beginning of keycombo */ + start = key; + last_hyphen = FALSE; ++ } else if (g_utf8_validate(key, -1, NULL)) { ++ /* Assume we are looking at the start of a ++ * multibyte sequence we will receive as-is, ++ * so add it to the list as-is. ++ */ ++ const char *p, *end = g_utf8_next_char(key); ++ for (p = key; p != end; p++) ++ expand_out_char(*out, *p); ++ expand_out_char(*out, '-'); ++ /* The for loop skips past the remaining character. ++ * Nasty, I know... ++ */ ++ key = end - 1; ++ last_hyphen = FALSE; + } else { + expand_out_char(*out, *key); + expand_out_char(*out, '-'); + diff -Nru irssi-0.8.15/debian/rules irssi-0.8.15/debian/rules --- irssi-0.8.15/debian/rules 2012-03-27 01:26:06.000000000 +0000 +++ irssi-0.8.15/debian/rules 2012-04-06 00:31:13.000000000 +0000 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export DEB_HARDENING_BUILD=1 +export DEB_BUILD_HARDENING=1 include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk