r24218 - in /desktop/unstable/vte/debian: changelog patches/25_optional-ncurses.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Tue May  4 06:41:22 2010
New Revision: 24218

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24218
Log:
  + debian/patches/25_optional-ncurses.patch:
    - Updated to apply cleanly again.

Modified:
    desktop/unstable/vte/debian/changelog
    desktop/unstable/vte/debian/patches/25_optional-ncurses.patch

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=24218&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Tue May  4 06:41:22 2010
@@ -3,6 +3,8 @@
   * New upstream bugfix release:
     + debian/patches/01_transparent_crash.patch:
       - Dropped, fixed upstream.
+    + debian/patches/25_optional-ncurses.patch:
+      - Updated to apply cleanly again.
     + debian/patches/90_autoreconf.patch:
       - Regenerated for the new version.
     + debian/control.in:

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=24218&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] Tue May  4 06:41:22 2010
@@ -16,9 +16,7 @@
 -      [AC_CHECK_LIB([curses],[tgetent],[vte_cv_termcap_lib=libcurses],
 -        [AC_CHECK_LIB([termcap],[tgetent],[vte_cv_termcap_lib=libtermcap],
 -          [vte_cv_termcap_lib=])])])])])
-+if test x$with_ncurses = xyes ; then
-+	# Look for tgetent
- 
+-
 -case "$vte_cv_termcap_lib" in
 -  libc)       # FIXME: which headers to include here?
 -              ;;
@@ -49,6 +47,9 @@
 -              ;;
 -  *)          AC_MSG_ERROR([tgetent not found in any library]) ;;
 -esac
++if test x$with_ncurses = xyes ; then
++	# Look for tgetent
++
 +	AC_CHECK_FUNC([tgetent],[vte_cv_termcap_lib=libc],
 +	  [AC_CHECK_LIB([ncurses],[tgetent],[vte_cv_termcap_lib=libncurses],
 +	    [AC_CHECK_LIB([tinfo],[tgetent],[vte_cv_termcap_lib=libtinfo],
@@ -89,7 +90,7 @@
 +fi
  
  # Search for the required modules.
- VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gobject-2.0 gio-2.0 gio-unix-2.0"
+ 
 --- a/src/keymap.c
 +++ b/src/keymap.c
 @@ -44,7 +44,7 @@