r21599 - in /desktop/unstable/vte/debian: changelog patches/01_background_ncurses.patch patches/25_optional-ncurses.patch patches/90_autoreconf.patch patches/series

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Fri Sep 25 22:04:14 UTC 2009


Author: pochu
Date: Fri Sep 25 22:04:13 2009
New Revision: 21599

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21599
Log:
* New upstream bugfix release.
  - Fix crash on terminal reset. Closes: #548319.
* debian/patches/01_background_ncurses.patch:
  - Removed, the fix is in the new version.
* debian/patches/25_optional-ncurses.patch,
  debian/patches/90_autoreconf.patch:
  - Refreshed.

Removed:
    desktop/unstable/vte/debian/patches/01_background_ncurses.patch
Modified:
    desktop/unstable/vte/debian/changelog
    desktop/unstable/vte/debian/patches/25_optional-ncurses.patch
    desktop/unstable/vte/debian/patches/90_autoreconf.patch
    desktop/unstable/vte/debian/patches/series

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=21599&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Fri Sep 25 22:04:13 2009
@@ -1,3 +1,15 @@
+vte (1:0.22.1-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+    - Fix crash on terminal reset. Closes: #548319.
+  * debian/patches/01_background_ncurses.patch:
+    - Removed, the fix is in the new version.
+  * debian/patches/25_optional-ncurses.patch,
+    debian/patches/90_autoreconf.patch:
+    - Refreshed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 26 Sep 2009 00:01:19 +0200
+
 vte (1:0.22.0-2) unstable; urgency=low
 
   * 01_background_ncurses.patch: stolen upstream. Fix background color 

Modified: desktop/unstable/vte/debian/patches/25_optional-ncurses.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/25_optional-ncurses.patch?rev=21599&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/25_optional-ncurses.patch [utf-8] (original)
+++ desktop/unstable/vte/debian/patches/25_optional-ncurses.patch [utf-8] Fri Sep 25 22:04:13 2009
@@ -1,7 +1,6 @@
-diff -urN vte-0.20.0.orig/configure.in vte-0.20.0/configure.in
---- vte-0.20.0.orig/configure.in	2009-03-15 13:53:09.000000000 +0100
-+++ vte-0.20.0/configure.in	2009-04-07 22:45:40.000000000 +0200
-@@ -289,45 +289,52 @@
+--- a/configure.in
++++ b/configure.in
+@@ -294,45 +294,52 @@
  AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
  AC_CHECK_FUNCS([ceil floor])
  
@@ -93,9 +92,8 @@
  
  # Search for the required modules.
  VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED"
-diff -urN vte-0.20.0.orig/src/keymap.c vte-0.20.0/src/keymap.c
---- vte-0.20.0.orig/src/keymap.c	2009-03-05 15:06:07.000000000 +0100
-+++ vte-0.20.0/src/keymap.c	2009-04-07 22:53:53.000000000 +0200
+--- a/src/keymap.c
++++ b/src/keymap.c
 @@ -44,7 +44,7 @@
  #include <termcap.h>
  #define VTE_TERMCAP_NAME "termcap"
@@ -116,7 +114,7 @@
  
  	g_return_if_fail(normal != NULL);
  	g_return_if_fail(normal_length != NULL);
-@@ -1164,6 +1166,7 @@
+@@ -1163,6 +1165,7 @@
  			}
  		}
  	}
@@ -124,7 +122,7 @@
  	if (termcap_special != NULL) {
  		tmp = g_strdup(terminal);
  		cap = NULL;
-@@ -1204,6 +1207,7 @@
+@@ -1203,6 +1206,7 @@
  			return;
  		}
  	}
@@ -132,9 +130,8 @@
  
  	_vte_debug_print(VTE_DEBUG_KEYBOARD,
  			" (ignoring, no match for modifier state).\n");
-diff -urN vte-0.20.0.orig/src/ssfe.c vte-0.20.0/src/ssfe.c
---- vte-0.20.0.orig/src/ssfe.c	2009-03-05 15:06:07.000000000 +0100
-+++ vte-0.20.0/src/ssfe.c	2009-04-07 22:51:52.000000000 +0200
+--- a/src/ssfe.c
++++ b/src/ssfe.c
 @@ -38,7 +38,7 @@
  #include <termcap.h>
  #define VTE_TERMCAP_NAME "termcap"

