tags 466143 + patch
thank you
Hi,
Here is one of my intrusive NMUs. It builds the package with vte
instead of zvt as well as standards update and general lintian clean-up.
I can't say that the patch is perfect but it builds and runs fine for
me. There are a couple of functions that I disabled as they have no
direct replacements in vte.
I will also post on mentors.
Thanks,
Barry deFreese
diff -u rcalc-0.5.0/debian/control rcalc-0.5.0/debian/control
--- rcalc-0.5.0/debian/control
+++ rcalc-0.5.0/debian/control
@@ -2,8 +2,8 @@
Section: gnome
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.2.13), libncurses5-dev, libreadline5-dev, libglib2.0-dev, libgnomeui-dev (>= 2.0.0), libzvt2.0-dev, libpanel-applet2-dev, pkg-config, libxml-parser-perl, scrollkeeper
-Standards-Version: 3.6.2.1
+Build-Depends: debhelper (>= 5.0.0), libncurses5-dev, libreadline5-dev, libglib2.0-dev, libgnomeui-dev (>= 2.0.0), libvte-dev, libpanel-applet2-dev, pkg-config, libxml-parser-perl, scrollkeeper
+Standards-Version: 3.7.3
Package: rcalc
Architecture: any
diff -u rcalc-0.5.0/debian/grcalc.1 rcalc-0.5.0/debian/grcalc.1
--- rcalc-0.5.0/debian/grcalc.1
+++ rcalc-0.5.0/debian/grcalc.1
@@ -26,7 +26,7 @@
, a fast, simple, symbolic calculator for GNOME.
.SH OPTIONS
.B grcalc
-accepts the standard GNOME application options. Try `grcalc --help' to
+accepts the standard GNOME application options. Try `grcalc \-\-help' to
get more information about these options.
.SH AUTHOR
This manual page was written by Sam Hocevar <[EMAIL PROTECTED]>
diff -u rcalc-0.5.0/debian/copyright rcalc-0.5.0/debian/copyright
--- rcalc-0.5.0/debian/copyright
+++ rcalc-0.5.0/debian/copyright
@@ -6,7 +6,23 @@
Upstream Authors: Gary Benson <[EMAIL PROTECTED]>
Clement Bourdarias <[EMAIL PROTECTED]>
-Copyright: GPL
+Copyright: Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+
On Debian GNU/Linux systems, the complete text of the GNU General
Public License can be found in /usr/share/common-licenses/GPL.
diff -u rcalc-0.5.0/debian/rules rcalc-0.5.0/debian/rules
--- rcalc-0.5.0/debian/rules
+++ rcalc-0.5.0/debian/rules
@@ -39,7 +39,7 @@
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
dh_clean
install: build
diff -u rcalc-0.5.0/debian/compat rcalc-0.5.0/debian/compat
--- rcalc-0.5.0/debian/compat
+++ rcalc-0.5.0/debian/compat
@@ -1 +1 @@
-4
+5
diff -u rcalc-0.5.0/debian/changelog rcalc-0.5.0/debian/changelog
--- rcalc-0.5.0/debian/changelog
+++ rcalc-0.5.0/debian/changelog
@@ -1,3 +1,16 @@
+rcalc (0.5.0-1.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Update libzvt-dev build dep to libvte-dev. (Closes: #466143).
+ + Update code to use vte functions instead of zvt.
+ * Update debian/copyright.
+ * Escape options in debian/grcalc.1.
+ * Make clean not ignore errors.
+ * Bump deb-helper build-dep and compat to 5.
+ * Bump Standards Version to 3.7.3. (No changes needed).
+
+ -- Barry deFreese <[EMAIL PROTECTED]> Sat, 01 Mar 2008 21:50:25 -0500
+
rcalc (0.5.0-1.2) unstable; urgency=low
* Non-maintainer Upload
diff -u rcalc-0.5.0/intltool-update rcalc-0.5.0/intltool-update
--- rcalc-0.5.0/intltool-update
+++ rcalc-0.5.0/intltool-update
@@ -554,7 +554,7 @@
sub GenerateHeaders
{
- my $EXTRACT = "/home/bzed/workspace/debian/rcalc-0.5.0/intltool-extract";
+ my $EXTRACT = "/home/bdefreese/debian/rcalc/rcalc-0.5.0/intltool-extract";
chomp $EXTRACT;
$EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/configure.in
+++ rcalc-0.5.0/configure.in
@@ -63,8 +63,8 @@
if test x$enable_term_ui = xyes; then
READLINE_CHECK
PKG_CHECK_MODULES(LIBZVT, libzvt-2.0)
- AC_SUBST(LIBZVT_CFLAGS)
- AC_SUBST(LIBZVT_LIBS)
+ AC_SUBST(LIBVTE_CFLAGS)
+ AC_SUBST(LIBVTE_LIBS)
fi
if test x$enable_applet = xyes; then
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/Makefile.in
+++ rcalc-0.5.0/Makefile.in
@@ -109,8 +109,8 @@
LIBGLADE_LIBS = @LIBGLADE_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/Makefile.in
+++ rcalc-0.5.0/src/Makefile.in
@@ -109,8 +109,8 @@
LIBGLADE_LIBS = @LIBGLADE_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/ui_list/Makefile.in
+++ rcalc-0.5.0/src/ui_list/Makefile.in
@@ -110,8 +110,8 @@
LIBOBJS = @LIBOBJS@
LIBS = ../engine/librcengine.a
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/ui_term/Makefile.in
+++ rcalc-0.5.0/src/ui_term/Makefile.in
@@ -110,8 +110,8 @@
LIBOBJS = @LIBOBJS@
LIBS = ../engine/librcengine.a
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
@@ -174,7 +174,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ $(LIBZVT_CFLAGS) -I..
+ @PACKAGE_CFLAGS@ $(LIBVTE_CFLAGS) -I..
bin_PROGRAMS = rcalc-term
@@ -188,7 +188,7 @@
readline.c readline.h
-rcalc_term_LDADD = @PACKAGE_LIBS@ $(READLINE_LIBS) $(INTLLIBS) $(LIBZVT_LIBS)
+rcalc_term_LDADD = @PACKAGE_LIBS@ $(READLINE_LIBS) $(INTLLIBS) $(LIBVTE_LIBS)
subdir = src/ui_term
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/ui_term/app.c
+++ rcalc-0.5.0/src/ui_term/app.c
@@ -30,7 +30,7 @@
#include <engine/debug.h> /* Debugging functions */
#include <gnome.h>
-#include <libzvt/libzvt.h>
+#include <vte/vte.h>
/*****************************************************************************/
@@ -39,7 +39,7 @@
int width_chars,
int height_chars)
{
- zvt_term_set_size (ZVT_TERM (widget), width_chars, height_chars);
+ vte_terminal_set_size (VTE_TERMINAL (widget), width_chars, height_chars);
}
void
@@ -48,9 +48,9 @@
int *height_chars)
{
if (width_chars)
- *width_chars = ZVT_TERM (widget)->grid_width;
+ *width_chars = VTE_TERMINAL (widget)->column_count;
if (height_chars)
- *height_chars = ZVT_TERM (widget)->grid_height;
+ *height_chars = VTE_TERMINAL (widget)->row_count;
}
void
@@ -59,9 +59,9 @@
int *cell_height_pixels)
{
if (cell_width_pixels)
- *cell_width_pixels = ZVT_TERM (widget)->charwidth;
+ *cell_width_pixels = VTE_TERMINAL (widget)->char_width;
if (cell_height_pixels)
- *cell_height_pixels = ZVT_TERM (widget)->charheight;
+ *cell_height_pixels = VTE_TERMINAL (widget)->char_height;
}
#define PADDING 0 /* from zvtterm.c */
@@ -189,18 +189,18 @@
/* Set the terminal behaviour.
*/
- zvt_term_set_auto_window_hint (ZVT_TERM (terminal), FALSE);
+ /* vte_terminal_set_auto_window_hint (VTE_TERMINAL (terminal), FALSE); */
- zvt_term_set_scrollback(
- ZVT_TERM(terminal), rcg_conf_get_scrollback(config) );
- zvt_term_set_scroll_on_keystroke(
- ZVT_TERM(terminal), rcg_conf_get_scroll_on_key(config) );
- zvt_term_set_scroll_on_output(
- ZVT_TERM(terminal), rcg_conf_get_scroll_on_out(config) );
- zvt_term_set_blink(
- ZVT_TERM(terminal), rcg_conf_get_blink(config) );
- zvt_term_set_bell(
- ZVT_TERM(terminal), rcg_conf_get_bell(config) );
+ vte_terminal_set_scroll_background(
+ VTE_TERMINAL(terminal), rcg_conf_get_scrollback(config) );
+ vte_terminal_set_scroll_on_keystroke(
+ VTE_TERMINAL(terminal), rcg_conf_get_scroll_on_key(config) );
+ vte_terminal_set_scroll_on_output(
+ VTE_TERMINAL(terminal), rcg_conf_get_scroll_on_out(config) );
+ vte_terminal_set_cursor_blinks(
+ VTE_TERMINAL(terminal), rcg_conf_get_blink(config) );
+ vte_terminal_set_audible_bell(
+ VTE_TERMINAL(terminal), rcg_conf_get_bell(config) );
/* Set the font (and the resize hints)
*/
@@ -211,7 +211,7 @@
pango_font_description_to_string (desc));*/
g_assert(desc);
- zvt_term_set_pango_font (ZVT_TERM(terminal), desc);
+ vte_terminal_set_font (VTE_TERMINAL(terminal), desc);
#if 0
if (desc) {
@@ -230,7 +230,7 @@
/* ?!? this stopped working one day, but it used to work !
there's really something to do here.
In addition, libzvt does not support pango font yet */
- zvt_term_set_fonts( ZVT_TERM(terminal), font, font );
+ vte_terminal_set_font_full( VTE_TERMINAL(terminal), font, font );
#endif
/*terminal_widget_set_size (terminal, 90,100);*/
terminal_widget_get_padding (terminal, &xpad, &ypad);
@@ -280,8 +280,8 @@
palette[i][1] = error[i];
}
- zvt_term_set_color_scheme(
- ZVT_TERM(terminal), palette[0], palette[1], palette[2] );
+ vte_terminal_set_colors(
+ VTE_TERMINAL(terminal), palette[0], palette[1], palette[2], sizeof(palette) );
}
/* Destroy event for the preferences window.
@@ -349,8 +349,8 @@
g_assert( app );
terminal = gtk_object_get_data( GTK_OBJECT(app), "terminal" );
- g_assert( ZVT_TERM(terminal) );
- zvt_term_copy_clipboard (ZVT_TERM (terminal));
+ g_assert( VTE_TERMINAL(terminal) );
+ vte_terminal_copy_clipboard (VTE_TERMINAL (terminal));
}
/* Paste stuff into the terminal.
@@ -366,9 +366,9 @@
g_assert( app );
terminal = gtk_object_get_data( GTK_OBJECT(app), "terminal" );
- g_assert( ZVT_TERM(terminal) );
+ g_assert( VTE_TERMINAL(terminal) );
- zvt_term_paste_clipboard (ZVT_TERM (terminal));
+ vte_terminal_paste_clipboard (VTE_TERMINAL (terminal));
/* All this code is straight from gnome-terminal.
** I have no idea what it does =).
@@ -557,7 +557,7 @@
/* The main process for the GNOME user interface.
*/
void rcg_main_process(
- FILE *to_reader, FILE *from_reader, ZvtTerm *terminal )
+ FILE *to_reader, FILE *from_reader, VteTerminal *terminal )
{
RcGnomeUiCfg *config; /* The user interface configuration */
RcEngine *engine; /* The calculation engine itself */
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/ui_term/Makefile.am
+++ rcalc-0.5.0/src/ui_term/Makefile.am
@@ -3,7 +3,7 @@
INCLUDES = \
-DPACKAGE_DATA_DIR=\""$(datadir)"\" \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- @PACKAGE_CFLAGS@ $(LIBZVT_CFLAGS) -I..
+ @PACKAGE_CFLAGS@ $(LIBVTE_CFLAGS) -I..
LIBS = ../engine/librcengine.a
bin_PROGRAMS = rcalc-term
@@ -17,5 +17,5 @@
reader.c reader.h \
readline.c readline.h
-rcalc_term_LDADD = @PACKAGE_LIBS@ $(READLINE_LIBS) $(INTLLIBS) $(LIBZVT_LIBS)
+rcalc_term_LDADD = @PACKAGE_LIBS@ $(READLINE_LIBS) $(INTLLIBS) $(LIBVTE_LIBS)
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/ui_term/main.c
+++ rcalc-0.5.0/src/ui_term/main.c
@@ -72,7 +72,7 @@
{
int main_to_reader[2];
int reader_to_main[2];
- ZvtTerm *terminal;
+ VteTerminal *terminal;
pid_t child_pid;
rc_debug( RC_DBG_TOPLEVEL, "executing GNOME user interface." );
@@ -84,9 +84,11 @@
/* Create the terminal and fork
*/
- terminal = ZVT_TERM( zvt_term_new_with_size( 10, 10 ) );
+ /* terminal = VTE_TERMINAL( vte_term_new_with_size( 10, 10 ) ); */
+ terminal = vte_terminal_new();
+ vte_terminal_set_size(terminal, 10, 10);
errno = 0;
- child_pid = zvt_term_forkpty( terminal, FALSE );
+ child_pid = vte_terminal_forkpty( terminal, NULL, NULL, FALSE, FALSE, FALSE );
if( child_pid == -1 )
{
g_error( "fork(): failed due to: %s.", g_strerror( errno ) );
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/ui_term/app.h
+++ rcalc-0.5.0/src/ui_term/app.h
@@ -27,12 +27,12 @@
#include <stdio.h>
#include <gnome.h>
-#include <libzvt/libzvt.h>
+#include <vte/vte.h>
void rcg_main_process ( FILE *to_reader,
FILE *from_reader,
- ZvtTerm *terminal );
+ VteTerminal *terminal );
#endif /* __RC_GNOMEUI_MAIN_H__ */
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/applet/Makefile.in
+++ rcalc-0.5.0/src/applet/Makefile.in
@@ -110,8 +110,8 @@
LIBOBJS = @LIBOBJS@
LIBS = ../engine/librcengine.a
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/src/engine/Makefile.in
+++ rcalc-0.5.0/src/engine/Makefile.in
@@ -109,8 +109,8 @@
LIBGLADE_LIBS = @LIBGLADE_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/configure
+++ rcalc-0.5.0/configure
@@ -309,7 +309,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT mkdir_p CPP EGREP GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE ENABLE_TERM_TRUE ENABLE_TERM_FALSE ENABLE_APPLET_TRUE ENABLE_APPLET_FALSE READLINE_LIBS PKG_CONFIG LIBZVT_CFLAGS LIBZVT_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS LIBGLADE_CFLAGS LIBGLADE_LIBS PACKAGE_CFLAGS PACKAGE_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT mkdir_p CPP EGREP GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE ENABLE_TERM_TRUE ENABLE_TERM_FALSE ENABLE_APPLET_TRUE ENABLE_APPLET_FALSE READLINE_LIBS PKG_CONFIG LIBVTE_CFLAGS LIBVTE_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS LIBGLADE_CFLAGS LIBGLADE_LIBS PACKAGE_CFLAGS PACKAGE_LIBS GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -5011,32 +5011,32 @@
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for libzvt-2.0" >&5
-echo $ECHO_N "checking for libzvt-2.0... $ECHO_C" >&6
+ echo "$as_me:$LINENO: checking for libvte" >&5
+echo $ECHO_N "checking for libvte... $ECHO_C" >&6
- if $PKG_CONFIG --exists "libzvt-2.0" ; then
+ if $PKG_CONFIG --exists "vte" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
- echo "$as_me:$LINENO: checking LIBZVT_CFLAGS" >&5
-echo $ECHO_N "checking LIBZVT_CFLAGS... $ECHO_C" >&6
- LIBZVT_CFLAGS=`$PKG_CONFIG --cflags "libzvt-2.0"`
- echo "$as_me:$LINENO: result: $LIBZVT_CFLAGS" >&5
-echo "${ECHO_T}$LIBZVT_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking LIBZVT_LIBS" >&5
-echo $ECHO_N "checking LIBZVT_LIBS... $ECHO_C" >&6
- LIBZVT_LIBS=`$PKG_CONFIG --libs "libzvt-2.0"`
- echo "$as_me:$LINENO: result: $LIBZVT_LIBS" >&5
-echo "${ECHO_T}$LIBZVT_LIBS" >&6
+ echo "$as_me:$LINENO: checking LIBVTE_CFLAGS" >&5
+echo $ECHO_N "checking LIBVTE_CFLAGS... $ECHO_C" >&6
+ LIBVTE_CFLAGS=`$PKG_CONFIG --cflags "vte"`
+ echo "$as_me:$LINENO: result: $LIBVTE_CFLAGS" >&5
+echo "${ECHO_T}$LIBVTE_CFLAGS" >&6
+
+ echo "$as_me:$LINENO: checking LIBVTE_LIBS" >&5
+echo $ECHO_N "checking LIBVTE_LIBS... $ECHO_C" >&6
+ LIBVTE_LIBS=`$PKG_CONFIG --libs "vte"`
+ echo "$as_me:$LINENO: result: $LIBVTE_LIBS" >&5
+echo "${ECHO_T}$LIBVTE_LIBS" >&6
else
- LIBZVT_CFLAGS=""
- LIBZVT_LIBS=""
+ LIBVTE_CFLAGS=""
+ LIBVTE_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
- LIBZVT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libzvt-2.0"`
- echo $LIBZVT_PKG_ERRORS
+ LIBVTE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libvte"`
+ echo $LIBVTE_PKG_ERRORS
fi
@@ -5050,8 +5050,8 @@
if test $succeeded = yes; then
:
else
- { { echo "$as_me:$LINENO: error: Library requirements (libzvt-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (libzvt-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { { echo "$as_me:$LINENO: error: Library requirements (libvte) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+echo "$as_me: error: Library requirements (libvte) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -7814,8 +7814,8 @@
s,@ENABLE_APPLET_FALSE@,$ENABLE_APPLET_FALSE,;t t
s,@READLINE_LIBS@,$READLINE_LIBS,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@LIBZVT_CFLAGS@,$LIBZVT_CFLAGS,;t t
-s,@LIBZVT_LIBS@,$LIBZVT_LIBS,;t t
+s,@LIBVTE_CFLAGS@,$LIBVTE_CFLAGS,;t t
+s,@LIBVTE_LIBS@,$LIBVTE_LIBS,;t t
s,@GNOME_APPLETS_CFLAGS@,$GNOME_APPLETS_CFLAGS,;t t
s,@GNOME_APPLETS_LIBS@,$GNOME_APPLETS_LIBS,;t t
s,@LIBGLADE_CFLAGS@,$LIBGLADE_CFLAGS,;t t
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/help/C/Makefile.in
+++ rcalc-0.5.0/help/C/Makefile.in
@@ -171,8 +171,8 @@
LIBGLADE_LIBS = @LIBGLADE_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
only in patch2:
unchanged:
--- rcalc-0.5.0.orig/help/Makefile.in
+++ rcalc-0.5.0/help/Makefile.in
@@ -109,8 +109,8 @@
LIBGLADE_LIBS = @LIBGLADE_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
-LIBZVT_CFLAGS = @LIBZVT_CFLAGS@
-LIBZVT_LIBS = @LIBZVT_LIBS@
+LIBVTE_CFLAGS = @LIBVTE_CFLAGS@
+LIBVTE_LIBS = @LIBVTE_LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
