r22564 - in /desktop/unstable/gcalctool/debian: changelog control control.in patches/ patches/01_no_hostname_in_title.patch rules watch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Sat Dec 12 15:32:10 UTC 2009
Author: pochu
Date: Sat Dec 12 15:32:10 2009
New Revision: 22564
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22564
Log:
* debian/rules:
- Include simple-patchsys.mk
- Clean up old stuff.
* debian/patches/01_no_hostname_in_title.patch:
- Backport change from master, don't put the hostname in the window
title when running remotely. Fixes a build failure on the Hurd.
* debian/watch:
- Don't uupdate.
* debian/control.in:
- Stop build depending on libglade-dev, it's no longer needed.
- Build depend on libglib2.0-dev.
Added:
desktop/unstable/gcalctool/debian/patches/
desktop/unstable/gcalctool/debian/patches/01_no_hostname_in_title.patch
Modified:
desktop/unstable/gcalctool/debian/changelog
desktop/unstable/gcalctool/debian/control
desktop/unstable/gcalctool/debian/control.in
desktop/unstable/gcalctool/debian/rules
desktop/unstable/gcalctool/debian/watch
Modified: desktop/unstable/gcalctool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/changelog?rev=22564&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/changelog [utf-8] (original)
+++ desktop/unstable/gcalctool/debian/changelog [utf-8] Sat Dec 12 15:32:10 2009
@@ -1,3 +1,19 @@
+gcalctool (5.28.1-2) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - Include simple-patchsys.mk
+ - Clean up old stuff.
+ * debian/patches/01_no_hostname_in_title.patch:
+ - Backport change from master, don't put the hostname in the window
+ title when running remotely. Fixes a build failure on the Hurd.
+ * debian/watch:
+ - Don't uupdate.
+ * debian/control.in:
+ - Stop build depending on libglade-dev, it's no longer needed.
+ - Build depend on libglib2.0-dev.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 12 Dec 2009 13:26:26 +0100
+
gcalctool (5.28.1-1) unstable; urgency=low
* New upstream bugfix release.
Modified: desktop/unstable/gcalctool/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/control?rev=22564&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/control [utf-8] (original)
+++ desktop/unstable/gcalctool/debian/control [utf-8] Sat Dec 12 15:32:10 2009
@@ -1,8 +1,13 @@
+# This file is autogenerated. DO NOT EDIT!
+#
+# Modifications should be made to debian/control.in instead.
+# This file is regenerated automatically in the clean target.
+
Source: gcalctool
Section: math
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Loic Minier <lool at dooz.org>, Luca Falavigna <dktrkranz at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
debhelper (>= 5),
libatk1.0-dev (>= 1.5),
Modified: desktop/unstable/gcalctool/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/control.in?rev=22564&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/control.in [utf-8] (original)
+++ desktop/unstable/gcalctool/debian/control.in [utf-8] Sat Dec 12 15:32:10 2009
@@ -6,9 +6,9 @@
Build-Depends: cdbs,
debhelper (>= 5),
libatk1.0-dev (>= 1.5),
+ libglib2.0-dev,
libgtk2.0-dev (>= 2.14.0),
libgconf2-dev (>= 2.6.1-2),
- libglade2-dev,
scrollkeeper,
gnome-pkg-tools (>= 0.10),
intltool (>= 0.35.0),
Added: desktop/unstable/gcalctool/debian/patches/01_no_hostname_in_title.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/patches/01_no_hostname_in_title.patch?rev=22564&op=file
==============================================================================
--- desktop/unstable/gcalctool/debian/patches/01_no_hostname_in_title.patch (added)
+++ desktop/unstable/gcalctool/debian/patches/01_no_hostname_in_title.patch [utf-8] Sat Dec 12 15:32:10 2009
@@ -1,0 +1,67 @@
+diff -ruNp gcalctool-5.28.1/src/gtk.c gcalctool-5.28.1.new/src/gtk.c
+--- gcalctool-5.28.1/src/gtk.c 2009-10-13 02:27:11.000000000 +0200
++++ gcalctool-5.28.1.new/src/gtk.c 2009-12-12 13:23:20.000000000 +0100
+@@ -925,40 +925,6 @@ ui_set_undo_enabled(gboolean undo, gbool
+ }
+
+
+-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 @@ ui_set_mode(ModeType mode)
+ {
+ GtkRequisition *r;
+ gint w, h;
+- char *hostname, title[MAXLINE];
+ GtkWidget *menu;
+
+ if (X.mode != mode) {
+@@ -1127,13 +1092,7 @@ ui_set_mode(ModeType mode)
+ 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) {
Modified: desktop/unstable/gcalctool/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/rules?rev=22564&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/rules [utf-8] (original)
+++ desktop/unstable/gcalctool/debian/rules [utf-8] Sat Dec 12 15:32:10 2009
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@@ -13,9 +14,3 @@
ln -s gcalctool.1.gz debian/gcalctool/usr/share/man/man1/gnome-calculator.1.gz
install -d debian/gcalctool/usr/share/pixmaps
cp debian/gcalctool.xpm debian/gcalctool/usr/share/pixmaps/gcalctool.xpm
-binary-post-install/gcalctool::
- rm -rf debian/gcalctool/var
-
-clean::
- rm -f gcalctool/libparser.a
-
Modified: desktop/unstable/gcalctool/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gcalctool/debian/watch?rev=22564&op=diff
==============================================================================
--- desktop/unstable/gcalctool/debian/watch [utf-8] (original)
+++ desktop/unstable/gcalctool/debian/watch [utf-8] Sat Dec 12 15:32:10 2009
@@ -1,4 +1,3 @@
version=2
http://ftp.gnome.org/pub/GNOME/sources/gcalctool/5.([\d\.]+)[02468]/ \
- gcalctool-(.*)\.tar\.gz \
- debian uupdate
+ gcalctool-(.*)\.tar\.gz
More information about the pkg-gnome-commits
mailing list