Modified: desktop/unstable/vte/debian/patches/90_autoreconf.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/90_autoreconf.patch?rev=21599&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/90_autoreconf.patch [utf-8] (original)
+++ desktop/unstable/vte/debian/patches/90_autoreconf.patch [utf-8] Fri Sep 25 22:04:13 2009
@@ -1,6 +1,5 @@
-diff -Naur vte-0.22.0.old/aclocal.m4 vte-0.22.0/aclocal.m4
---- vte-0.22.0.old/aclocal.m4	2009-09-21 23:01:10.000000000 +0200
-+++ vte-0.22.0/aclocal.m4	2009-09-22 13:38:00.000000000 +0200
+--- a/aclocal.m4
++++ b/aclocal.m4
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -147,10 +146,8 @@
          fi
  	# Put the nasty error message in config.log where it belongs
  	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -Naur vte-0.22.0.old/config.guess vte-0.22.0/config.guess
-diff -Naur vte-0.22.0.old/config.h.in vte-0.22.0/config.h.in
---- vte-0.22.0.old/config.h.in	2009-09-21 23:02:56.000000000 +0200
-+++ vte-0.22.0/config.h.in	2009-09-22 13:38:02.000000000 +0200
+--- a/config.h.in
++++ b/config.h.in
 @@ -209,6 +209,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
@@ -161,15 +158,13 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-diff -Naur vte-0.22.0.old/config.sub vte-0.22.0/config.sub
-diff -Naur vte-0.22.0.old/configure vte-0.22.0/configure
---- vte-0.22.0.old/configure	2009-09-21 23:01:26.000000000 +0200
-+++ vte-0.22.0/configure	2009-09-22 13:38:01.000000000 +0200
+--- a/configure
++++ b/configure
 @@ -1,20 +1,22 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for vte 0.22.0.
-+# Generated by GNU Autoconf 2.64 for vte 0.22.0.
+-# Generated by GNU Autoconf 2.63 for vte 0.22.1.
++# Generated by GNU Autoconf 2.64 for vte 0.22.1.
  #
  # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=vte>.
  #
@@ -963,8 +958,8 @@
  # Identity of this package.
  PACKAGE_NAME='vte'
 @@ -748,6 +702,7 @@
- PACKAGE_VERSION='0.22.0'
- PACKAGE_STRING='vte 0.22.0'
+ PACKAGE_VERSION='0.22.1'
+ PACKAGE_STRING='vte 0.22.1'
  PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=vte'
 +PACKAGE_URL=''
  
@@ -1120,7 +1115,7 @@
 @@ -1798,21 +1746,471 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- vte configure 0.22.0
+ vte configure 0.22.1
 -generated by GNU Autoconf 2.63
 +generated by GNU Autoconf 2.64
  
@@ -1587,7 +1582,7 @@
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by vte $as_me 0.22.0, which was
+ It was created by vte $as_me 0.22.1, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.64.  Invocation command line was
  
@@ -15672,7 +15667,7 @@
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
- This file was extended by vte $as_me 0.22.0, which was
+ This file was extended by vte $as_me 0.22.1, which was
 -generated by GNU Autoconf 2.63.  Invocation command line was
 +generated by GNU Autoconf 2.64.  Invocation command line was
  
@@ -15703,7 +15698,7 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_version="\\
- vte config.status 0.22.0
+ vte config.status 0.22.1
 -configured by $0, generated by GNU Autoconf 2.63,
 +configured by $0, generated by GNU Autoconf 2.64,
    with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -16242,9 +16237,8 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-diff -Naur vte-0.22.0.old/doc/Makefile.in vte-0.22.0/doc/Makefile.in
---- vte-0.22.0.old/doc/Makefile.in	2009-09-21 23:01:19.000000000 +0200
-+++ vte-0.22.0/doc/Makefile.in	2009-09-22 13:38:03.000000000 +0200
+--- a/doc/Makefile.in
++++ b/doc/Makefile.in
 @@ -179,6 +179,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -16253,9 +16247,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/doc/openi18n/Makefile.in vte-0.22.0/doc/openi18n/Makefile.in
---- vte-0.22.0.old/doc/openi18n/Makefile.in	2009-09-21 23:01:19.000000000 +0200
-+++ vte-0.22.0/doc/openi18n/Makefile.in	2009-09-22 13:38:03.000000000 +0200
+--- a/doc/openi18n/Makefile.in
++++ b/doc/openi18n/Makefile.in
 @@ -170,6 +170,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -16264,9 +16257,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/doc/reference/Makefile.in vte-0.22.0/doc/reference/Makefile.in
