r23934 - in /desktop/unstable/vte/debian: changelog control.in patches/25_optional-ncurses.patch python-vte.install rules source/ source/format

pochu at users.alioth.debian.org pochu at users.alioth.debian.org
Wed Apr 21 12:19:12 UTC 2010 

Author: pochu
Date: Wed Apr 21 12:19:11 2010
New Revision: 23934

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23934
Log:
* debian/python-vte.install:
  - Also install bindings for python2.6 (don't hardcode site-packages).
* debian/control.in,
  debian/rules,
  debian/source/format,
  - Switch to source format 3.0 (quilt).
* debian/patches/25_optional-ncurses.patch:
  - Updated to apply cleanly.
* debian/control.in:
  - Bump Standards-Version to 3.8.4, no changes needed.

Added:
    desktop/unstable/vte/debian/source/
    desktop/unstable/vte/debian/source/format
Modified:
    desktop/unstable/vte/debian/changelog
    desktop/unstable/vte/debian/control.in
    desktop/unstable/vte/debian/patches/25_optional-ncurses.patch
    desktop/unstable/vte/debian/python-vte.install
    desktop/unstable/vte/debian/rules

Modified: desktop/unstable/vte/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/changelog?rev=23934&op=diff
==============================================================================
--- desktop/unstable/vte/debian/changelog [utf-8] (original)
+++ desktop/unstable/vte/debian/changelog [utf-8] Wed Apr 21 12:19:11 2010
@@ -1,3 +1,18 @@
+vte (1:0.24.0-3) unstable; urgency=low
+
+  * debian/python-vte.install:
+    - Also install bindings for python2.6 (don't hardcode site-packages).
+  * debian/control.in,
+    debian/rules,
+    debian/source/format,
+    - Switch to source format 3.0 (quilt).
+  * debian/patches/25_optional-ncurses.patch:
+    - Updated to apply cleanly.
+  * debian/control.in:
+    - Bump Standards-Version to 3.8.4, no changes needed.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 21 Apr 2010 14:18:44 +0200
+
 vte (1:0.24.0-2) unstable; urgency=low
 
   * 01_transparent_crash.patch: patch by Tetralet to fix a crash when 

Modified: desktop/unstable/vte/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/control.in?rev=23934&op=diff
==============================================================================
--- desktop/unstable/vte/debian/control.in [utf-8] (original)
+++ desktop/unstable/vte/debian/control.in [utf-8] Wed Apr 21 12:19:11 2010
@@ -3,11 +3,10 @@
 Priority: optional
 Maintainer: Guilherme de S. Pastore <gpastore at debian.org>
 Uploaders: @GNOME_TEAM@
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 XS-Python-Version: >= 2.3
 Build-Depends: cdbs (>= 0.4.43),
                debhelper (>= 5.0.37.2),
-               quilt,
                libglib2.0-dev (>= 2.22.0),
                libgtk2.0-dev (>= 2.19.7-2),
                gettext,

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=23934&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] Wed Apr 21 12:19:11 2010
@@ -1,18 +1,24 @@
 --- a/configure.in
 +++ b/configure.in
-@@ -294,45 +294,52 @@
+@@ -295,45 +295,52 @@
  AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
  AC_CHECK_FUNCS([ceil floor])
  
 -# Look for tgetent
--
++AC_ARG_WITH(ncurses,
++           [AS_HELP_STRING([--without-ncurses],
++                           [don't use ncurses library])
++           ], with_ncurses=$withval, with_ncurses=yes)
+ 
 -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],
 -      [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?
 -              ;;
@@ -43,14 +49,6 @@
 -              ;;
 -  *)          AC_MSG_ERROR([tgetent not found in any library]) ;;
 -esac
-+AC_ARG_WITH(ncurses,
-+           [AS_HELP_STRING([--without-ncurses],
-+                           [don't use ncurses library])
-+           ], with_ncurses=$withval, with_ncurses=yes)
-+
-+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],
@@ -91,7 +89,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"
+ 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 @@

Modified: desktop/unstable/vte/debian/python-vte.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/python-vte.install?rev=23934&op=diff
==============================================================================
--- desktop/unstable/vte/debian/python-vte.install [utf-8] (original)
+++ desktop/unstable/vte/debian/python-vte.install [utf-8] Wed Apr 21 12:19:11 2010
@@ -1,1 +1,1 @@
-usr/lib/python*/site-packages/gtk-2.0/*
+usr/lib/python*/*-packages/gtk-2.0/*

Modified: desktop/unstable/vte/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/rules?rev=23934&op=diff
==============================================================================
--- desktop/unstable/vte/debian/rules [utf-8] (original)
+++ desktop/unstable/vte/debian/rules [utf-8] Wed Apr 21 12:19:11 2010
@@ -8,7 +8,6 @@
 DEB_BUILDDIR_$(udeb) := $(buildbasedir)/udeb
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk

Added: desktop/unstable/vte/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/vte/debian/source/format?rev=23934&op=file
==============================================================================
--- desktop/unstable/vte/debian/source/format (added)
+++ desktop/unstable/vte/debian/source/format [utf-8] Wed Apr 21 12:19:11 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)

More information about the pkg-gnome-commits mailing list