r24084 - in /desktop/unstable/gcalctool/debian: changelog patches/ patches/no_hostname_in_title.patch patches/series source/ source/format

[dktrkranz at users.alioth.debian.org]

Author: dktrkranz
Date: Wed Apr 28 18:27:50 2010
New Revision: 24084

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24084
Log:
* The "Oldies but Goldies" release: switch back to 5.28.2, more stable
  and user-friendly (Closes: #576579, #578187, #578853, #579323).
* Switch to format 3.0 (quilt).

Added:
    desktop/unstable/gcalctool/debian/patches/
    desktop/unstable/gcalctool/debian/patches/no_hostname_in_title.patch
    desktop/unstable/gcalctool/debian/patches/series
    desktop/unstable/gcalctool/debian/source/
    desktop/unstable/gcalctool/debian/source/format
Modified:
    desktop/unstable/gcalctool/debian/changelog

Modified: desktop/unstable/gcalctool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/changelog?rev=24084&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/changelog [utf-8] (original)
+++ desktop/unstable/gcalctool/debian/changelog [utf-8] Wed Apr 28 18:27:50 2010
@@ -1,3 +1,11 @@
+gcalctool (1:5.28.2-1) unstable; urgency=low
+
+  * The "Oldies but Goldies" release: switch back to 5.28.2, more stable
+    and user-friendly (Closes: #576579, #578187, #578853, #579323).
+  * Switch to format 3.0 (quilt).
+
+ -- Luca Falavigna <dktrkranz at debian.org>  Wed, 28 Apr 2010 20:18:52 +0200
+
 gcalctool (5.30.1-1) unstable; urgency=low
 
   * New upstream bugfix release.

Added: desktop/unstable/gcalctool/debian/patches/no_hostname_in_title.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/patches/no_hostname_in_title.patch?rev=24084&op=file
==============================================================================
--- desktop/unstable/gcalctool/debian/patches/no_hostname_in_title.patch (added)
+++ desktop/unstable/gcalctool/debian/patches/no_hostname_in_title.patch [utf-8] Wed Apr 28 18:27:50 2010
@@ -1,0 +1,70 @@
+Don't put the hostname in the window title when running remotely.
+
+Index: gcalctool-5.28.2/src/gtk.c
+===================================================================
+--- gcalctool-5.28.2.orig/src/gtk.c	2010-04-28 20:24:57.011419896 +0200
++++ gcalctool-5.28.2/src/gtk.c	2010-04-28 20:24:54.279414159 +0200
+@@ -925,40 +925,6 @@
+ }
+ 
+ 
+-static char *
+-make_hostname()
+-{
+-    Display *dpy = GDK_DISPLAY();
+-    char client_hostname[MAXLINE] = "";
+-    char hostname[MAXHOSTNAMELEN];
+-    char *display = DisplayString(dpy);
+-    char *scanner = display;
+-
+-    gethostname(hostname, MAXHOSTNAMELEN);
+-
+-    while (*scanner)
+-        scanner++;
+-
+-    while (*scanner != ':')
+-        scanner--;
+-
+-    *scanner = '\0';
+-                                            
+-    if (strcmp(display, hostname) &&        
+-        strcmp(display, "localhost") &&     
+-        strcmp(display, "unix") &&          
+-        strcmp(display, ""))
+-        SNPRINTF(client_hostname, MAXLINE, " [%s] ", hostname);
+-
+-    *scanner = ':';
+-    
+-    if (client_hostname[0] == '\0')
+-        return NULL;
+-    else
+-        return strdup(client_hostname);
+-}
+-
+-
+ gchar *
+ ui_get_display(void)
+ {
+@@ -1027,7 +993,6 @@
+ {
+     GtkRequisition *r;
+     gint w, h;
+-    char *hostname, title[MAXLINE];
+     GtkWidget *menu;
+ 
+     if (X.mode != mode) {
+@@ -1127,13 +1092,7 @@
+     gtk_window_resize(GTK_WINDOW(X.main_window), w, h);
+ 
+     /* Set the title */
+-    if((hostname = make_hostname())) {
+-        SNPRINTF(title, MAXLINE, gettext(hostname_titles[mode]), hostname);
+-        g_free(hostname);
+-    } else {
+-        SNPRINTF(title, MAXLINE, "%s", gettext(titles[mode]));
+-    }
+-    gtk_window_set_title(GTK_WINDOW(X.main_window), title);
++    gtk_window_set_title(GTK_WINDOW(X.main_window), gettext(titles[mode]));
+ 
+     /* Update the menu */
+     switch (mode) {

Added: desktop/unstable/gcalctool/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/patches/series?rev=24084&op=file
==============================================================================
--- desktop/unstable/gcalctool/debian/patches/series (added)
+++ desktop/unstable/gcalctool/debian/patches/series [utf-8] Wed Apr 28 18:27:50 2010
@@ -1,0 +1,1 @@
+no_hostname_in_title.patch

Added: desktop/unstable/gcalctool/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/source/format?rev=24084&op=file
==============================================================================
--- desktop/unstable/gcalctool/debian/source/format (added)
+++ desktop/unstable/gcalctool/debian/source/format [utf-8] Wed Apr 28 18:27:50 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)