r46814 - in /packages/unstable/xchat-gnome/debian: ./ patches/
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Mon Oct 26 10:34:03 UTC 2015
Author: ah
Date: Mon Oct 26 10:34:02 2015
New Revision: 46814
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=46814
Log:
* Add Vcs-* fields.
* New upstream git snapshot.
- should fix build issues when using gnome-common 3.18
(see https://git.gnome.org/browse/xchat-gnome/commit/?id=58ced4 )
* Drop patches for issues with fixes included in upstream snapshot:
- 120-fix-clipboard-segfault.patch
- define_functions_fix_build.patch
* Have quilt refresh remaining patches.
Removed:
packages/unstable/xchat-gnome/debian/patches/120-fix-clipboard-segfault.patch
packages/unstable/xchat-gnome/debian/patches/define_functions_fix_build.patch
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/patches/01_finish_gtk3_port.patch
packages/unstable/xchat-gnome/debian/patches/02_bring_back_completion.patch
packages/unstable/xchat-gnome/debian/patches/03_scroll_wheel.patch
packages/unstable/xchat-gnome/debian/patches/04_no_spellcheck.patch
packages/unstable/xchat-gnome/debian/patches/series
Modified: packages/unstable/xchat-gnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/changelog?rev=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/changelog [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/changelog [utf-8] Mon Oct 26 10:34:02 2015
@@ -1,8 +1,19 @@
-xchat-gnome (1:0.30.0~git20131003.d20b8d-4) UNRELEASED; urgency=medium
-
+xchat-gnome (1:0.30.0~git20151026.decb2a-1) UNRELEASED; urgency=medium
+
+ [ Michael Biebl ]
* Remove Debian menu entry.
- -- Michael Biebl <biebl at debian.org> Fri, 04 Sep 2015 17:44:57 +0200
+ [ Andreas Henriksson ]
+ * Add Vcs-* fields.
+ * New upstream git snapshot.
+ - should fix build issues when using gnome-common 3.18
+ (see https://git.gnome.org/browse/xchat-gnome/commit/?id=58ced4 )
+ * Drop patches for issues with fixes included in upstream snapshot:
+ - 120-fix-clipboard-segfault.patch
+ - define_functions_fix_build.patch
+ * Have quilt refresh remaining patches.
+
+ -- Andreas Henriksson <andreas at fatal.se> Mon, 26 Oct 2015 11:19:10 +0100
xchat-gnome (1:0.30.0~git20131003.d20b8d-3) unstable; urgency=medium
Modified: packages/unstable/xchat-gnome/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/control?rev=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/control [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/control [utf-8] Mon Oct 26 10:34:02 2015
@@ -34,6 +34,8 @@
libsm-dev (>= 2:1.0.0),
libice-dev
Standards-Version: 3.9.2
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/xchat-gnome
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/xchat-gnome/
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=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/control.in [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/control.in [utf-8] Mon Oct 26 10:34:02 2015
@@ -30,6 +30,8 @@
libsm-dev (>= 2:1.0.0),
libice-dev
Standards-Version: 3.9.2
+Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/xchat-gnome
+Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/xchat-gnome/
Package: xchat-gnome
Architecture: any
Modified: packages/unstable/xchat-gnome/debian/patches/01_finish_gtk3_port.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/01_finish_gtk3_port.patch?rev=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/01_finish_gtk3_port.patch [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/patches/01_finish_gtk3_port.patch [utf-8] Mon Oct 26 10:34:02 2015
@@ -1,7 +1,5 @@
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/connect-dialog.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/connect-dialog.c 2013-10-26 19:57:37.561541400 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/connect-dialog.c 2013-10-26 19:57:37.537542358 +0200
+--- a/src/fe-gnome/connect-dialog.c
++++ b/src/fe-gnome/connect-dialog.c
@@ -29,187 +29,117 @@
#include "../common/xchatc.h"
#include "../common/servlist.h"
@@ -267,10 +265,8 @@
- return g_object_new (CONNECT_DIALOG_TYPE, 0);
+ gtk_widget_destroy (dialog);
}
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/connect-dialog.h
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/connect-dialog.h 2013-10-26 19:57:37.561541400 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/connect-dialog.h 2013-10-26 19:57:37.537542358 +0200
+--- a/src/fe-gnome/connect-dialog.h
++++ b/src/fe-gnome/connect-dialog.h
@@ -25,34 +25,6 @@
#ifndef XCHAT_GNOME_CONNECT_DIALOG_H
#define XCHAT_GNOME_CONNECT_DIALOG_H
@@ -307,11 +303,9 @@
+void connekt_dialog ();
#endif
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/fe-gnome.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/fe-gnome.c 2013-10-26 19:57:37.561541400 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/fe-gnome.c 2013-10-26 19:57:37.537542358 +0200
-@@ -195,10 +195,7 @@ fe_init (void)
+--- a/src/fe-gnome/fe-gnome.c
++++ b/src/fe-gnome/fe-gnome.c
+@@ -196,10 +196,7 @@
arg_skip_plugins = 1;
if (not_autoconnect ()) {
@@ -323,11 +317,9 @@
}
#ifdef USE_PLUGIN
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/main-window.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/main-window.c 2013-10-26 19:57:37.561541400 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/main-window.c 2013-10-26 19:57:37.537542358 +0200
-@@ -331,8 +331,7 @@ static void on_add_widget (GtkUIManager
+--- a/src/fe-gnome/main-window.c
++++ b/src/fe-gnome/main-window.c
+@@ -333,8 +333,7 @@
static void
on_irc_connect_activate (GtkAction *action, gpointer data)
{
@@ -337,11 +329,9 @@
}
void
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/preferences-dialog.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/preferences-dialog.c 2013-10-26 19:57:37.561541400 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/preferences-dialog.c 2013-10-26 19:57:37.537542358 +0200
-@@ -57,11 +57,6 @@ preferences_dialog_dispose (GObject *obj
+--- a/src/fe-gnome/preferences-dialog.c
++++ b/src/fe-gnome/preferences-dialog.c
+@@ -57,11 +57,6 @@
p->colors_page = NULL;
}
@@ -353,7 +343,7 @@
if (p->dcc_page) {
g_object_unref (p->dcc_page);
p->dcc_page = NULL;
-@@ -238,7 +233,6 @@ preferences_dialog_init (PreferencesDial
+@@ -238,7 +233,6 @@
p->irc_page = preferences_page_irc_new (p, xml);
p->spellcheck_page= preferences_page_spellcheck_new (p,xml);
p->colors_page = preferences_page_colors_new (p, xml);
@@ -361,10 +351,8 @@
p->dcc_page = preferences_page_dcc_new (p, xml);
p->networks_page = preferences_page_networks_new (p, xml);
#ifdef USE_PLUGIN
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/preferences-dialog.h
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/preferences-dialog.h 2013-10-26 19:57:37.561541400 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/preferences-dialog.h 2013-10-26 19:57:37.541542202 +0200
+--- a/src/fe-gnome/preferences-dialog.h
++++ b/src/fe-gnome/preferences-dialog.h
@@ -23,7 +23,6 @@
#include "gui.h"
#include "preferences-page-irc.h"
@@ -373,7 +361,7 @@
#include "preferences-page-dcc.h"
#include "preferences-page-networks.h"
#include "preferences-page-plugins.h"
-@@ -56,7 +55,6 @@ struct _PreferencesDialog
+@@ -56,7 +55,6 @@
PreferencesPageIrc *irc_page;
PreferencesPageColors *colors_page;
Modified: packages/unstable/xchat-gnome/debian/patches/02_bring_back_completion.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/02_bring_back_completion.patch?rev=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/02_bring_back_completion.patch [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/patches/02_bring_back_completion.patch [utf-8] Mon Oct 26 10:34:02 2015
@@ -1,8 +1,6 @@
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/text-entry.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/text-entry.c 2013-10-26 21:17:44.062548522 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/text-entry.c 2013-10-26 21:23:39.914512963 +0200
-@@ -41,9 +41,13 @@ static void text_entry_activate
+--- a/src/fe-gnome/text-entry.c
++++ b/src/fe-gnome/text-entry.c
+@@ -41,9 +41,13 @@
gpointer data);
static void text_entry_history_up (GtkEntry *entry);
static void text_entry_history_down (GtkEntry *entry);
@@ -16,7 +14,7 @@
static GtkWidget *get_color_icon (int c,
GtkStyle *style);
static void color_code_activate (GtkMenuItem *item,
-@@ -54,6 +58,7 @@ G_DEFINE_TYPE (TextEntry, text_entry, GT
+@@ -54,6 +58,7 @@
struct _TextEntryPriv
{
@@ -24,7 +22,7 @@
GHashTable *current_text;
struct session *session;
};
-@@ -69,15 +74,46 @@ text_entry_class_init (TextEntryClass *k
+@@ -69,15 +74,46 @@
gobject_class->finalize = text_entry_finalize;
}
@@ -71,7 +69,7 @@
/* Save the current input for each session */
entry->priv->current_text = g_hash_table_new (NULL, NULL);
-@@ -91,6 +127,9 @@ text_entry_finalize (GObject *object)
+@@ -91,6 +127,9 @@
entry = TEXT_ENTRY (object);
@@ -81,7 +79,7 @@
if (entry->priv)
{
g_free (entry->priv);
-@@ -114,7 +153,7 @@ text_entry_key_press (GtkWidget *widget,
+@@ -114,7 +153,7 @@
text_entry_history_up (GTK_ENTRY (widget));
return TRUE;
case GDK_KEY_Tab:
@@ -90,7 +88,7 @@
default:
return FALSE;
}
-@@ -167,6 +206,58 @@ text_entry_history_down (GtkEntry *entry
+@@ -167,6 +206,58 @@
}
}
@@ -149,7 +147,7 @@
static void
text_entry_populate_popup (GtkEntry *entry, GtkMenu *menu, gpointer data)
{
-@@ -248,6 +339,183 @@ text_entry_populate_popup (GtkEntry *ent
+@@ -248,6 +339,183 @@
gtk_widget_show_all (submenu);
}
@@ -333,11 +331,9 @@
static GtkWidget *
get_color_icon (int c, GtkStyle *style)
{
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/userlist.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/userlist.c 2013-10-26 21:17:44.062548522 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/userlist.c 2013-10-26 21:17:44.046549053 +0200
-@@ -37,6 +37,7 @@ static GObjectClass *parent_class = NULL
+--- a/src/fe-gnome/userlist.c
++++ b/src/fe-gnome/userlist.c
+@@ -37,6 +37,7 @@
typedef struct
{
GtkListStore *liststore;
@@ -345,7 +341,7 @@
GList *completion_items;
} Store;
-@@ -84,6 +85,7 @@ static gboolean
+@@ -84,6 +85,7 @@
destroy_store (session *session, Store *store, gpointer data)
{
g_object_unref (store->liststore);
@@ -353,7 +349,7 @@
g_free (store);
return TRUE;
}
-@@ -118,6 +120,7 @@ create_userlist (Userlist *userlist, ses
+@@ -118,6 +120,7 @@
Store *store = g_new (Store, 1);
store->liststore = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER, GDK_TYPE_COLOR);
@@ -361,7 +357,7 @@
store->completion_items = NULL;
g_hash_table_insert (userlist->stores, sess, store);
-@@ -156,6 +159,7 @@ userlist_insert (Userlist *userlist, ses
+@@ -156,6 +159,7 @@
gtk_list_store_set (store->liststore, &iter, 0, icon, 1, newuser->nick, 2, newuser, 3, newuser->away ? &colors[40] : NULL, -1);
item = g_list_append (NULL, newuser->nick);
@@ -369,7 +365,7 @@
store->completion_items = g_list_concat (store->completion_items, item);
userlist_set_user_button (userlist, sess);
-@@ -197,6 +201,7 @@ userlist_remove_user (Userlist *userlist
+@@ -197,6 +201,7 @@
item = g_list_find_custom (store->completion_items, user->nick, (GCompareFunc) strcmp);
store->completion_items = g_list_remove_link (store->completion_items, item);
@@ -377,7 +373,7 @@
g_list_free (item);
userlist_set_user_button (userlist, sess);
-@@ -219,11 +224,13 @@ userlist_update (Userlist *userlist, ses
+@@ -219,11 +224,13 @@
item = g_list_find_custom (store->completion_items, nick, (GCompareFunc) strcmp);
store->completion_items = g_list_remove_link (store->completion_items, item);
@@ -391,7 +387,7 @@
store->completion_items = g_list_concat (store->completion_items, item);
g_free (nick);
-@@ -255,6 +262,7 @@ userlist_clear_all (Userlist *userlist,
+@@ -255,6 +262,7 @@
store = create_userlist (userlist, sess);
}
@@ -399,7 +395,7 @@
gtk_list_store_clear (store->liststore);
}
-@@ -267,6 +275,7 @@ userlist_erase (Userlist *userlist, sess
+@@ -267,6 +275,7 @@
}
g_object_unref (store->liststore);
@@ -407,7 +403,7 @@
g_free (store);
g_hash_table_remove (userlist->stores, sess);
}
-@@ -281,12 +290,12 @@ userlist_get_store (Userlist *userlist,
+@@ -281,12 +290,12 @@
return store->liststore;
}
@@ -422,11 +418,9 @@
}
void
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/userlist.h
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/userlist.h 2013-10-26 21:17:44.062548522 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/userlist.h 2013-10-26 21:17:44.050548923 +0200
-@@ -59,7 +59,7 @@ void userlist_move (
+--- a/src/fe-gnome/userlist.h
++++ b/src/fe-gnome/userlist.h
+@@ -59,7 +59,7 @@
void userlist_clear_all (Userlist *userlist, session *sess);
void userlist_erase (Userlist *userlist, session *sess);
GtkListStore* userlist_get_store (Userlist *userlist, session *sess);
Modified: packages/unstable/xchat-gnome/debian/patches/03_scroll_wheel.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/03_scroll_wheel.patch?rev=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/03_scroll_wheel.patch [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/patches/03_scroll_wheel.patch [utf-8] Mon Oct 26 10:34:02 2015
@@ -1,8 +1,6 @@
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/xtext.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/xtext.c 2013-10-04 00:05:49.000000000 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/xtext.c 2013-10-26 22:07:28.637510489 +0200
-@@ -611,7 +611,7 @@ gtk_xtext_realize (GtkWidget * widget)
+--- a/src/fe-gnome/xtext.c
++++ b/src/fe-gnome/xtext.c
+@@ -611,7 +611,7 @@
attributes.wclass = GDK_INPUT_OUTPUT;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.event_mask = gtk_widget_get_events (widget) |
Modified: packages/unstable/xchat-gnome/debian/patches/04_no_spellcheck.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/04_no_spellcheck.patch?rev=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/04_no_spellcheck.patch [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/patches/04_no_spellcheck.patch [utf-8] Mon Oct 26 10:34:02 2015
@@ -1,8 +1,6 @@
-Index: xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/preferences-dialog.c
-===================================================================
---- xchat-gnome-0.30.0~git20131003.d20b8d.orig/src/fe-gnome/preferences-dialog.c 2013-10-26 22:12:03.499640389 +0200
-+++ xchat-gnome-0.30.0~git20131003.d20b8d/src/fe-gnome/preferences-dialog.c 2013-10-26 22:13:51.631663669 +0200
-@@ -74,11 +74,6 @@ preferences_dialog_dispose (GObject *obj
+--- a/src/fe-gnome/preferences-dialog.c
++++ b/src/fe-gnome/preferences-dialog.c
+@@ -74,11 +74,6 @@
}
#endif
@@ -14,7 +12,7 @@
if (p->gconf) {
g_object_unref (p->gconf);
p->gconf = NULL;
-@@ -231,7 +226,6 @@ preferences_dialog_init (PreferencesDial
+@@ -231,7 +226,6 @@
g_signal_connect (G_OBJECT (select), "changed", G_CALLBACK (page_selection_changed), p);
p->irc_page = preferences_page_irc_new (p, xml);
Modified: packages/unstable/xchat-gnome/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/series?rev=46814&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/series [utf-8] (original)
+++ packages/unstable/xchat-gnome/debian/patches/series [utf-8] Mon Oct 26 10:34:02 2015
@@ -2,6 +2,4 @@
02_bring_back_completion.patch
03_scroll_wheel.patch
04_no_spellcheck.patch
-120-fix-clipboard-segfault.patch
-define_functions_fix_build.patch
perl5.20.patch
More information about the pkg-gnome-commits
mailing list