diff -Nru putty-0.62/debian/changelog putty-0.62/debian/changelog --- putty-0.62/debian/changelog 2011-12-31 09:10:51.000000000 +0000 +++ putty-0.62/debian/changelog 2012-01-03 21:34:29.000000000 +0000 @@ -1,8 +1,16 @@ -putty (0.62-1ubuntu1) precise; urgency=low +putty (0.62-3) unstable; urgency=low - * Don't FTBFS because of deprecated declarations. + * Fix icon-debug.patch to print debug information to stderr, not stdout. - -- Ilya Barygin Sat, 31 Dec 2011 13:10:24 +0400 + -- Colin Watson Tue, 03 Jan 2012 21:34:28 +0000 + +putty (0.62-2) unstable; urgency=low + + * Avoid deprecated GLib functions. + * Add temporary debugging patch to try to figure out why the + kfreebsd-amd64 build is failing. + + -- Colin Watson Tue, 03 Jan 2012 18:14:45 +0000 putty (0.62-1) unstable; urgency=high diff -Nru putty-0.62/debian/control putty-0.62/debian/control --- putty-0.62/debian/control 2011-12-31 09:04:15.000000000 +0000 +++ putty-0.62/debian/control 2011-05-30 09:01:20.000000000 +0000 @@ -1,8 +1,7 @@ Source: putty Section: net Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Colin Watson +Maintainer: Colin Watson Standards-Version: 3.5.9 Build-Depends: debhelper (>= 7.0.50), pkg-config, libgtk2.0-dev, x11proto-core-dev, libx11-dev, imagemagick, python Vcs-Bzr: http://anonscm.debian.org/bzr/pkg-ssh/putty/trunk diff -Nru putty-0.62/debian/patches/glib-deprecated-functions.patch putty-0.62/debian/patches/glib-deprecated-functions.patch --- putty-0.62/debian/patches/glib-deprecated-functions.patch 1970-01-01 00:00:00.000000000 +0000 +++ putty-0.62/debian/patches/glib-deprecated-functions.patch 2012-01-03 21:23:15.000000000 +0000 @@ -0,0 +1,105 @@ +Description: Avoid deprecated GLib functions +Author: Colin Watson +Forwarded: yes +Applied-Upstream: http://bazaar.launchpad.net/+branch/putty/revision/3403 +Last-Update: 2012-01-03 + +Index: b/unix/gtkfont.c +=================================================================== +--- a/unix/gtkfont.c ++++ b/unix/gtkfont.c +@@ -47,6 +47,11 @@ + * I haven't the energy. + */ + ++#if !GLIB_CHECK_VERSION(1,3,7) ++#define g_ascii_strcasecmp g_strcasecmp ++#define g_ascii_strncasecmp g_strncasecmp ++#endif ++ + /* + * Ad-hoc vtable mechanism to allow font structures to be + * polymorphic. +@@ -524,21 +529,21 @@ + style = p; + p += sprintf(p, "%s", components[2][0] ? components[2] : + "regular"); +- if (!g_strcasecmp(components[3], "i")) ++ if (!g_ascii_strcasecmp(components[3], "i")) + p += sprintf(p, " italic"); +- else if (!g_strcasecmp(components[3], "o")) ++ else if (!g_ascii_strcasecmp(components[3], "o")) + p += sprintf(p, " oblique"); +- else if (!g_strcasecmp(components[3], "ri")) ++ else if (!g_ascii_strcasecmp(components[3], "ri")) + p += sprintf(p, " reverse italic"); +- else if (!g_strcasecmp(components[3], "ro")) ++ else if (!g_ascii_strcasecmp(components[3], "ro")) + p += sprintf(p, " reverse oblique"); +- else if (!g_strcasecmp(components[3], "ot")) ++ else if (!g_ascii_strcasecmp(components[3], "ot")) + p += sprintf(p, " other-slant"); +- if (components[4][0] && g_strcasecmp(components[4], "normal")) ++ if (components[4][0] && g_ascii_strcasecmp(components[4], "normal")) + p += sprintf(p, " %s", components[4]); +- if (!g_strcasecmp(components[10], "m")) ++ if (!g_ascii_strcasecmp(components[10], "m")) + p += sprintf(p, " [M]"); +- if (!g_strcasecmp(components[10], "c")) ++ if (!g_ascii_strcasecmp(components[10], "c")) + p += sprintf(p, " [C]"); + if (components[5][0]) + p += sprintf(p, " %s", components[5]); +@@ -550,23 +555,23 @@ + */ + p++; + stylekey = p; +- if (!g_strcasecmp(components[2], "medium") || +- !g_strcasecmp(components[2], "regular") || +- !g_strcasecmp(components[2], "normal") || +- !g_strcasecmp(components[2], "book")) ++ if (!g_ascii_strcasecmp(components[2], "medium") || ++ !g_ascii_strcasecmp(components[2], "regular") || ++ !g_ascii_strcasecmp(components[2], "normal") || ++ !g_ascii_strcasecmp(components[2], "book")) + weightkey = 0; +- else if (!g_strncasecmp(components[2], "demi", 4) || +- !g_strncasecmp(components[2], "semi", 4)) ++ else if (!g_ascii_strncasecmp(components[2], "demi", 4) || ++ !g_ascii_strncasecmp(components[2], "semi", 4)) + weightkey = 1; + else + weightkey = 2; +- if (!g_strcasecmp(components[3], "r")) ++ if (!g_ascii_strcasecmp(components[3], "r")) + slantkey = 0; +- else if (!g_strncasecmp(components[3], "r", 1)) ++ else if (!g_ascii_strncasecmp(components[3], "r", 1)) + slantkey = 2; + else + slantkey = 1; +- if (!g_strcasecmp(components[4], "normal")) ++ if (!g_ascii_strcasecmp(components[4], "normal")) + setwidthkey = 0; + else + setwidthkey = 1; +@@ -774,8 +779,8 @@ + + matched = FALSE; + for (i = 0; i < nfamilies; i++) { +- if (!g_strcasecmp(pango_font_family_get_name(families[i]), +- pango_font_description_get_family(desc))) { ++ if (!g_ascii_strcasecmp(pango_font_family_get_name(families[i]), ++ pango_font_description_get_family(desc))) { + matched = TRUE; + break; + } +@@ -1393,7 +1398,7 @@ + /* + * Otherwise, ordinary strcasecmp. + */ +- return g_strcasecmp(a, b); ++ return g_ascii_strcasecmp(a, b); + } + + static int fontinfo_realname_compare(void *av, void *bv) diff -Nru putty-0.62/debian/patches/icon-debug.patch putty-0.62/debian/patches/icon-debug.patch --- putty-0.62/debian/patches/icon-debug.patch 1970-01-01 00:00:00.000000000 +0000 +++ putty-0.62/debian/patches/icon-debug.patch 2012-01-03 21:28:46.000000000 +0000 @@ -0,0 +1,21 @@ +Description: Temporary debugging to try to fix kfreebsd-amd64 build +Author: Colin Watson +Forwarded: not-needed +Last-Update: 2012-01-03 + +Index: b/icons/cicon.pl +=================================================================== +--- a/icons/cicon.pl ++++ b/icons/cicon.pl +@@ -14,7 +14,10 @@ + open XPM, "convert $f xpm:- |"; + push @lines, $_ while ; + close XPM; +- die "XPM from $f in unexpected format\n" unless $lines[1] =~ /^static.*\{$/; ++ unless ($lines[1] =~ /^static.*\{$/) { ++ foreach $line (@lines) { print STDERR $line; } ++ die "XPM from $f in unexpected format\n"; ++ } + $lines[1] = "static const char *const ${id}_$k"."[] = {\n"; + $k++; + push @xpms, @lines, "\n"; diff -Nru putty-0.62/debian/patches/series putty-0.62/debian/patches/series --- putty-0.62/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ putty-0.62/debian/patches/series 2012-01-03 18:10:11.000000000 +0000 @@ -0,0 +1,2 @@ +glib-deprecated-functions.patch +icon-debug.patch diff -Nru putty-0.62/debian/rules putty-0.62/debian/rules --- putty-0.62/debian/rules 2011-12-31 09:04:06.000000000 +0000 +++ putty-0.62/debian/rules 2011-09-27 13:26:58.000000000 +0000 @@ -2,8 +2,6 @@ %: dh $@ -export COMPAT=-Wno-error=deprecated-declarations - ptermtmp = debian/pterm puttytmp = debian/putty