---- vte-0.22.0.old/doc/reference/Makefile.in	2009-09-21 23:01:20.000000000 +0200
-+++ vte-0.22.0/doc/reference/Makefile.in	2009-09-22 13:38:03.000000000 +0200
+--- a/doc/reference/Makefile.in
++++ b/doc/reference/Makefile.in
 @@ -149,6 +149,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -16275,9 +16267,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/glade/Makefile.in vte-0.22.0/glade/Makefile.in
---- vte-0.22.0.old/glade/Makefile.in	2009-09-21 23:01:20.000000000 +0200
-+++ vte-0.22.0/glade/Makefile.in	2009-09-22 13:38:03.000000000 +0200
+--- a/glade/Makefile.in
++++ b/glade/Makefile.in
 @@ -163,6 +163,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -16286,9 +16277,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/gnome-pty-helper/aclocal.m4 vte-0.22.0/gnome-pty-helper/aclocal.m4
---- vte-0.22.0.old/gnome-pty-helper/aclocal.m4	2009-08-01 08:18:35.000000000 +0200
-+++ vte-0.22.0/gnome-pty-helper/aclocal.m4	2009-09-22 13:37:55.000000000 +0200
+--- a/gnome-pty-helper/aclocal.m4
++++ b/gnome-pty-helper/aclocal.m4
 @@ -13,8 +13,8 @@
  
  m4_ifndef([AC_AUTOCONF_VERSION],
@@ -16300,15 +16290,8 @@
  You have another version of autoconf.  It may work, but is not guaranteed to.
  If you have problems, you may need to regenerate the build system entirely.
  To do so, use the procedure documented by the package, typically `autoreconf'.])])
-diff -Naur vte-0.22.0.old/gnome-pty-helper/autom4te.cache/output.0 vte-0.22.0/gnome-pty-helper/autom4te.cache/output.0
-diff -Naur vte-0.22.0.old/gnome-pty-helper/autom4te.cache/output.1 vte-0.22.0/gnome-pty-helper/autom4te.cache/output.1
-diff -Naur vte-0.22.0.old/gnome-pty-helper/autom4te.cache/requests vte-0.22.0/gnome-pty-helper/autom4te.cache/requests
-diff -Naur vte-0.22.0.old/gnome-pty-helper/autom4te.cache/traces.0 vte-0.22.0/gnome-pty-helper/autom4te.cache/traces.0
-diff -Naur vte-0.22.0.old/gnome-pty-helper/autom4te.cache/traces.1 vte-0.22.0/gnome-pty-helper/autom4te.cache/traces.1
-diff -Naur vte-0.22.0.old/gnome-pty-helper/config.guess vte-0.22.0/gnome-pty-helper/config.guess
-diff -Naur vte-0.22.0.old/gnome-pty-helper/config.h.in vte-0.22.0/gnome-pty-helper/config.h.in
---- vte-0.22.0.old/gnome-pty-helper/config.h.in	2009-09-14 20:35:31.000000000 +0200
-+++ vte-0.22.0/gnome-pty-helper/config.h.in	2009-09-22 13:37:56.000000000 +0200
+--- a/gnome-pty-helper/config.h.in
++++ b/gnome-pty-helper/config.h.in
 @@ -180,6 +180,9 @@
  /* Define to the one symbol short name of this package. */
  #undef PACKAGE_TARNAME
@@ -16319,11 +16302,8 @@
  /* Define to the version of this package. */
  #undef PACKAGE_VERSION
  
-diff -Naur vte-0.22.0.old/gnome-pty-helper/config.h.in~ vte-0.22.0/gnome-pty-helper/config.h.in~
-diff -Naur vte-0.22.0.old/gnome-pty-helper/config.sub vte-0.22.0/gnome-pty-helper/config.sub
-diff -Naur vte-0.22.0.old/gnome-pty-helper/configure vte-0.22.0/gnome-pty-helper/configure
---- vte-0.22.0.old/gnome-pty-helper/configure	2009-09-14 20:34:45.000000000 +0200
-+++ vte-0.22.0/gnome-pty-helper/configure	2009-09-22 13:37:56.000000000 +0200
+--- a/gnome-pty-helper/configure
++++ b/gnome-pty-helper/configure
 @@ -1,20 +1,22 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -23998,9 +23978,8 @@
  $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
  
-diff -Naur vte-0.22.0.old/gnome-pty-helper/Makefile.in vte-0.22.0/gnome-pty-helper/Makefile.in
---- vte-0.22.0.old/gnome-pty-helper/Makefile.in	2009-09-14 20:35:32.000000000 +0200
-+++ vte-0.22.0/gnome-pty-helper/Makefile.in	2009-09-22 13:37:57.000000000 +0200
+--- a/gnome-pty-helper/Makefile.in
++++ b/gnome-pty-helper/Makefile.in
 @@ -118,6 +118,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -24009,9 +23988,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  SET_MAKE = @SET_MAKE@
-diff -Naur vte-0.22.0.old/ltmain.sh vte-0.22.0/ltmain.sh
---- vte-0.22.0.old/ltmain.sh	2009-09-14 20:35:21.000000000 +0200
-+++ vte-0.22.0/ltmain.sh	2009-09-22 13:37:57.000000000 +0200
+--- a/ltmain.sh
++++ b/ltmain.sh
 @@ -65,7 +65,7 @@
  #       compiler:		$LTCC
  #       compiler flags:		$LTCFLAGS
@@ -24090,9 +24068,8 @@
  	  esac
  	  ;;
  	no)
-diff -Naur vte-0.22.0.old/Makefile.in vte-0.22.0/Makefile.in
---- vte-0.22.0.old/Makefile.in	2009-09-21 23:01:23.000000000 +0200
-+++ vte-0.22.0/Makefile.in	2009-09-22 13:38:04.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -222,6 +222,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -24101,9 +24078,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/perf/Makefile.in vte-0.22.0/perf/Makefile.in
---- vte-0.22.0.old/perf/Makefile.in	2009-09-21 23:01:20.000000000 +0200
-+++ vte-0.22.0/perf/Makefile.in	2009-09-22 13:38:03.000000000 +0200
+--- a/perf/Makefile.in
++++ b/perf/Makefile.in
 @@ -139,6 +139,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -24112,9 +24088,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/po/Makefile.in.in vte-0.22.0/po/Makefile.in.in
---- vte-0.22.0.old/po/Makefile.in.in	2009-09-14 20:35:21.000000000 +0200
-+++ vte-0.22.0/po/Makefile.in.in	2009-09-22 13:37:58.000000000 +0200
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
 @@ -129,7 +129,7 @@
  	done
  
@@ -24124,9 +24099,8 @@
  
  # Define this as empty until I found a useful application.
  install-exec installcheck:
-diff -Naur vte-0.22.0.old/python/Makefile.in vte-0.22.0/python/Makefile.in
---- vte-0.22.0.old/python/Makefile.in	2009-09-21 23:01:20.000000000 +0200
-+++ vte-0.22.0/python/Makefile.in	2009-09-22 13:38:03.000000000 +0200
+--- a/python/Makefile.in
++++ b/python/Makefile.in
 @@ -210,6 +210,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -24135,9 +24109,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/src/Makefile.in vte-0.22.0/src/Makefile.in
---- vte-0.22.0.old/src/Makefile.in	2009-09-21 23:01:22.000000000 +0200
-+++ vte-0.22.0/src/Makefile.in	2009-09-22 13:38:04.000000000 +0200
+--- a/src/Makefile.in
++++ b/src/Makefile.in
 @@ -332,6 +332,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@
@@ -24146,9 +24119,8 @@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
  PKG_CONFIG = @PKG_CONFIG@
-diff -Naur vte-0.22.0.old/termcaps/Makefile.in vte-0.22.0/termcaps/Makefile.in
---- vte-0.22.0.old/termcaps/Makefile.in	2009-09-21 23:01:23.000000000 +0200
-+++ vte-0.22.0/termcaps/Makefile.in	2009-09-22 13:38:04.000000000 +0200
+--- a/termcaps/Makefile.in
++++ b/termcaps/Makefile.in
 @@ -164,6 +164,7 @@
  PACKAGE_NAME = @PACKAGE_NAME@
  PACKAGE_STRING = @PACKAGE_STRING@

Modified: desktop/unstable/vte/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/patches/series?rev=21599&op=diff
==============================================================================
--- desktop/unstable/vte/debian/patches/series [utf-8] (original)
+++ desktop/unstable/vte/debian/patches/series [utf-8] Fri Sep 25 22:04:13 2009
@@ -1,4 +1,3 @@
-01_background_ncurses.patch
 12_python_reaper.patch
 25_optional-ncurses.patch
 60_termcap-home-end.patch




More information about the pkg-gnome-commits mailing list