r16749 - in /packages/unstable/xchat-gnome/debian: ./ patches/
diegoe-guest at users.alioth.debian.org
diegoe-guest at users.alioth.debian.org
Wed Aug 13 10:10:43 UTC 2008
Author: diegoe-guest
Date: Wed Aug 13 10:10:43 2008
New Revision: 16749
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16749
Log:
Integrate serverlist and color codes patches from ubuntu.
Fix 3 big ugly bugs (#476762, #456171, #455699).
Update copyright, control and clean patches/ a bit.
See the changelog for details.
Modified:
packages/unstable/xchat-gnome/debian/changelog
packages/unstable/xchat-gnome/debian/control
packages/unstable/xchat-gnome/debian/control.in
packages/unstable/xchat-gnome/debian/copyright
packages/unstable/xchat-gnome/debian/patches/65_implicit-pointer-conversion-gettext.patch
packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch
packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch
packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch
Modified: packages/unstable/xchat-gnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/changelog?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/changelog (original)
+++ packages/unstable/xchat-gnome/debian/changelog Wed Aug 13 10:10:43 2008
@@ -1,3 +1,34 @@
+xchat-gnome (1:0.18-3) UNRELEASED; urgency=low
+
+ * debian/copyright:
+ - updated Copyright to reflect AUTHORS.
+ * debian/control.in:
+ - don't depend on a specific version of libssl.
+ - updated to Standards-Version: 3.8.0.
+ - remove scrollkeeper dependency, it's disabled in configure.
+ * debian/patches/*:
+ - updated paths to be usable from the top dir with -p1.
+ - add descriptions taken from debian/changelog.
+ * debian/patches/50_serverlist_update.patch:
+ - new patch, imported from ubuntu.
+ - modify default port for irc.freenode.com to 8001 to prevent dcc exploit.
+ - fix Oz.net servers list wrongly referring to OzNet (LP: #146434).
+ * debian/patches/50_fix_color_codes.patch:
+ - new patch, imported from ubuntu.
+ - Add ^C instead of %C for irc color codes (LP: #155543).
+ Thanks Aaron Haviland <orion at parsed.net> for the patch
+ * debian/patches/50_fix_file_set_signal_connect.patch:
+ - new patch, fixes the preferences dialog connecting on the wrong signal
+ and hence eating all the cpu and memory, closes: #476762.
+ * debian/patches/50_from_svn_fix_italian_translation.patch:
+ - new patch from SVN to fix a bad string in italian translation that was
+ causing a crasher, closes: #456171.
+ * debian/patches/90_from_svn_fix_away_back_command.patch:
+ - updated, rename a clashing variable 'away' to 'away_state' as it was
+ conflicting with a widget, closes: #455699.
+
+ -- Diego Escalante Urrelo <dieguito at gmail.com> Tue, 12 Aug 2008 20:24:18 -0500
+
xchat-gnome (1:0.18-2) unstable; urgency=low
* All patches in this release were taken from the Ubuntu package.
Modified: packages/unstable/xchat-gnome/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/control?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/control (original)
+++ packages/unstable/xchat-gnome/debian/control Wed Aug 13 10:10:43 2008
@@ -19,16 +19,15 @@
libxml-parser-perl,
libdbus-glib-1-dev (>= 0.60),
libtool,
- scrollkeeper,
libgnutls-dev,
libnotify-dev (>= 0.3.2),
libsexy-dev (>= 0.1.11),
gnome-doc-utils,
- libssl-dev (>= 0.9.8b-1),
+ libssl-dev,
dpkg-dev (>= 1.13.19),
libglib2.0-dev (>= 2.12.0),
libgnome2-dev (>= 2.16.0)
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Package: xchat-gnome
Architecture: any
Modified: packages/unstable/xchat-gnome/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/control.in?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/control.in (original)
+++ packages/unstable/xchat-gnome/debian/control.in Wed Aug 13 10:10:43 2008
@@ -19,16 +19,15 @@
libxml-parser-perl,
libdbus-glib-1-dev (>= 0.60),
libtool,
- scrollkeeper,
libgnutls-dev,
libnotify-dev (>= 0.3.2),
libsexy-dev (>= 0.1.11),
gnome-doc-utils,
- libssl-dev (>= 0.9.8b-1),
+ libssl-dev,
dpkg-dev (>= 1.13.19),
libglib2.0-dev (>= 2.12.0),
libgnome2-dev (>= 2.16.0)
-Standards-Version: 3.7.2
+Standards-Version: 3.8.0
Package: xchat-gnome
Architecture: any
Modified: packages/unstable/xchat-gnome/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/copyright?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/copyright (original)
+++ packages/unstable/xchat-gnome/debian/copyright Wed Aug 13 10:10:43 2008
@@ -6,7 +6,22 @@
It was downloaded from:
<http://releases.navi.cx/xchat-gnome>
-Copyright Holder: Peter Zelezny
+Copyright:
+ Andre Dahlqvist <andre.bugs at gmail.com>
+ Bastien Nocera <hadess at hadess.net>
+ Brian Pepple <bdpepple at gmail.com>
+ Christian Persch <chpe at gnome.org>
+ Dan Kuester <Daniel.Kuester at colorado.edu>
+ Daniel Drake <dsd at gentoo.org>
+ David Trowbridge <trowbrds at gmail.com>
+ Evan Sheehan <Wallace.Sheehan at gmail.com>
+ Guillaume Desmottes <cass at skynet.be>
+ Isak Savo <iso01001 at student.mdh.se>
+ Luis Villa <luis.villa at gmail.com>
+ Peter Železný <zed at xchat.org>
+ Ramón Rey Vicente <ramon.rey at hispalinux.es>
+ Rouslan Solomakhin <solomarv at cosi.clarkson.edu>
+ Xavier Claessens <xclaesse at gmail.com>
License:
Modified: packages/unstable/xchat-gnome/debian/patches/65_implicit-pointer-conversion-gettext.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/65_implicit-pointer-conversion-gettext.patch?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/65_implicit-pointer-conversion-gettext.patch (original)
+++ packages/unstable/xchat-gnome/debian/patches/65_implicit-pointer-conversion-gettext.patch Wed Aug 13 10:10:43 2008
@@ -1,8 +1,11 @@
-Debian #428459; GNOME #447453
+Fixes a couple of implicit pointer conversion for the _() gettext function;
+thanks Dann Frazier for the report; note: a different fix thant the proposed
+patch was used.
+GNOME #447453; closes: #428459.
diff -Nur xchat-gnome-0.17/plugins/tcl/tclplugin.c xchat-gnome-0.17.new/plugins/tcl/tclplugin.c
---- xchat-gnome-0.17/plugins/tcl/tclplugin.c 2007-03-06 23:47:26.000000000 +0100
-+++ xchat-gnome-0.17.new/plugins/tcl/tclplugin.c 2007-06-14 11:20:31.000000000 +0200
+--- a/plugins/tcl/tclplugin.c 2007-03-06 23:47:26.000000000 +0100
++++ b/plugins/tcl/tclplugin.c 2007-06-14 11:20:31.000000000 +0200
@@ -18,6 +18,7 @@
static char RCSID[] = "$Id: tclplugin.c,v 1.59 2005/08/11 02:37:55 mooooooo Exp $";
Modified: packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch (original)
+++ packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch Wed Aug 13 10:10:43 2008
@@ -1,7 +1,7 @@
-Index: src/fe-gnome/preferences-page-spellcheck.c
-===================================================================
---- src/fe-gnome/preferences-page-spellcheck.c (révision 2576)
-+++ src/fe-gnome/preferences-page-spellcheck.c (copie de travail)
+Correctly update the languages list when selecting one.
+
+--- a/src/fe-gnome/preferences-page-spellcheck.c (révision 2576)
++++ b/src/fe-gnome/preferences-page-spellcheck.c (copie de travail)
@@ -153,7 +153,7 @@
COL_LANG_CODE, &lang, -1);
active = sexy_spell_entry_language_is_active (SEXY_SPELL_ENTRY (gui.text_entry), lang);
Modified: packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch (original)
+++ packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch Wed Aug 13 10:10:43 2008
@@ -1,7 +1,7 @@
-Index: src/common/text.c
-===================================================================
---- src/common/text.c (révision 2576)
-+++ src/common/text.c (copie de travail)
+Don't display translation informations when a query tab is opened.
+
+--- a/src/common/text.c (révision 2576)
++++ b/src/common/text.c (copie de travail)
@@ -1368,7 +1368,7 @@
free (pntevts_text[i]);
Modified: packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch?rev=16749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch (original)
+++ packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch Wed Aug 13 10:10:43 2008
@@ -1,5 +1,7 @@
---- trunk/src/fe-gnome/main-window.c 2007/09/09 22:34:50 2560
-+++ trunk/src/fe-gnome/main-window.c 2007/09/09 22:56:32 2561
+Patch from SVN, returning from away should use the back command.
+
+--- a/src/fe-gnome/main-window.c 2007/09/09 22:34:50 2560
++++ b/src/fe-gnome/main-window.c 2007/09/09 22:56:32 2561
@@ -532,11 +532,20 @@
g_free (buf);
@@ -7,9 +9,9 @@
- if (current_sess->server->is_away != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (away))) {
- if (all) {
- handle_command (current_sess, "allserv away", FALSE);
-+ gboolean away = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (away));
-+ if (current_sess->server->is_away != away) {
-+ if (away) {
++ gboolean away_state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (away));
++ if (current_sess->server->is_away != away_state) {
++ if (away_state) {
+ if (all) {
+ handle_command (current_sess, "allserv away", FALSE);
+ } else {
More information about the pkg-gnome-commits
mailing list