--- kvirc-3.2.0.orig/po/kvirc/Makefile.in +++ kvirc-3.2.0/po/kvirc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/dcc/Makefile.in +++ kvirc-3.2.0/po/modules/dcc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/perl/Makefile.in +++ kvirc-3.2.0/po/modules/perl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/sharedfileswindow/Makefile.in +++ kvirc-3.2.0/po/modules/sharedfileswindow/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/notifier/Makefile.in +++ kvirc-3.2.0/po/modules/notifier/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/about/Makefile.in +++ kvirc-3.2.0/po/modules/about/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/logview/Makefile.in +++ kvirc-3.2.0/po/modules/logview/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/filetransferwindow/Makefile.in +++ kvirc-3.2.0/po/modules/filetransferwindow/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/editor/Makefile.in +++ kvirc-3.2.0/po/modules/editor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/Makefile.in +++ kvirc-3.2.0/po/modules/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/modules/perlcore/Makefile.in +++ kvirc-3.2.0/po/modules/perlcore/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/po/Makefile.in +++ kvirc-3.2.0/po/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/antiidle/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/antiidle/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/runmenu/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/runmenu/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/minesweeper/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/minesweeper/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/tutorial/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/tutorial/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/mp3share/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/mp3share/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/playing/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/playing/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/scriptexamples/simplehttp/Makefile.in +++ kvirc-3.2.0/doc/scriptexamples/simplehttp/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/doc/Makefile.in +++ kvirc-3.2.0/doc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/ui/Makefile.in +++ kvirc-3.2.0/src/kvirc/ui/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/kvs/Makefile.in +++ kvirc-3.2.0/src/kvirc/kvs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/build/Makefile.in +++ kvirc-3.2.0/src/kvirc/build/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -22,8 +22,6 @@ ######################################################################################################################## -SOURCES = $(kvirc_SOURCES) $(nodist_kvirc_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/kvirc/sparser/Makefile.in +++ kvirc-3.2.0/src/kvirc/sparser/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/Makefile.in +++ kvirc-3.2.0/src/kvirc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/kernel/Makefile.in +++ kvirc-3.2.0/src/kvirc/kernel/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/module/Makefile.in +++ kvirc-3.2.0/src/kvirc/module/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/uparser/Makefile.in +++ kvirc-3.2.0/src/kvirc/uparser/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvirc/include/Makefile.in +++ kvirc-3.2.0/src/kvirc/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/my/Makefile.in +++ kvirc-3.2.0/src/modules/my/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvimy_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/dcc/Makefile.in +++ kvirc-3.2.0/src/modules/dcc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,8 +20,6 @@ -SOURCES = $(libkvidcc_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/lag/Makefile.in +++ kvirc-3.2.0/src/modules/lag/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makestr - 10.03.2002 Juanjo Álvarez ############################################################################### -SOURCES = $(libkvilag_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/log/Makefile.in +++ kvirc-3.2.0/src/modules/log/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvilog_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/snd/Makefile.in +++ kvirc-3.2.0/src/modules/snd/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvisnd_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/tip/Makefile.in +++ kvirc-3.2.0/src/modules/tip/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,8 +20,6 @@ -SOURCES = $(libkvitip_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/str/Makefile.in +++ kvirc-3.2.0/src/modules/str/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makestr - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvistr_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/url/caps/Makefile.in +++ kvirc-3.2.0/src/modules/url/caps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/url/Makefile.in +++ kvirc-3.2.0/src/modules/url/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviurl_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/chan/Makefile.in +++ kvirc-3.2.0/src/modules/chan/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 31.01.2002 Szymon Stefanek ############################################################################### -SOURCES = $(libkvichan_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/file/Makefile.in +++ kvirc-3.2.0/src/modules/file/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvifile_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/help/Makefile.in +++ kvirc-3.2.0/src/modules/help/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvihelp_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/http/Makefile.in +++ kvirc-3.2.0/src/modules/http/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,8 +20,6 @@ -SOURCES = $(libkvihttp_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/list/Makefile.in +++ kvirc-3.2.0/src/modules/list/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvilist_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/mask/Makefile.in +++ kvirc-3.2.0/src/modules/mask/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvimask_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/perl/Makefile.in +++ kvirc-3.2.0/src/modules/perl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkviperl_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/term/Makefile.in +++ kvirc-3.2.0/src/modules/term/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviterm_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/dockwidget/Makefile.in +++ kvirc-3.2.0/src/modules/dockwidget/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,8 +20,6 @@ -SOURCES = $(libkvidockwidget_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/aliaseditor/Makefile.in +++ kvirc-3.2.0/src/modules/aliaseditor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvialiaseditor_la_SOURCES) $(nodist_libkvialiaseditor_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/channelsjoin/Makefile.in +++ kvirc-3.2.0/src/modules/channelsjoin/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ################################################################################ -SOURCES = $(libkvichannelsjoin_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/sharedfileswindow/caps/Makefile.in +++ kvirc-3.2.0/src/modules/sharedfileswindow/caps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/sharedfileswindow/Makefile.in +++ kvirc-3.2.0/src/modules/sharedfileswindow/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvisharedfileswindow_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/regchan/Makefile.in +++ kvirc-3.2.0/src/modules/regchan/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkviregchan_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/reguser/Makefile.in +++ kvirc-3.2.0/src/modules/reguser/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvireguser_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/notifier/pics/Makefile.in +++ kvirc-3.2.0/src/modules/notifier/pics/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/notifier/Makefile.in +++ kvirc-3.2.0/src/modules/notifier/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,8 +20,6 @@ -SOURCES = $(libkvinotifier_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/about/Makefile.in +++ kvirc-3.2.0/src/modules/about/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviabout_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/clock/Makefile.in +++ kvirc-3.2.0/src/modules/clock/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviclock_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/ident/Makefile.in +++ kvirc-3.2.0/src/modules/ident/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviident_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/mp3player/Makefile.in +++ kvirc-3.2.0/src/modules/mp3player/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvimp3player_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/links/Makefile.in +++ kvirc-3.2.0/src/modules/links/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvilinks_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/setup/Makefile.in +++ kvirc-3.2.0/src/modules/setup/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvisetup_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/eventeditor/Makefile.in +++ kvirc-3.2.0/src/modules/eventeditor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvieventeditor_la_SOURCES) $(nodist_libkvieventeditor_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/logview/caps/Makefile.in +++ kvirc-3.2.0/src/modules/logview/caps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/logview/Makefile.in +++ kvirc-3.2.0/src/modules/logview/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvilogview_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/popupeditor/Makefile.in +++ kvirc-3.2.0/src/modules/popupeditor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(libkvipopupeditor_la_SOURCES) $(nodist_libkvipopupeditor_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/action/Makefile.in +++ kvirc-3.2.0/src/modules/action/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkviaction_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/filetransferwindow/caps/Makefile.in +++ kvirc-3.2.0/src/modules/filetransferwindow/caps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/filetransferwindow/Makefile.in +++ kvirc-3.2.0/src/modules/filetransferwindow/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvifiletransferwindow_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/sharedfile/Makefile.in +++ kvirc-3.2.0/src/modules/sharedfile/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvisharedfile_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/avatar/Makefile.in +++ kvirc-3.2.0/src/modules/avatar/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviavatar_la_SOURCES) $(nodist_libkviavatar_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/codetester/Makefile.in +++ kvirc-3.2.0/src/modules/codetester/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(libkvicodetester_la_SOURCES) $(nodist_libkvicodetester_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/config/Makefile.in +++ kvirc-3.2.0/src/modules/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makefile - 31.01.2002 Szymon Stefanek ############################################################################### -SOURCES = $(libkviconfig_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/dialog/Makefile.in +++ kvirc-3.2.0/src/modules/dialog/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvidialog_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/editor/Makefile.in +++ kvirc-3.2.0/src/modules/editor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvieditor_la_SOURCES) $(nodist_libkvieditor_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/Makefile.in +++ kvirc-3.2.0/src/modules/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/toolbar/Makefile.in +++ kvirc-3.2.0/src/modules/toolbar/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Maketoolbar - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvitoolbar_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/mircimport/caps/Makefile.in +++ kvirc-3.2.0/src/modules/mircimport/caps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/mircimport/pics/Makefile.in +++ kvirc-3.2.0/src/modules/mircimport/pics/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/mircimport/Makefile.in +++ kvirc-3.2.0/src/modules/mircimport/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvimircimport_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/objects/Makefile.in +++ kvirc-3.2.0/src/modules/objects/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviobjects_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/rijndael/caps/Makefile.in +++ kvirc-3.2.0/src/modules/rijndael/caps/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/modules/rijndael/Makefile.in +++ kvirc-3.2.0/src/modules/rijndael/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvirijndael_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/toolbareditor/Makefile.in +++ kvirc-3.2.0/src/modules/toolbareditor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvitoolbareditor_la_SOURCES) $(nodist_libkvitoolbareditor_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/spaste/Makefile.in +++ kvirc-3.2.0/src/modules/spaste/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvispaste_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/system/Makefile.in +++ kvirc-3.2.0/src/modules/system/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makesystem - 10.03.2000 Szymon Stefanek ############################################################################### -SOURCES = $(libkvisystem_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/window/Makefile.in +++ kvirc-3.2.0/src/modules/window/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviwindow_la_SOURCES) $(nodist_libkviwindow_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/tmphighlight/Makefile.in +++ kvirc-3.2.0/src/modules/tmphighlight/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -18,8 +18,6 @@ # KVirc IRC client Makestr - 10.03.2002 Juanjo Álvarez ############################################################################### -SOURCES = $(libkvitmphighlight_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/raweditor/Makefile.in +++ kvirc-3.2.0/src/modules/raweditor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -15,8 +15,6 @@ @SET_MAKE@ -SOURCES = $(libkviraweditor_la_SOURCES) $(nodist_libkviraweditor_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/options/Makefile.in +++ kvirc-3.2.0/src/modules/options/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvioptions_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/lamerizer/Makefile.in +++ kvirc-3.2.0/src/modules/lamerizer/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -20,8 +20,6 @@ -SOURCES = $(libkvilamerizer_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/socketspy/Makefile.in +++ kvirc-3.2.0/src/modules/socketspy/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkvisocketspy_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/actioneditor/Makefile.in +++ kvirc-3.2.0/src/modules/actioneditor/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviactioneditor_la_SOURCES) $(nodist_libkviactioneditor_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/iograph/Makefile.in +++ kvirc-3.2.0/src/modules/iograph/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviiograph_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/modules/perlcore/Makefile.in +++ kvirc-3.2.0/src/modules/perlcore/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -19,8 +19,6 @@ ############################################################################### -SOURCES = $(libkviperlcore_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/Makefile.in +++ kvirc-3.2.0/src/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/ext/Makefile.in +++ kvirc-3.2.0/src/kvilib/ext/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/irc/Makefile.in +++ kvirc-3.2.0/src/kvilib/irc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/net/Makefile.in +++ kvirc-3.2.0/src/kvilib/net/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/tal/Makefile.in +++ kvirc-3.2.0/src/kvilib/tal/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/core/Makefile.in +++ kvirc-3.2.0/src/kvilib/core/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/file/Makefile.in +++ kvirc-3.2.0/src/kvilib/file/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/build/Makefile.in +++ kvirc-3.2.0/src/kvilib/build/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -22,8 +22,6 @@ ######################################################################################################################## -SOURCES = $(libkvilib_la_SOURCES) $(nodist_libkvilib_la_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ --- kvirc-3.2.0.orig/src/kvilib/config/Makefile.in +++ kvirc-3.2.0/src/kvilib/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/Makefile.in +++ kvirc-3.2.0/src/kvilib/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/system/Makefile.in +++ kvirc-3.2.0/src/kvilib/system/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/src/kvilib/include/Makefile.in +++ kvirc-3.2.0/src/kvilib/include/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/man/kvirc.1 +++ kvirc-3.2.0/data/man/kvirc.1 @@ -121,6 +121,6 @@ With bug-hunting, hard-thinking, eyes-consuming, nights spent on IRC, great suggestions and more from lots of people all over the net, including but not limited to -Paul 'infected@ircnet' Boehm, Olle 'Crocodile@ircnet' Hällnäs, Diablo@ircnet, +Paul 'infected@ircnet' Boehm, Olle 'Crocodile@ircnet' H\[:a]lln\[:a]s, Diablo@ircnet, Andrew 'Drosha@ircnet' Frolov, MalboroLi@ircnet, munehiro@ircnet --- kvirc-3.2.0.orig/data/man/Makefile.in +++ kvirc-3.2.0/data/man/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/pics/Makefile.in +++ kvirc-3.2.0/data/pics/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/icons/16x16/Makefile.in +++ kvirc-3.2.0/data/icons/16x16/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/icons/32x32/Makefile.in +++ kvirc-3.2.0/data/icons/32x32/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/icons/48x48/Makefile.in +++ kvirc-3.2.0/data/icons/48x48/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/icons/64x64/Makefile.in +++ kvirc-3.2.0/data/icons/64x64/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/icons/Makefile.in +++ kvirc-3.2.0/data/icons/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/doctemplates/Makefile.in +++ kvirc-3.2.0/data/doctemplates/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/msgcolors/Makefile.in +++ kvirc-3.2.0/data/msgcolors/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/mimelnk/Makefile.in +++ kvirc-3.2.0/data/mimelnk/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/applnk/Makefile.in +++ kvirc-3.2.0/data/applnk/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/config/Makefile.in +++ kvirc-3.2.0/data/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/Makefile.in +++ kvirc-3.2.0/data/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/deftheme/hires/Makefile.in +++ kvirc-3.2.0/data/deftheme/hires/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/deftheme/lores/Makefile.in +++ kvirc-3.2.0/data/deftheme/lores/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/deftheme/Makefile.in +++ kvirc-3.2.0/data/deftheme/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/resources_mac/Makefile.in +++ kvirc-3.2.0/data/resources_mac/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/resources/Makefile.in +++ kvirc-3.2.0/data/resources/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/defscript/Makefile.in +++ kvirc-3.2.0/data/defscript/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/protocols/Makefile.in +++ kvirc-3.2.0/data/protocols/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/data/helppics/Makefile.in +++ kvirc-3.2.0/data/helppics/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/admin/depcomp +++ kvirc-3.2.0/admin/depcomp @@ -1,7 +1,7 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2005-02-09.22 +scriptversion=2005-07-09.11 # Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. @@ -17,8 +17,8 @@ # 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., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -467,7 +467,8 @@ done "$@" -E | - sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | + sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | sed '$ s: \\$::' > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" --- kvirc-3.2.0.orig/admin/ltmain.sh +++ kvirc-3.2.0/admin/ltmain.sh @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # @@ -17,7 +17,7 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -43,9 +43,14 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION=1.5.6 -TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 220 $" +VERSION="1.5.20 Debian 1.5.20-2" +TIMESTAMP=" (1.1220.2.287 2005/08/31 18:54:15)" +# See if we are running on zsh, and set the options which allow our +# commands through without removal of \ escapes. +if test -n "${ZSH_VERSION+set}" ; then + setopt NO_GLOB_SUBST +fi # Check that we have a working $echo. if test "X$1" = X--no-reexec; then @@ -83,14 +88,15 @@ Xsed="${SED}"' -e 1s/^X//' sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g' # test EBCDIC or ASCII -case `echo A|tr A '\301'` in - A) # EBCDIC based system - SP2NL="tr '\100' '\n'" - NL2SP="tr '\r\n' '\100\100'" +case `echo X|tr X '\101'` in + A) # ASCII based system + # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr + SP2NL='tr \040 \012' + NL2SP='tr \015\012 \040\040' ;; - *) # Assume ASCII based system - SP2NL="tr '\040' '\012'" - NL2SP="tr '\015\012' '\040\040'" + *) # EBCDIC based system + SP2NL='tr \100 \n' + NL2SP='tr \r\n \100\100' ;; esac @@ -107,8 +113,9 @@ fi # Make sure IFS has a sensible default -: ${IFS=" -"} +lt_nl=' +' +IFS=" $lt_nl" if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then $echo "$modename: not configured to build any kind of library" 1>&2 @@ -138,7 +145,8 @@ # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -func_win32_libid () { +func_win32_libid () +{ win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -178,7 +186,8 @@ # Only attempt this if the compiler in the base compile # command doesn't match the default compiler. # arg is usually of the form 'gcc ...' -func_infer_tag () { +func_infer_tag () +{ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do @@ -235,6 +244,108 @@ esac fi } + + +# func_extract_an_archive dir oldlib +func_extract_an_archive () +{ + f_ex_an_ar_dir="$1"; shift + f_ex_an_ar_oldlib="$1" + + $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)" + $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $? + if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2 + exit $EXIT_FAILURE + fi +} + +# func_extract_archives gentop oldlib ... +func_extract_archives () +{ + my_gentop="$1"; shift + my_oldlibs=${1+"$@"} + my_oldobjs="" + my_xlib="" + my_xabs="" + my_xdir="" + my_status="" + + $show "${rm}r $my_gentop" + $run ${rm}r "$my_gentop" + $show "$mkdir $my_gentop" + $run $mkdir "$my_gentop" + my_status=$? + if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then + exit $my_status + fi + + for my_xlib in $my_oldlibs; do + # Extract the objects. + case $my_xlib in + [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;; + *) my_xabs=`pwd`"/$my_xlib" ;; + esac + my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'` + my_xdir="$my_gentop/$my_xlib" + + $show "${rm}r $my_xdir" + $run ${rm}r "$my_xdir" + $show "$mkdir $my_xdir" + $run $mkdir "$my_xdir" + status=$? + if test "$status" -ne 0 && test ! -d "$my_xdir"; then + exit $status + fi + case $host in + *-darwin*) + $show "Extracting $my_xabs" + # Do not bother doing anything if just a dry run + if test -z "$run"; then + darwin_orig_dir=`pwd` + cd $my_xdir || exit $? + darwin_archive=$my_xabs + darwin_curdir=`pwd` + darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'` + darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null` + if test -n "$darwin_arches"; then + darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'` + darwin_arch= + $show "$darwin_base_archive has multiple architectures $darwin_arches" + for darwin_arch in $darwin_arches ; do + mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}" + lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}" + cd "unfat-$$/${darwin_base_archive}-${darwin_arch}" + func_extract_an_archive "`pwd`" "${darwin_base_archive}" + cd "$darwin_curdir" + $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" + done # $darwin_arches + ## Okay now we have a bunch of thin objects, gotta fatten them up :) + darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP` + darwin_file= + darwin_files= + for darwin_file in $darwin_filelist; do + darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + lipo -create -output "$darwin_file" $darwin_files + done # $darwin_filelist + ${rm}r unfat-$$ + cd "$darwin_orig_dir" + else + cd "$darwin_orig_dir" + func_extract_an_archive "$my_xdir" "$my_xabs" + fi # $darwin_arches + fi # $run + ;; + *) + func_extract_an_archive "$my_xdir" "$my_xabs" + ;; + esac + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + done + func_extract_archives_result="$my_oldobjs" +} # End of Shell function definitions ##################################### @@ -305,10 +416,10 @@ --version) $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" $echo - $echo "Copyright (C) 2003 Free Software Foundation, Inc." + $echo "Copyright (C) 2005 Free Software Foundation, Inc." $echo "This is free software; see the source for copying conditions. There is NO" $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit $EXIT_SUCCESS + exit $? ;; --config) @@ -317,7 +428,7 @@ for tagname in $taglist; do ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" done - exit $EXIT_SUCCESS + exit $? ;; --debug) @@ -342,7 +453,7 @@ else $echo "disable static libraries" fi - exit $EXIT_SUCCESS + exit $? ;; --finish) mode="finish" ;; @@ -399,7 +510,7 @@ # Infer the operation mode. if test -z "$mode"; then $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 + $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2 case $nonopt in *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) mode=link @@ -465,7 +576,7 @@ for arg do - case "$arg_mode" in + case $arg_mode in arg ) # do not "continue". Instead, add this to base_compile lastarg="$arg" @@ -547,7 +658,10 @@ case $lastarg in # Double-quote args containing other shell metacharacters. # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. + # in scan sets, and some SunOS ksh mistreat backslash-escaping + # in scan sets (worked around with variable expansion), + # and furthermore cannot handle '|' '&' '(' ')' in scan sets + # at all, so we specify them separately. *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") lastarg="\"$lastarg\"" ;; @@ -621,6 +735,14 @@ esac done + qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"` + case $qlibobj in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qlibobj="\"$qlibobj\"" ;; + esac + test "X$libobj" != "X$qlibobj" \ + && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \ + && $echo "$modename: libobj name \`$libobj' may not contain shell special characters." objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` if test "X$xdir" = "X$obj"; then @@ -693,12 +815,17 @@ $run $rm $removelist exit $EXIT_FAILURE fi - $echo $srcfile > "$lockfile" + $echo "$srcfile" > "$lockfile" fi if test -n "$fix_srcfile_path"; then eval srcfile=\"$fix_srcfile_path\" fi + qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"` + case $qsrcfile in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + qsrcfile="\"$qsrcfile\"" ;; + esac $run $rm "$libobj" "${libobj}T" @@ -720,10 +847,10 @@ fbsd_hideous_sh_bug=$base_compile if test "$pic_mode" != no; then - command="$base_compile $srcfile $pic_flag" + command="$base_compile $qsrcfile $pic_flag" else # Don't build PIC code - command="$base_compile $srcfile" + command="$base_compile $qsrcfile" fi if test ! -d "${xdir}$objdir"; then @@ -803,9 +930,9 @@ if test "$build_old_libs" = yes; then if test "$pic_mode" != yes; then # Don't build PIC code - command="$base_compile $srcfile" + command="$base_compile $qsrcfile" else - command="$base_compile $srcfile $pic_flag" + command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then command="$command -o $obj" @@ -1227,6 +1354,13 @@ prev= continue ;; + darwin_framework) + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + prev= + continue + ;; *) eval "$prev=\"\$arg\"" prev= @@ -1285,6 +1419,14 @@ continue ;; + -framework|-arch) + prev=darwin_framework + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" + continue + ;; + -inst-prefix-dir) prev=inst_prefix continue @@ -1345,7 +1487,7 @@ # These systems don't actually have a C library (as such) test "X$arg" = "X-lc" && continue ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -1356,7 +1498,7 @@ esac elif test "X$arg" = "X-lc_r"; then case $host in - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -1366,8 +1508,20 @@ continue ;; + # Tru64 UNIX uses -model [arg] to determine the layout of C++ + # classes, name mangling, and exception handling. + -model) + compile_command="$compile_command $arg" + compiler_flags="$compiler_flags $arg" + finalize_command="$finalize_command $arg" + prev=xcompiler + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - deplibs="$deplibs $arg" + compiler_flags="$compiler_flags $arg" + compile_command="$compile_command $arg" + finalize_command="$finalize_command $arg" continue ;; @@ -1376,13 +1530,14 @@ continue ;; - # gcc -m* arguments should be passed to the linker via $compiler_flags - # in order to pass architecture information to the linker - # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo - # but this is not reliable with gcc because gcc may use -mfoo to - # select a different linker, different libraries, etc, while - # -Wl,-mfoo simply passes -mfoo to the linker. - -m*) + # -64, -mips[0-9] enable 64-bit mode on the SGI compiler + # -r[0-9][0-9]* specifies the processor on the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler + # +DA*, +DD* enable 64-bit mode on the HP compiler + # -q* pass through compiler args for the IBM compiler + # -m* pass through architecture-specific compiler args for GCC + -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*) + # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` @@ -1858,7 +2013,7 @@ compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - deplibs="$deplib $deplibs" + compiler_flags="$compiler_flags $deplib" fi continue ;; @@ -1977,7 +2132,22 @@ fi case $linkmode in lib) - if test "$deplibs_check_method" != pass_all; then + valid_a_lib=no + case $deplibs_check_method in + match_pattern*) + set dummy $deplibs_check_method + match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` + if eval $echo \"$deplib\" 2>/dev/null \ + | $SED 10q \ + | $EGREP "$match_pattern_regex" > /dev/null; then + valid_a_lib=yes + fi + ;; + pass_all) + valid_a_lib=yes + ;; + esac + if test "$valid_a_lib" != yes; then $echo $echo "*** Warning: Trying to link with static lib archive $deplib." $echo "*** I have the capability to make that library automatically link in when" @@ -2051,6 +2221,8 @@ # it will not redefine variables installed, or shouldnotlink installed=yes shouldnotlink=no + avoidtemprpath= + # Read the .la file case $lib in @@ -2149,11 +2321,19 @@ dir="$libdir" absdir="$libdir" fi + test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then + dir="$ladir" + absdir="$abs_ladir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + else + dir="$ladir/$objdir" + absdir="$abs_ladir/$objdir" + # Remove this search path later + notinst_path="$notinst_path $abs_ladir" + fi fi # $installed = yes name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` @@ -2226,12 +2406,12 @@ if test -n "$library_names" && { test "$prefer_static_libs" = no || test -z "$old_library"; }; then # We need to hardcode the library path - if test -n "$shlibpath_var"; then + if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then # Make sure the rpath contains only unique directories. case "$temp_rpath " in *" $dir "*) ;; *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; + *) temp_rpath="$temp_rpath $absdir" ;; esac fi @@ -2417,7 +2597,7 @@ add_dir="-L$dir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case "$libdir" in + case $libdir in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2490,7 +2670,7 @@ add_dir="-L$libdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then - case "$libdir" in + case $libdir in [\\/]*) add_dir="$add_dir -L$inst_prefix_dir$libdir" ;; @@ -2551,8 +2731,6 @@ fi fi else - convenience="$convenience $dir/$old_library" - old_convenience="$old_convenience $dir/$old_library" deplibs="$dir/$old_library $deplibs" link_static=yes fi @@ -2670,12 +2848,12 @@ *) continue ;; esac case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; + *" $path "*) ;; + *) deplibs="$path $deplibs" ;; esac case " $deplibs " in - *" $path "*) ;; - *) deplibs="$deplibs $path" ;; + *" $depdepl "*) ;; + *) deplibs="$depdepl $deplibs" ;; esac done fi # link_all_deplibs != no @@ -2945,27 +3123,27 @@ # Check that each of the things are valid numbers. case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 + $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 + $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; esac case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; + 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;; *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 + $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 exit $EXIT_FAILURE ;; @@ -2991,7 +3169,7 @@ versuffix="$major.$age.$revision" # Darwin ld doesn't like 0 for these options... minor_current=`expr $current + 1` - verstring="-compatibility_version $minor_current -current_version $minor_current.$revision" + verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision" ;; freebsd-aout) @@ -3197,7 +3375,7 @@ *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. test "X$arg" = "X-lc" && continue ;; @@ -3247,7 +3425,7 @@ if test "$?" -eq 0 ; then ldd_output=`ldd conftest` for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" -ne "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3284,7 +3462,7 @@ # Error occurred in the first compile. Let's try to salvage # the situation: Compile a separate program for each library. for i in $deplibs; do - name="`expr $i : '-l\(.*\)'`" + name=`expr $i : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then $rm conftest @@ -3336,7 +3514,7 @@ set dummy $deplibs_check_method file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" + name=`expr $a_deplib : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test "$name" != "" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3405,7 +3583,7 @@ set dummy $deplibs_check_method match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" + name=`expr $a_deplib : '-l\(.*\)'` # If $name is empty we are operating on a -L argument. if test -n "$name" && test "$name" != "0"; then if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then @@ -3646,6 +3824,9 @@ # The command line is too long to execute in one step. $show "using reloadable object file for export list..." skipped_export=: + # Break out early, otherwise skipped_export may be + # set to false by a later but shorter cmd. + break fi done IFS="$save_ifs" @@ -3679,67 +3860,13 @@ eval libobjs=\"\$libobjs $whole_archive_flag_spec\" else gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "$mkdir $xdir" - $run $mkdir "$xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then - exit $status - fi - # We will extract separately just the conflicting names and we will no - # longer touch any unique names. It is faster to leave these extract - # automatically by $AR in one run. - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 - $AR t "$xabs" | sort | uniq -cd | while read -r count name - do - i=1 - while test "$i" -le "$count" - do - # Put our $i before any first dot (extension) - # Never overwrite any file - name_to="$name" - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" - do - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` - done - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? - i=`expr $i + 1` - done - done - fi - - libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $convenience + libobjs="$libobjs $func_extract_archives_result" fi fi - + if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" linker_flags="$linker_flags $flag" @@ -3769,7 +3896,8 @@ fi fi - if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && + if test "X$skipped_export" != "X:" && + len=`expr "X$test_cmds" : ".*" 2>/dev/null` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then : else @@ -3788,6 +3916,7 @@ save_libobjs=$libobjs fi save_output=$output + output_la=`$echo "X$output" | $Xsed -e "$basename"` # Clear the reloadable object creation command queue and # initialize k to one. @@ -3797,13 +3926,13 @@ delfiles= last_robj= k=1 - output=$output_objdir/$save_output-${k}.$objext + output=$output_objdir/$output_la-${k}.$objext # Loop over the list of objects to be linked. for obj in $save_libobjs do eval test_cmds=\"$reload_cmds $objlist $last_robj\" if test "X$objlist" = X || - { len=`expr "X$test_cmds" : ".*"` && + { len=`expr "X$test_cmds" : ".*" 2>/dev/null` && test "$len" -le "$max_cmd_len"; }; then objlist="$objlist $obj" else @@ -3817,9 +3946,9 @@ # the last one created. eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" fi - last_robj=$output_objdir/$save_output-${k}.$objext + last_robj=$output_objdir/$output_la-${k}.$objext k=`expr $k + 1` - output=$output_objdir/$save_output-${k}.$objext + output=$output_objdir/$output_la-${k}.$objext objlist=$obj len=1 fi @@ -3839,13 +3968,13 @@ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" fi - # Set up a command to remove the reloadale object files + # Set up a command to remove the reloadable object files # after they are used. i=0 while test "$i" -lt "$k" do i=`expr $i + 1` - delfiles="$delfiles $output_objdir/$save_output-${i}.$objext" + delfiles="$delfiles $output_objdir/$output_la-${i}.$objext" done $echo "creating a temporary reloadable object file: $output" @@ -3893,13 +4022,30 @@ IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || exit $? + $run eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' + fi + + exit $lt_exit + } done IFS="$save_ifs" # Restore the uninstalled library and exit if test "$mode" = relink; then $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? + + if test -n "$convenience"; then + if test -z "$whole_archive_flag_spec"; then + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + fi + fi + exit $EXIT_SUCCESS fi @@ -3977,64 +4123,10 @@ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\" else gentop="$output_objdir/${obj}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - for xlib in $convenience; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "$mkdir $xdir" - $run $mkdir "$xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then - exit $status - fi - # We will extract separately just the conflicting names and we will no - # longer touch any unique names. It is faster to leave these extract - # automatically by $AR in one run. - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 - $AR t "$xabs" | sort | uniq -cd | while read -r count name - do - i=1 - while test "$i" -le "$count" - do - # Put our $i before any first dot (extension) - # Never overwrite any file - name_to="$name" - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" - do - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` - done - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? - i=`expr $i + 1` - done - done - fi - - reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $convenience + reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi @@ -4296,12 +4388,12 @@ # Prepare the list of exported symbols if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" + export_symbols="$output_objdir/$outputname.exp" $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' + $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' else - $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"' - $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T' + $run eval "${SED} -e 's/\([ ][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"' + $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' $run eval 'mv "$nlist"T "$nlist"' fi fi @@ -4353,7 +4445,26 @@ #endif /* The mapping between symbol names and symbols. */ +" + + case $host in + *cygwin* | *mingw* ) + $echo >> "$output_objdir/$dlsyms" "\ +/* DATA imports from DLLs on WIN32 can't be const, because + runtime relocations are performed -- see ld's documentation + on pseudo-relocs */ +struct { +" + ;; + * ) + $echo >> "$output_objdir/$dlsyms" "\ const struct { +" + ;; + esac + + + $echo >> "$output_objdir/$dlsyms" "\ const char *name; lt_ptr address; } @@ -4582,7 +4693,7 @@ esac case $host in *cygwin* | *mingw* ) - cwrappersource=`$echo ${objdir}/lt-${output}.c` + cwrappersource=`$echo ${objdir}/lt-${outputname}.c` cwrapper=`$echo ${output}.exe` $rm $cwrappersource $cwrapper trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 @@ -4681,6 +4792,7 @@ EOF cat >> $cwrappersource <<"EOF" + return 127; } void * @@ -4815,7 +4927,7 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH relink_command=\"$relink_command\" @@ -4944,13 +5056,13 @@ # Backslashes separate directories on plain windows *-*-mingw | *-*-os2*) $echo >> $output "\ - exec \$progdir\\\\\$program \${1+\"\$@\"} + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} " ;; *) $echo >> $output "\ - exec \$progdir/\$program \${1+\"\$@\"} + exec \"\$progdir/\$program\" \${1+\"\$@\"} " ;; esac @@ -4960,7 +5072,7 @@ fi else # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 + \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 exit $EXIT_FAILURE @@ -4992,71 +5104,73 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - $show "${rm}r $gentop" - $run ${rm}r "$gentop" - $show "$mkdir $gentop" - $run $mkdir "$gentop" - status=$? - if test "$status" -ne 0 && test ! -d "$gentop"; then - exit $status - fi generated="$generated $gentop" - # Add in members from convenience archives. - for xlib in $addlibs; do - # Extract the objects. - case $xlib in - [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;; - *) xabs=`pwd`"/$xlib" ;; - esac - xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'` - xdir="$gentop/$xlib" - - $show "${rm}r $xdir" - $run ${rm}r "$xdir" - $show "$mkdir $xdir" - $run $mkdir "$xdir" - status=$? - if test "$status" -ne 0 && test ! -d "$xdir"; then - exit $status - fi - # We will extract separately just the conflicting names and we will no - # longer touch any unique names. It is faster to leave these extract - # automatically by $AR in one run. - $show "(cd $xdir && $AR x $xabs)" - $run eval "(cd \$xdir && $AR x \$xabs)" || exit $? - if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; renaming object files" 1>&2 - $echo "$modename: warning: to ensure that they will not overwrite" 1>&2 - $AR t "$xabs" | sort | uniq -cd | while read -r count name - do - i=1 - while test "$i" -le "$count" - do - # Put our $i before any first dot (extension) - # Never overwrite any file - name_to="$name" - while test "X$name_to" = "X$name" || test -f "$xdir/$name_to" - do - name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"` - done - $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')" - $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $? - i=`expr $i + 1` - done - done - fi - - oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP` - done + func_extract_archives $gentop $addlibs + oldobjs="$oldobjs $func_extract_archives_result" fi # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then cmds=$old_archive_from_new_cmds else + # POSIX demands no paths to be encoded in archives. We have + # to avoid creating archives with duplicate basenames if we + # might have to extract them afterwards, e.g., when creating a + # static archive out of a convenience library, or when linking + # the entirety of a libtool archive into another (currently + # not supported by libtool). + if (for obj in $oldobjs + do + $echo "X$obj" | $Xsed -e 's%^.*/%%' + done | sort | sort -uc >/dev/null 2>&1); then + : + else + $echo "copying selected object files to avoid basename conflicts..." + + if test -z "$gentop"; then + gentop="$output_objdir/${outputname}x" + generated="$generated $gentop" + + $show "${rm}r $gentop" + $run ${rm}r "$gentop" + $show "$mkdir $gentop" + $run $mkdir "$gentop" + status=$? + if test "$status" -ne 0 && test ! -d "$gentop"; then + exit $status + fi + fi + + save_oldobjs=$oldobjs + oldobjs= + counter=1 + for obj in $save_oldobjs + do + objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` + case " $oldobjs " in + " ") oldobjs=$obj ;; + *[\ /]"$objbase "*) + while :; do + # Make sure we don't pick an alternate name that also + # overlaps. + newobj=lt$counter-$objbase + counter=`expr $counter + 1` + case " $oldobjs " in + *[\ /]"$newobj "*) ;; + *) if test ! -f "$gentop/$newobj"; then break; fi ;; + esac + done + $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" + $run ln "$obj" "$gentop/$newobj" || + $run cp "$obj" "$gentop/$newobj" + oldobjs="$oldobjs $gentop/$newobj" + ;; + *) oldobjs="$oldobjs $obj" ;; + esac + done + fi + eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && @@ -5070,20 +5184,7 @@ objlist= concat_cmds= save_oldobjs=$oldobjs - # GNU ar 2.10+ was changed to match POSIX; thus no paths are - # encoded into archives. This makes 'ar r' malfunction in - # this piecewise linking case whenever conflicting object - # names appear in distinct ar calls; check, warn and compensate. - if (for obj in $save_oldobjs - do - $echo "X$obj" | $Xsed -e 's%^.*/%%' - done | sort | sort -uc >/dev/null 2>&1); then - : - else - $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2 - $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2 - AR_FLAGS=cq - fi + # Is there a better way of finding the last object in the list? for obj in $save_oldobjs do @@ -5094,7 +5195,7 @@ oldobjs="$objlist $obj" objlist="$objlist $obj" eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*"` && + if len=`expr "X$test_cmds" : ".*" 2>/dev/null` && test "$len" -le "$max_cmd_len"; then : else @@ -5291,11 +5392,11 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then + $echo "X$nonopt" | grep shtool > /dev/null; then # Aesthetically quote it. arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -5304,14 +5405,14 @@ shift else install_prog= - arg="$nonopt" + arg=$nonopt fi # The real first argument should be the name of the installation program. # Aesthetically quote it. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -5329,28 +5430,31 @@ do if test -n "$dest"; then files="$files $dest" - dest="$arg" + dest=$arg continue fi case $arg in -d) isdir=yes ;; - -f) prev="-f" ;; - -g) prev="-g" ;; - -m) prev="-m" ;; - -o) prev="-o" ;; + -f) + case " $install_prog " in + *[\\\ /]cp\ *) ;; + *) prev=$arg ;; + esac + ;; + -g | -m | -o) prev=$arg ;; -s) stripme=" -s" continue ;; - -*) ;; - + -*) + ;; *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then prev= else - dest="$arg" + dest=$arg continue fi ;; @@ -5359,7 +5463,7 @@ # Aesthetically quote the argument. arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") arg="\"$arg\"" ;; esac @@ -5528,11 +5632,14 @@ if test "$#" -gt 0; then # Delete the old symlinks, and create new ones. + # Try `ln -sf' first, because the `ln' binary might depend on + # the symlink we replace! Solaris /bin/ln does not understand -f, + # so we also need to try rm && ln -s. for linkname do if test "$linkname" != "$realname"; then - $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" + $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" + $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })" fi done fi @@ -5545,7 +5652,16 @@ IFS="$save_ifs" eval cmd=\"$cmd\" $show "$cmd" - $run eval "$cmd" || exit $? + $run eval "$cmd" || { + lt_exit=$? + + # Restore the uninstalled library and exit + if test "$mode" = relink; then + $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)' + fi + + exit $lt_exit + } done IFS="$save_ifs" fi @@ -5639,17 +5755,15 @@ notinst_deplibs= relink_command= - # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." - # which disallows the automatic-append-.exe behavior. - case $build in - *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; - *) wrapperdot=${wrapper} ;; - esac + # Note that it is not necessary on cygwin/mingw to append a dot to + # foo even if both foo and FILE.exe exist: automatic-append-.exe + # behavior happens only for exec(3), not for open(2)! Also, sourcing + # `FILE.' does not work on cygwin managed mounts. + # # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; + case $wrapper in + */* | *\\*) . ${wrapper} ;; + *) . ./${wrapper} ;; esac # Check the variables that should have been set. @@ -5677,17 +5791,15 @@ done relink_command= - # To insure that "foo" is sourced, and not "foo.exe", - # finese the cygwin/MSYS system by explicitly sourcing "foo." - # which disallows the automatic-append-.exe behavior. - case $build in - *cygwin* | *mingw*) wrapperdot=${wrapper}. ;; - *) wrapperdot=${wrapper} ;; - esac + # Note that it is not necessary on cygwin/mingw to append a dot to + # foo even if both foo and FILE.exe exist: automatic-append-.exe + # behavior happens only for exec(3), not for open(2)! Also, sourcing + # `FILE.' does not work on cygwin managed mounts. + # # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; + case $wrapper in + */* | *\\*) . ${wrapper} ;; + *) . ./${wrapper} ;; esac outputname= @@ -5728,7 +5840,7 @@ fi # remove .exe since cygwin /usr/bin/install will append another - # one anyways + # one anyway case $install_prog,$host in */usr/bin/install*,*cygwin*) case $file:$destfile in @@ -6398,7 +6510,7 @@ $echo $echo "Try \`$modename --help' for more information about other modes." -exit $EXIT_SUCCESS +exit $? # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting --- kvirc-3.2.0.orig/admin/libtool/Makefile.in +++ kvirc-3.2.0/admin/libtool/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/admin/config.guess +++ kvirc-3.2.0/admin/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-12' +timestamp='2005-08-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,13 +17,15 @@ # # 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Originally written by Per Bothner . # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. @@ -53,7 +55,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -66,11 +68,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -123,7 +125,7 @@ ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -196,55 +198,20 @@ # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit 0 ;; - amd64:OpenBSD:*:*) - echo x86_64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - amiga:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - cats:OpenBSD:*:*) - echo arm-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - hp300:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - luna88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mac68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - macppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme68k:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvme88k:OpenBSD:*:*) - echo m88k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - mvmeppc:OpenBSD:*:*) - echo powerpc-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sgi:OpenBSD:*:*) - echo mips64-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - sun3:OpenBSD:*:*) - echo m68k-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; + UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` + echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} + exit ;; *:ekkoBSD:*:*) echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; + exit ;; macppc:MirBSD:*:*) echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; *:MirBSD:*:*) echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; + exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) @@ -297,40 +264,43 @@ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit 0 ;; + exit ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit 0 ;; + exit ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit 0 ;; + exit ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit 0;; + exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; + exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; + exit ;; *:OS/390:*:*) echo i370-ibm-openedition - exit 0 ;; + exit ;; *:z/VM:*:*) echo s390-ibm-zvmoe - exit 0 ;; + exit ;; *:OS400:*:*) echo powerpc-ibm-os400 - exit 0 ;; + exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; + exit ;; + arm:riscos:*:*|arm:RISCOS:*:*) + echo arm-unknown-riscos + exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit 0;; + exit ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -338,32 +308,32 @@ else echo pyramid-pyramid-bsd fi - exit 0 ;; + exit ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit 0 ;; + exit ;; DRS?6000:unix:4.0:6*) echo sparc-icl-nx6 - exit 0 ;; + exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; + sparc) echo sparc-icl-nx7; exit ;; esac ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -372,10 +342,10 @@ esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit 0 ;; + exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 @@ -387,10 +357,10 @@ echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit 0 ;; + exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; + exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -401,40 +371,40 @@ # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; + exit ;; m68k:machten:*:*) echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; + exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit 0 ;; + exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; + exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; + exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -458,32 +428,33 @@ exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && + dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && + SYSTEM_NAME=`$dummy $dummyarg` && + { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; + exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit 0 ;; + exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) echo powerpc-harris-powermax - exit 0 ;; + exit ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit 0 ;; + exit ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit 0 ;; + exit ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit 0 ;; + exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -499,29 +470,29 @@ else echo i586-dg-dgux${UNAME_RELEASE} fi - exit 0 ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit 0 ;; + exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit 0 ;; + exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit 0 ;; + exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit 0 ;; + exit ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; + exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit 0 ;; + exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -529,7 +500,7 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -544,14 +515,18 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 + if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` + then + echo "$SYSTEM_NAME" + else + echo rs6000-ibm-aix3.2.5 + fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit 0 ;; + exit ;; *:AIX:*:[45]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then @@ -565,28 +540,28 @@ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; + exit ;; *:AIX:*:*) echo rs6000-ibm-aix - exit 0 ;; + exit ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit 0 ;; + exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit 0 ;; # report: romp-ibm BSD 4.3 + exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit 0 ;; + exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit 0 ;; + exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit 0 ;; + exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit 0 ;; + exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in @@ -648,9 +623,19 @@ esac if [ ${HP_ARCH} = "hppa2.0w" ] then - # avoid double evaluation of $set_cc_for_build - test -n "$CC_FOR_BUILD" || eval $set_cc_for_build - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + eval $set_cc_for_build + + # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating + # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler + # generating 64-bit code. GNU and HP use different nomenclature: + # + # $ CC_FOR_BUILD=cc ./config.guess + # => hppa2.0w-hp-hpux11.23 + # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess + # => hppa64-hp-hpux11.23 + + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | + grep __LP64__ >/dev/null then HP_ARCH="hppa2.0w" else @@ -658,11 +643,11 @@ fi fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; + exit ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -690,158 +675,166 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 + $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 - exit 0 ;; + exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit 0 ;; + exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit 0 ;; + exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit 0 ;; + exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit 0 ;; + exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit 0 ;; + exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit 0 ;; + exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit 0 ;; + exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit 0 ;; + exit ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit 0 ;; + exit ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit 0 ;; + exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit 0 ;; + exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; + exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit 0 ;; + exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; + exit ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; + exit ;; i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; + exit ;; + i*:windows32*:*) + # uname -m includes "-pc" on this system. + echo ${UNAME_MACHINE}-mingw32 + exit ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; + exit ;; x86:Interix*:[34]*) echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; + exit ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; + exit ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? echo i586-pc-interix - exit 0 ;; + exit ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; + exit ;; + amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + echo x86_64-unknown-cygwin + exit ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit 0 ;; + exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; + exit ;; *:GNU:*:*) # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; + exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit 0 ;; + exit ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; + exit ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; cris:Linux:*:*) echo cris-axis-linux-gnu - exit 0 ;; + exit ;; crisv32:Linux:*:*) echo crisv32-axis-linux-gnu - exit 0 ;; + exit ;; frv:Linux:*:*) echo frv-unknown-linux-gnu - exit 0 ;; + exit ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m32r*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; mips:Linux:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -859,7 +852,7 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; mips64:Linux:*:*) eval $set_cc_for_build @@ -878,14 +871,17 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 + test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; + or32:Linux:*:*) + echo or32-unknown-linux-gnu + exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit 0 ;; + exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit 0 ;; + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -899,7 +895,7 @@ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -907,25 +903,25 @@ PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit 0 ;; + exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit 0 ;; + exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; + exit ;; sh64*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; + exit ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit 0 ;; + exit ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent @@ -943,15 +939,15 @@ ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; + exit ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; + exit ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit 0 ;; + exit ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build @@ -979,15 +975,18 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 - test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 + test x"${LIBC}" != x && { + echo "${UNAME_MACHINE}-pc-linux-${LIBC}" + exit + } + test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit 0 ;; + exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -995,27 +994,27 @@ # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo ${UNAME_MACHINE}-pc-os2-emx - exit 0 ;; + exit ;; i*86:XTS-300:*:STOP) echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; + exit ;; i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) + exit ;; + i*86:syllable:*:*) echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; + exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; i*86:*DOS:*:*) echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; + exit ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1023,15 +1022,16 @@ else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit 0 ;; - i*86:*:5:[78]*) + exit ;; + i*86:*:5:[678]*) + # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit 0 ;; + exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit 0 ;; + exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit 0 ;; + exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv - exit 0 ;; + exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix - exit 0 ;; + exit ;; M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4.3${OS_REL} && exit 0 + && { echo i486-ncr-sysv4.3${OS_REL}; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; + && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; + && { echo i486-ncr-sysv4; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit 0 ;; + exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; + exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; + exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit 0 ;; + exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1123,61 +1123,65 @@ else echo ns32k-sni-sysv fi - exit 0 ;; + exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit 0 ;; + exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit 0 ;; + exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit 0 ;; + exit ;; + i*86:VOS:*:*) + # From Paul.Green@stratus.com. + echo ${UNAME_MACHINE}-stratus-vos + exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit 0 ;; + exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; + exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit 0 ;; + exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit 0 ;; + exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit 0 ;; + exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit 0 ;; + exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit 0 ;; + exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; + exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown case $UNAME_PROCESSOR in @@ -1185,7 +1189,7 @@ unknown) UNAME_PROCESSOR=powerpc ;; esac echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; + exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = "x86"; then @@ -1193,22 +1197,25 @@ UNAME_MACHINE=pc fi echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; + exit ;; *:QNX:*:4*) echo i386-pc-qnx - exit 0 ;; + exit ;; + NSE-?:NONSTOP_KERNEL:*:*) + echo nse-tandem-nsk${UNAME_RELEASE} + exit ;; NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; + exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit 0 ;; + exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit 0 ;; + exit ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; + exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1219,41 +1226,44 @@ UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; + exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit 0 ;; + exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit 0 ;; + exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit 0 ;; + exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit 0 ;; + exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit 0 ;; + exit ;; *:ITS:*:*) echo pdp10-unknown-its - exit 0 ;; + exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; + exit ;; *:DragonFly:*:*) echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; + exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms && exit 0 ;; - I*) echo ia64-dec-vms && exit 0 ;; - V*) echo vax-dec-vms && exit 0 ;; + A*) echo alpha-dec-vms ; exit ;; + I*) echo ia64-dec-vms ; exit ;; + V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) echo i386-pc-xenix - exit 0 ;; + exit ;; + i*86:skyos:*:*) + echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1285,7 +1295,7 @@ #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); + printf ("arm-acorn-riscix\n"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1374,11 +1384,12 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && + { echo "$SYSTEM_NAME"; exit; } # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } # Convex versions that predate uname can use getsysinfo(1) @@ -1387,22 +1398,22 @@ case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit 0 ;; + exit ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit 0 ;; + exit ;; c34*) echo c34-convex-bsd - exit 0 ;; + exit ;; c38*) echo c38-convex-bsd - exit 0 ;; + exit ;; c4*) echo c4-convex-bsd - exit 0 ;; + exit ;; esac fi @@ -1413,7 +1424,9 @@ the operating system you are using. It is advised that you download the most up to date version of the config scripts from - ftp://ftp.gnu.org/pub/gnu/config/ + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess +and + http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub If the version you run ($0) is already up to date, please send the following data and any information you think might be --- kvirc-3.2.0.orig/admin/install-sh +++ kvirc-3.2.0/admin/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2005-02-02.21 +scriptversion=2005-05-14.22 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the --- kvirc-3.2.0.orig/admin/config.sub +++ kvirc-3.2.0/admin/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -timestamp='2004-11-30' +timestamp='2005-07-08' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,14 +21,15 @@ # # 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA +# 02110-1301, USA. +# # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. + # Please send patches to . Submit a context # diff and a properly formatted ChangeLog entry. # @@ -70,7 +71,7 @@ version="\ GNU config.sub ($timestamp) -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -83,11 +84,11 @@ while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; + echo "$timestamp" ; exit ;; --version | -v ) - echo "$version" ; exit 0 ;; + echo "$version" ; exit ;; --help | --h* | -h ) - echo "$usage"; exit 0 ;; + echo "$usage"; exit ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -99,7 +100,7 @@ *local*) # First pass through any local machine types. echo $1 - exit 0;; + exit ;; * ) break ;; @@ -231,13 +232,14 @@ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ + | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ + | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ @@ -246,6 +248,7 @@ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ @@ -254,15 +257,17 @@ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | ms1 \ | msp430 \ | ns16k | ns32k \ - | openrisc | or32 \ + | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ + | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b \ | strongarm \ | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ @@ -271,6 +276,9 @@ | z8k) basic_machine=$basic_machine-unknown ;; + m32c) + basic_machine=$basic_machine-unknown + ;; m6811 | m68hc11 | m6812 | m68hc12) # Motorola 68HC11/12. basic_machine=$basic_machine-unknown @@ -298,7 +306,7 @@ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ - | bs2000-* \ + | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ @@ -310,7 +318,7 @@ | ip2k-* | iq2000-* \ | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ + | m88110-* | m88k-* | maxq-* | mcore-* \ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ @@ -319,6 +327,7 @@ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ @@ -327,6 +336,7 @@ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipstx39-* | mipstx39el-* \ | mmix-* \ + | ms1-* \ | msp430-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | orion-* \ @@ -334,9 +344,10 @@ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ + | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ | tahoe-* | thumb-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ @@ -348,6 +359,8 @@ | ymp-* \ | z8k-*) ;; + m32c-*) + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) @@ -758,9 +771,8 @@ basic_machine=hppa1.1-oki os=-proelf ;; - or32 | or32-*) + openrisc | openrisc-*) basic_machine=or32-unknown - os=-coff ;; os400) basic_machine=powerpc-ibm @@ -1086,12 +1098,9 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) + sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; - sh64) - basic_machine=sh64-unknown - ;; sparc | sparcv8 | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; @@ -1178,7 +1187,8 @@ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1196,7 +1206,7 @@ os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) @@ -1385,6 +1395,9 @@ *-be) os=-beos ;; + *-haiku) + os=-haiku + ;; *-ibm) os=-aix ;; @@ -1556,7 +1569,7 @@ esac echo $basic_machine$os -exit 0 +exit # Local variables: # eval: (add-hook 'write-file-hooks 'time-stamp) --- kvirc-3.2.0.orig/admin/missing +++ kvirc-3.2.0/admin/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2005-02-08.22 +scriptversion=2005-06-08.21 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005 # Free Software Foundation, Inc. @@ -19,8 +19,8 @@ # 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., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -297,6 +297,9 @@ # ... or it is derived from the source name (dir/f.texi becomes f.info) test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 touch $file ;; --- kvirc-3.2.0.orig/admin/Makefile.in +++ kvirc-3.2.0/admin/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/aclocal.m4 +++ kvirc-3.2.0/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.9.5 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005 Free Software Foundation, Inc. @@ -28,7 +28,7 @@ # Call AM_AUTOMAKE_VERSION so it can be traced. # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.9.5])]) + [AM_AUTOMAKE_VERSION([1.9.6])]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- --- kvirc-3.2.0.orig/configure +++ kvirc-3.2.0/configure @@ -21992,7 +21992,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 @@ -22019,7 +22019,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then + if test -r "$ac_dir/X11/Xlib.h"; then ac_x_includes=$ac_dir break fi @@ -22033,18 +22033,18 @@ # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" + LIBS="-lX11 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XtMalloc (0) +XrmInitialize () ; return 0; } @@ -22082,7 +22082,7 @@ do # Don't even attempt the hair of trying to link an X program! for ac_extension in a so sl; do - if test -r $ac_dir/libXt.$ac_extension; then + if test -r $ac_dir/libX11.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi --- kvirc-3.2.0.orig/scripts/helpsearch/Makefile.in +++ kvirc-3.2.0/scripts/helpsearch/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/scripts/config/Makefile.in +++ kvirc-3.2.0/scripts/config/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/scripts/Makefile.in +++ kvirc-3.2.0/scripts/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/scripts/browser/Makefile.in +++ kvirc-3.2.0/scripts/browser/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --- kvirc-3.2.0.orig/debian/control +++ kvirc-3.2.0/debian/control @@ -0,0 +1,49 @@ +Source: kvirc +Build-Depends: cdbs (>= 0.4.12), debhelper (>= 4.1.46), kdelibs4-dev (>= 4:3.1.3), libesd0-dev, libperl-dev +Section: net +Priority: optional +Maintainer: Robin Verduijn +Standards-Version: 3.6.2.0 + +Package: kvirc +Architecture: any +Depends: kvirc-data (>= 2:3.0.0), ${shlibs:Depends} +Description: KDE based next generation IRC client with module support + A highly configurable graphical IRC client with an MDI interface, + built-in scripting language, support for IRC DCC, drag & drop file + browsing, and much more. KVIrc uses the KDE widget set, can be extended + using its own scripting language, integrates with KDE, and supports + custom plugins. + . + If you are a developer and you want to write a custom module for KVIrc, + you need to install the kvirc-dev package. + . + The official homepage for KVIrc can be found at http://www.kvirc.net + +Package: kvirc-data +Section: net +Architecture: all +Depends: kvirc (>= 2:3.0.0) +Conflicts: kvirc-doc, kvirc (<< 2:3.0.0) +Replaces: kvirc-doc +Description: Data files for KVIrc + This package contains the architecture-independent data needed by KVIrc in + order to run, such as icons and images, language files, and shell scripts. + It also contains complete reference guides on scripting and functions + within KVIrc in its internal help format. Unless you want to use KVIrc only + as a very simple IRC client you are likely to want to write scripts to + tailor KVIrc to your needs. + . + KVIrc is a graphical IRC client based on the KDE widget set which integrates + with the K Desktop Environment. + +Package: kvirc-dev +Section: devel +Architecture: any +Depends: kvirc (>= 2:3.0.0) +Description: Development files for KVIrc + This package contains KVIrc libraries and include files you need if you + want to develop plugins for KVIrc. + . + KVIrc is a graphical IRC client based on the KDE widget set which integrates + with the K Desktop Environment. --- kvirc-3.2.0.orig/debian/kvirc-dev.links +++ kvirc-3.2.0/debian/kvirc-dev.links @@ -0,0 +1 @@ +usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvirc-config.1.gz --- kvirc-3.2.0.orig/debian/kvirc-dev.prerm +++ kvirc-3.2.0/debian/kvirc-dev.prerm @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +#DEBHELPER# --- kvirc-3.2.0.orig/debian/kvirc.menu +++ kvirc-3.2.0/debian/kvirc.menu @@ -0,0 +1,7 @@ +?package(kvirc):\ + needs="x11"\ + section="Apps/Net"\ + title="KVIrc"\ + command="/usr/bin/kvirc"\ + hints="irc,scripting"\ + icon="/usr/share/icons/hicolor/32x32/apps/kvirc.xpm" --- kvirc-3.2.0.orig/debian/rules +++ kvirc-3.2.0/debian/rules @@ -0,0 +1,67 @@ +#! /usr/bin/make -f +# +# Build script for the KVIrc 3 debian package. +# Using Common Debian Build System (CDBS). +# + +include /usr/share/cdbs/1/rules/simple-patchsys.mk + + # + # Update Makefiles + # + # This is done outside of debian/rules now, so that Debian autobuilders + # will all be building the same source, with no deviation because they + # might have an outdated autotools-dev version. +common-configure-impl:: +# ./autogen.sh + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk + + # + # Specify extra configure options: + # +DEB_CONFIGURE_EXTRA_FLAGS := --with-fno-rtti --with-aa-fonts --with-big-channels +DEB_CONFIGURE_EXTRA_FLAGS += --enable-perl --with-pic --enable-wall --mandir=$(DEB_CONFIGURE_MANDIR) + + # + # If debug is specified, turn it on + # +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + DEB_CONFIGURE_EXTRA_FLAGS += --enable-debug --with-memory-profile --with-memory-checks +else + #DEB_CONFIGURE_EXTRA_FLAGS += --enable-optimisation=3 + #ifneq (,$(findstring 86,$(DEB_BUILD_GNU_CPU))) + # DEB_CONFIGURE_EXTRA_FLAGS +=--with-ix86-asm + #endif +endif + + # + # Don't compress these files + # +DEB_COMPRESS_EXCLUDE := .kvs + + # + # Run dh_shlibdeps with the correct options + # +DEB_SHLIBDEPS_INCLUDE_kvirc := debian/kvirc$(DEB_CONFIGURE_PREFIX)/lib +DEB_SHLIBDEPS_LIBRARY_kvirc := kvirc + + # + # Documentation to include for each package + # +DEB_INSTALL_DOCS_kvirc := FAQ README TODO +DEB_INSTALL_DOCS_kvirc-dev := doc/scriptexamples +DEB_INSTALL_DOCS_ALL := -XCVS -X.cvsignore + +common-install-indep:: + # + # Change the name of the COPYING file to appease lintian + # + mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.2.0/license/{COPYING,EULA} + # + # Move KDE service files to a better position + # + mv $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/services \ + $(CURDIR)/debian/tmp/$(DEB_CONFIGURE_PREFIX)/share/kvirc/3.2.0/ + dh_iconcache --- kvirc-3.2.0.orig/debian/kvirc-data.links +++ kvirc-3.2.0/debian/kvirc-data.links @@ -0,0 +1,3 @@ +usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_make_scriptdist.sh.1.gz +usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_run_netscape.sh.1.gz +usr/share/man/man1/kvirc.1.gz usr/share/man/man1/kvi_search_help.sh.1.gz --- kvirc-3.2.0.orig/debian/kvirc-data.prerm +++ kvirc-3.2.0/debian/kvirc-data.prerm @@ -0,0 +1,27 @@ +#!/bin/sh + +set -e + +case "$1" in + remove) + update-alternatives --quiet --remove irc.protocol \ + /usr/share/kvirc/3.2.0/services/irc.protocol + update-alternatives --quiet --remove irc6.protocol \ + /usr/share/kvirc/3.2.0/services/irc6.protocol + ;; + + upgrade|deconfigure) + ;; + + failed-upgrade) + ;; + + *) + echo "prerm called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 --- kvirc-3.2.0.orig/debian/kvirc.prerm +++ kvirc-3.2.0/debian/kvirc.prerm @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +#DEBHELPER# --- kvirc-3.2.0.orig/debian/overrides/kvirc +++ kvirc-3.2.0/debian/overrides/kvirc @@ -0,0 +1,2 @@ +kvirc: binary-without-manpage kvirc +kvirc: menu-icon-missing /usr/share/icons/hicolor/32x32/apps/kvirc.xpm --- kvirc-3.2.0.orig/debian/changelog +++ kvirc-3.2.0/debian/changelog @@ -0,0 +1,858 @@ +kvirc (2:3.2.0-5ubuntu1.1) dapper-security; urgency=low + + * SECURITY UPDATE: parseIrcUrl() do not properly sanitize parts of the URI + when building the command for KVIrc's internet script system. This can + be exploited to inject and execute commands for the KVIrc script system + (including the "run" command, which can be leveraged to execute shell + commands) by e.g. tricking a user into opening a specially crafted + "irc://" or similar URI. + * Add debian/patches/09_parseIrcUrl_security_fix.patch: propery sanitizes + URI strings, as done in upstream SVN. (Fixes LP: #123037) + * References: + - http://www.kvirc.net/?id=news&story=2007.06.29.22.00.1.story&dir=latest + - http://secunia.com/secunia_research/2007-56/advisory/ + - http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-2951 + - https://svn.kvirc.de/kvirc/changeset/630/#file3 (fix to kvi_ircurl.cpp) + + -- Richard A. Johnson Mon, 02 Jul 2007 13:14:30 -0500 + +kvirc (2:3.2.0-5ubuntu1) dapper; urgency=low + + * added dh_iconcache. + + -- Brandon Holtsclaw Sat, 13 May 2006 22:49:53 -0500 + +kvirc (2:3.2.0-5) unstable; urgency=low + + * Rebuild for current dependencies. + * Update FSF address. + * Bump Standards-Version to 3.6.2.0 (no changes). + * Fix invalid characters in manpage. + + -- Robin Verduijn Mon, 21 Nov 2005 22:49:53 -0500 + +kvirc (2:3.2.0-4) unstable; urgency=low + + * Fix compilation with gcc 4 (Closes: #325365). + Thanks, Andrea Briganti! + + -- Robin Verduijn Wed, 31 Aug 2005 13:22:05 -0400 + +kvirc (2:3.2.0-3) experimental; urgency=low + + * Changes to make KVIrc cooperate better with other IRC clients that + also register KDE services (Closes: #303216). + + -- Robin Verduijn Tue, 3 May 2005 20:36:06 -0400 + +kvirc (2:3.2.0-2) experimental; urgency=low + + * Upstream patches to fix avatar resizing (Closes: #305191) + * Upstream patch to fix AwayBack action button (Closes: #305370) + + -- Robin Verduijn Sun, 1 May 2005 18:17:17 -0400 + +kvirc (2:3.2.0-1) experimental; urgency=low + + Getting KVIrc 3 in shape for Debian + + * Fix up autogen.sh to be more robust in incomplete build environments + * Add kvirc-data package which holds architecture-independent files + * Set necessary Lintian overrides because we keep some files in kvirc-data + * Remove unnecessary dependencies from debian/control + * Add dependency on libperl-dev so we get Perl support + * Update package descriptions + * Rearrange file lists between kvirc, kvirc-data, and kvirc-dev + * Add missing themes/ directory to the kvirc-data package + * Don't run autogen.sh from debian/rules + * Remove configure options that are already turned on by default, + and add some that we'd want turned on (--enable-perl, --with-pic) + * Turn off compiler optimizations as they might cause hard to find bugs + on architectures with odd compilers + * Remove some unnecessary code from debian/rules + * Closes: #245726, #255968, #263914, #267876 (RFPs for KVIrc 3) + + -- Robin Verduijn Sun, 27 Feb 2005 02:45:27 -0500 + +kvirc2 (2.1.3-1) experimental; urgency=low + + * Drop kvirc-doc package; move its contents to kvirc-data. + * Rename packages to kvirc2, kvirc2-data and kvirc2-dev. + This opens up the possibility of packaging a new upstream + kvirc package without having to drop the stable KVIrc 2 first. + + -- Robin Verduijn Sun, 20 Feb 2005 16:00:57 -0500 + +kvirc (2:2.1.3.1-2) unstable; urgency=low + + * Change Recommends on xmms to a Suggests. + * Rebuild against KDE 3.3.1 + + -- Robin Verduijn Tue, 14 Dec 2004 15:32:19 -0500 + +kvirc (2:2.1.3.0-2) testing-proposed-updates; urgency=medium + + * Set correct Depends for kvirc and kvirc-data. (Closes #272569) + * Urgency medium because kvirc will not be installable in sarge if this goes + in. + + -- Robin Verduijn Mon, 20 Sep 2004 18:30:15 -0400 + +kvirc (2:2.1.3.0-1) testing-proposed-updates; urgency=low + + * Target a new upload to testing-proposed-updates to try and get + kvirc into Sarge on time for the release. + * Main reasons for t-p-u: + - DFSG files in kvirc_2.1.3.orig.tar.gz warrant a fresh tarball. + - Fixed segfault due to non-threadsafe access to topic editor history. + + -- Robin Verduijn Fri, 27 Aug 2004 09:51:29 -0400 + +kvirc (2:2.1.3.1-1) unstable; urgency=low + + * Patch release 2.1.3.1 + The bumped version number ensures that non-DFSG files will not appear in + the .orig.tar.gz file anymore. + * Replaced .mo file hackery in kvi_locale with full libintl support. + * Refreshed .po files with current source. + * Encoded language files in UTF-8. + * Fixed image loading when only Qt is enabled. + * "What is This?" routine won't timeout if user is still moving the mouse. + * Fixed segfault due to non-threadsafe access to topic editor history. + * Fixed Qt-only compilation. + * Improved logic to find a suitable fixed font. + * Fixed compilation under Cygwin. + * Put generated files in the .orig.tar.gz to help make the diff.gz smaller. + + -- Robin Verduijn Sun, 8 Aug 2004 16:35:46 -0400 + +kvirc (2:2.1.3-11) unstable; urgency=low + + * Fix gcc 3.4 warnings and errors. (Closes: #259033) + * Use better-looking default fonts. + + -- Robin Verduijn Sun, 18 Jul 2004 21:07:00 -0400 + +kvirc (2:2.1.3-10) unstable; urgency=low + + * Update the build number as well. (Still closes: #256522) + + -- Robin Verduijn Thu, 1 Jul 2004 14:39:36 -0400 + +kvirc (2:2.1.3-9) unstable; urgency=low + + * Allow -session commandline parameter. (Closes: #256522) + + -- Robin Verduijn Wed, 30 Jun 2004 20:25:30 -0400 + +kvirc (2:2.1.3-8) unstable; urgency=low + + * Remove unnecessary depends on (build-essential) dpkg-dev package. + * Fix warnings produced by automake1.8 + + -- Robin Verduijn Thu, 20 May 2004 12:15:01 -0400 + +kvirc (2:2.1.3-7) unstable; urgency=low + + * Fix application constructor call for KDE 3.2. (Closes: #242503) + + -- Robin Verduijn Wed, 7 Apr 2004 19:45:36 -0400 + +kvirc (2:2.1.3-6) unstable; urgency=low + + * Fix for FTBFS on all architectures. + + -- Robin Verduijn Mon, 5 Apr 2004 20:24:17 -0400 + +kvirc (2:2.1.3-5) unstable; urgency=low + + * Distribute architecture independent files in kvirc-data. + * Improve package descriptions. + * Remove unnecessary build depends. + * Fix compile warnings with KDE 3.2. + * Do not use -O3 optimization by default. + * Update RELEASE information. + + -- Robin Verduijn Thu, 11 Mar 2004 21:11:50 -0600 + +kvirc (2:2.1.3-4) unstable; urgency=low + + * Fix includes to remedy m68k FTBFS + + -- Robin Verduijn Sat, 28 Feb 2004 17:25:15 -0600 + +kvirc (2:2.1.3-3) unstable; urgency=low + + * Can now recommend xmms instead of xmms-dev due to improvement + in XMMS plugin loader. + * Update config.* from latest autotools-dev. + + -- Robin Verduijn Tue, 17 Feb 2004 14:39:16 -0600 + +kvirc (2:2.1.3-2) unstable; urgency=low + + * No longer distribute any RFCs due to licensing issues. + + -- Robin Verduijn Wed, 28 Jan 2004 21:41:12 -0600 + +kvirc (2:2.1.3-1) unstable; urgency=low + + * The KVIrc 2.1.3 "Renaissance" release. + * New splash screen. + * Add myself to the list of credits. + * debian/copyright: improved copyright text. + + -- Robin Verduijn Wed, 14 Jan 2004 18:21:05 -0600 + +kvirc (2:2.1.2.99pre6-1) unstable; urgency=low + + * New prerelease: + - Changed KVIrc name from 'Monolith' to 'Renaissance' in + anticipation of new release. + - Fix mouse event handling in Message Colors screen. + - General Options dialog and Script Center are now KDE widgets. + - Prevent KDE Help browser from starting when using "What is This?" + in the User Configuration, Server, and Registered Users dialogs. + - Listview field editors now work properly. + - Use KProcess for spawning processes. + - Make user toolbar editor more easy to use. + - Taskbar indicates better which window is active. + - Fix crash when updating application font. + - Fix double-clicking on links in IRC window. + - Script editor now uses QTextEdit. + - Use completion picker when there are multiple matches for completion in + the script editor. + - Use QTextEdit for editor plugin + general usability improvements. + See the RELEASE file for details. + * debian/rules: + - Remove unnecessary --x-includes switch. + + -- Robin Verduijn Mon, 1 Dec 2003 15:09:22 -0600 + +kvirc (2:2.1.2.99pre5-1) unstable; urgency=low + + * New prerelease: + - Add tear-offs to selected menus. + - Use QDns instead of KviAsyncDns. + - Use QThread instead of direct pthreads calls. + - Use KDE icons for toolbars. + - Directory browser now uses KDE mime icons. + - If a hostname lookup returns multiple IP addresses, use all of them when + trying to connect before giving up. + - Fix horrible segfaults in DCC send. + - Generate correct title for misc documentation pages. + See the RELEASE file for details. + * debian/rules: + - Enable debug and optimization options. + - Remove --with-ignore-sigalarm option. + + -- Robin Verduijn Mon, 3 Nov 2003 13:55:29 -0600 + +kvirc (2:2.1.2.99pre4-1) unstable; urgency=low + + * Add numeric sorting for channel list. + * Fix Qt-only compilation. + * Fix compiler warnings on 64-bit architectures. + * Fix alternative nick calculation. + + -- Robin Verduijn Tue, 21 Oct 2003 14:51:09 -0500 + +kvirc (2:2.1.2.99pre3-1) unstable; urgency=low + + * Putting the "K" (back) in KVIrc. + * KDE integration: use KDE classes instead of Qt wherever possible. + * Fix basicplugin example. + * Add AC_PROG_CXXCPP, removing workaround for libtool. + * Newer libtool also fixes the -rpath issue; remove workaround for it. + * Fix missing documentation in kvirc-doc. + + -- Robin Verduijn Mon, 20 Oct 2003 09:10:21 -0500 + +kvirc (2:2.1.2.99pre2-2) unstable; urgency=low + + * Change debian/rules file to use cdbs. + * Overhaul kvirc autoconf macros. + * Enable AM_MAINTAINER_MODE to avoid failed autobuilds. + * Remove build dependencies on libtool, automake, devscripts, kdebase-dev. + * Remove obsolete configure options. + + -- Robin Verduijn Fri, 10 Oct 2003 23:03:18 -0500 + +kvirc (2:2.1.2.99pre2-1) unstable; urgency=low + + * Improvements to the KVIrc autoconf system. + + -- Robin Verduijn Thu, 9 Oct 2003 18:55:15 -0500 + +kvirc (2:2.1.2.99pre1-3) unstable; urgency=low + + * Build-Depend on libxrender-dev (>= 0.8.3-2) to fix autobuild failures. + + -- Robin Verduijn Thu, 9 Oct 2003 00:00:08 -0500 + +kvirc (2:2.1.2.99pre1-2) unstable; urgency=low + + * Remove Build-Dependency for libxrender-dev. (Closes: #214717) + This will still cause the package to fail to build, but until bugs + #214726 and #214793 are fixed there is not much I can do about it, + unfortunately. + + -- Robin Verduijn Wed, 8 Oct 2003 16:59:49 -0500 + +kvirc (2:2.1.2.99pre1-1) unstable; urgency=low + + * Add include headers for socket() and bind() calls to kvi_netutils. + This should fix build failure for HPPA. + * Until I figure out why libtool insist on linking in the non-existant + /usr/X11R6/lib/libXrender.la, add a Build-Depend on the previous version + of the libxrender-dev package. That should fix all the other build + failures. + + -- Robin Verduijn Wed, 8 Oct 2003 02:25:06 -0500 + +kvirc (2:2.1.2.99pre1-0) unstable; urgency=low + + * Prerelease for new upstream KVIrc version 2.1.3: + - Many crashes have been addressed, some of which were due to interaction + between the ancient code in KVIrc 2.1.2 and the new Qt libraries, some of + which were due to a newer gcc version, and some of which were just plain bugs. + - Also has LOTS and lots of spelling fixes and general UI polish. + See the RELEASE file for details. + * Fix libtool breakage. + * Ship example scripts in /usr/share/doc/kvirc-dev/script-examples. + * Build with --with-ignore-sigalarm switch. + * Tighten Build-Depends for libtool and libqt3-mt-dev. + * Add xmms-dev to Recommends since the libkvixmms.so plugin needs it. + * Remove now-obsolete Build-Depends on libqt3-plugins-headers and + libqt3-compat-headers. + + -- Robin Verduijn Tue, 7 Oct 2003 17:47:37 -0500 + +kvirc (2:2.1.2-24) unstable; urgency=low + + * With kdelibs built successfully on all architectures, try to get KVIrc + into testing again. + + -- Robin Verduijn Tue, 9 Sep 2003 21:38:34 -0100 + +kvirc (2:2.1.2-23) unstable; urgency=low + + * Tightened build dependencies, in another attempt to get successfully + built by the autobuilders. + + -- Robin Verduijn Thu, 4 Sep 2003 12:02:12 -0100 + +kvirc (2:2.1.2-22) unstable; urgency=low + + * Tighten build dependencies to make autobuilders happy again. + I *hate* the autobuilders. Why can't they go make themselves happy? + + -- Robin Verduijn Mon, 1 Sep 2003 22:56:06 -0100 + +kvirc (2:2.1.2-21) unstable; urgency=low + + * Run it through the autobuilders again, since a newer Qt messed up + the chroots on most of the build machines. + * Fixed another crash-on-exit problem. + * Add libxcursor-dev to the build dependencies (temporarily, just to + get kvirc through the autobuilders while libqt3c102-mt and libxcursor1 + work it out between them). + + -- Robin Verduijn Mon, 1 Sep 2003 19:25:41 -0100 + +kvirc (2:2.1.2-20) unstable; urgency=low + + * Bump standards-version to 3.6.1.0 (no changes). + * Temporarily disable building the "style" plugin, since it does not + build with the latest Qt. + + -- Robin Verduijn Sun, 31 Aug 2003 22:40:19 -0100 + +kvirc (2:2.1.2-19) unstable; urgency=low + + * Build with more recent automake. (Closes: #204039) + My guess is that since the HPPA autobuilders were unavailable for + so long, the automake environment in unstable has since gotten + out of date. + * Bump standards-version to 3.6.0. + * Fixed miscellaneous autoconf warnings and errors. + * Fix a crash-on-exit problem. + * Updated config.sub, config.guess. + + -- Robin Verduijn Tue, 19 Aug 2003 14:23:11 -0100 + +kvirc (2:2.1.2-18) unstable; urgency=low + + * Remove RFCs from the kvirc-doc package. (Closes: #199806) + + -- Robin Verduijn Sun, 6 Jul 2003 13:20:00 -0100 + +kvirc (2:2.1.2-17) unstable; urgency=low + + * Bump the revision to -17 because the autobuilders claim that + there are older .changes files lying around which have the same + name. + + -- Robin Verduijn Sun, 29 Jun 2003 21:22:27 -0100 + +kvirc (2:2.1.2-9) unstable; urgency=low + + * Upload with proper maintainer name. (Closes: #194482) + + -- Robin Verduijn Sun, 29 Jun 2003 19:27:57 -0100 + +kvirc (2:2.1.2-8) unstable; urgency=low + + * Now that menu does not proscribe the colour map from cmap.xpm anymore, + switch back to a better-looking icon. + * Bump Standards-Version to 3.5.10 (no changes necessary). + * Rebuild with newer automake. (Closes: #194482) + + -- Robin Verduijn Sun, 29 Jun 2003 15:24:17 -0100 + +kvirc (2:2.1.2-7) unstable; urgency=low + + * Fixed character width calculations. (Closes: #184165) + + -- Robin Verduijn Thu, 17 Apr 2003 17:22:25 -0100 + +kvirc (2:2.1.2-6) unstable; urgency=low + + * Let kvirc be a good autobuilder citizen: break up rules in + separate -arch and -indep targets. (Closes: #186617) + + -- Robin Verduijn Thu, 10 Apr 2003 10:26:37 -0100 + +kvirc (2:2.1.2-5) unstable; urgency=low + + * Change CXXFLAGS to fix autobuilds. The march=cpu_type flag had been getting + the wrong cpu_type. + + -- Robin Verduijn Sat, 22 Mar 2003 11:50:08 -0100 + +kvirc (2:2.1.2-4) unstable; urgency=low + + * Rely on the Build-Depends to ensure the correct libqt is installed. + * Bump Standards-Version. + * Various debhelper changes. + * Updated dependencies for latest KDE packages. + * Print config.log if an error occurred during configure target. + * Try to get it through the autobuilders. + + -- Robin Verduijn Thu, 20 Mar 2003 19:19:00 -0100 + +kvirc (2:2.1.2-3) unstable; urgency=low + + * Another attempt at getting it through the autobuilders - disabled pthread + check. + * Better check for libqt-mt. + + -- Robin Verduijn Mon, 3 Mar 2003 15:07:56 -0100 + +kvirc (2:2.1.2-2) unstable; urgency=low + + * Fixed bug where not having kvirc-doc installed would make it impossible + to find the global kvirc directory. (Closes: #180987) + * Fixed check for Qt after the reorganization of the libqt* packages broke + it. + * Add libqt3-compat-headers to the list of build-depends. + + -- Robin Verduijn Wed, 26 Feb 2003 13:03:05 -0100 + +kvirc (2:2.1.2-1) unstable; urgency=low + + * Since it seems the autobuilders cannot find kvirc_2.1.2.1.orig.tar.gz, + try uploading a new .orig.tar.gz. + * Fix sections for kvirc-doc and kvirc-dev. + + -- Robin Verduijn Sat, 8 Feb 2003 11:12:37 -0100 + +kvirc (1:2.1.2.1-1.1) unstable; urgency=low + + * Updated Standards-Version to 3.5.8. + * Remove workaround for g++ problem on SPARC in the hopes that the latest + gcc-3.2 no longer suffers from the problem. + * Use dh_install (simplifies debian/rules nicely). + * Minor changes to auto* scripts to deal with newer Qt. + * Compile against Qt3. (Closes: #173881, #177818) + + -- Robin Verduijn Sat, 8 Feb 2003 00:56:30 -0100 + +kvirc (1:2.1.2.1-1) unstable; urgency=low + + * Due to bug #162712 in liblcms1, kvirc did not build on HPPA. This problem + should be resolved with the newer version of liblcms1. (Closes: #162929) + * I had already noticed the autobuilders did not work. This was due to + configure not existing in the original .orig.tar.gz file. It was created + by patch from the .diff.gz file and as a result, did not have executable + permission. This was fixed in the previous release - which did not make it + into the archives due to the above problem. (Closes: #162447) + + -- Robin Verduijn Mon, 30 Sep 2002 21:24:17 +0000 + +kvirc (1:2.1.2.0-1) unstable; urgency=low + + * Release to make the autobuilders happy again. + * KVIrc now builds and runs with KDE 3.0.3. Not yet fully tested, + but KDE 3 will not be in unstable for a while anyway. + + -- Robin Verduijn Fri, 27 Sep 2002 11:00:15 +0000 + +kvirc (1:2.1.2-16) unstable; urgency=low + + * Rebuilt in a pristine, chroot'ed build environment. (Closes: #157289) + * Provide .orig.tar.gz and .diff.gz files. (Closes: #161595) + + -- Robin Verduijn Wed, 25 Sep 2002 11:13:21 +0000 + +kvirc (1:2.1.2-15) unstable; urgency=low + + * Turn on KDE support for autobuilt KVIrc packages. + + -- Robin Verduijn Fri, 9 Aug 2002 18:30:31 +0000 + +kvirc (1:2.1.2-14) unstable; urgency=low + + * The autobuilders failed on -13 because the .po files had + duplicate messages; turns out I had an older msgfmt which was less + strict about that. Grrr... + (Somehow, I *knew* version -13 would be bad news) + + -- Robin Verduijn Fri, 9 Aug 2002 02:24:03 +0000 + +kvirc (1:2.1.2-13) unstable; urgency=low + + * Added automake1.6 to the build dependencies. (Closes: #155918) + * Fixed build problems on IA64. + * Tightened build dependency on debhelper to >= 4.1.1 since I am + using its -L flag. + + -- Robin Verduijn Thu, 8 Aug 2002 13:31:31 +0000 + +kvirc (1:2.1.2-12) unstable; urgency=low + + * The "121212" release :) + * Upstream usability fixes; see upstream changelog for details. + * Upstream stability fixes: + - Closes: #149254 - crash when executing /part in private chat. + - Closes: #150383 - crash when using /topic in a channel. + - Closes: #139431 - problem was with spaces in username. + * Run dh_shlibdeps properly to avoid generating a self-dependency. + * When -debug is specified in DEB_BUILD_OPTIONS, optimizations + are turned off for better debugging results. + * Added the KVIrc homepage to the description. + * Changed the Suggests on kvirc-doc to a Recommends. + * Suggest xmms. + * I removed some plugins that were not so useful. + + -- Robin Verduijn Wed, 7 Aug 2002 16:32:56 +0000 + +kvirc (1:2.1.2-11) unstable; urgency=low + + * #138169: The problem in bug #138169 is due to a bug in libtool. See + bug #98342 for details. KVIrc still does not build correctly even with + the latest libtool (1.4.2-4). When this gets properly fixed I will update + kvirc's build dependency on libtool. In the mean time, I have applied a + patch from that bug report which fixes it for me. + (Closes: #138169) + * Redid debian/rules somewhat; no longer try to build differently + depending on how KDE is installed. If the preferred configuration breaks + for some platform, I'd rather know about it. + * Do not link versus qt-mt anymore. + + -- Robin Verduijn Tue, 16 Apr 2002 10:21:07 -0400 + +kvirc (1:2.1.2-10) unstable; urgency=low + + * Change default alternative nick to "newbie_". + Set auto-rejoin-on-kick to off by default. + (Closes: #138633) + * Add devscripts to Build-Depends because dch is used by the autoconf + update routine. + + -- Robin Verduijn Mon, 15 Apr 2002 07:54:37 -0400 + +kvirc (1:2.1.2-9) unstable; urgency=low + + * Remove "-pre" from the version as it tends to clutter up users' home + directories. Users should remove any redundant ~/.kvirc-2.1.2-preX + directories themselves if they are not using them anymore. The window + caption is stored inside ~/.kvirc-2.1.2/config/kvi.irc.conf and + can be configured from within KVIrc. (Closes: #133471) + * Fix the autoconf bit to make it compile with the autoconf EXEEXT + bug. Basically this involves making sure that autoconf 2.5x is used + instead of autoconf 2.13. Strange that this did not bite me before. + * Various upstream bug fixes. + + -- Robin Verduijn Wed, 27 Feb 2002 19:23:43 +0000 + +kvirc (1:2.1.2-8) unstable; urgency=low + + * Fix compilation on alpha. (Closes: #121385) + * Upstream bug fixes. See changelog for details. + + -- Robin Verduijn Tue, 27 Nov 2001 12:55:37 -0700 + +kvirc (1:2.1.2-7) unstable; urgency=low + + * Minor spelling changes. (Closes: #118872) + + -- Robin Verduijn Thu, 22 Nov 2001 11:26:39 -0700 + +kvirc (1:2.1.2-6) unstable; urgency=low + + * Compile with the latest binutils in order to benefit from prelinking. + + -- Robin Verduijn Wed, 31 Oct 2001 20:59:17 -0700 + +kvirc (1:2.1.2-5) unstable; urgency=low + + * Support pulling in the latest config.{sub,guess} add compile-time. + * Build-Depends: autotools-dev. + * Build with -fno-exceptions again. + + -- Robin Verduijn Sat, 13 Oct 2001 11:42:08 -0600 + +kvirc (1:2.1.2-4) unstable; urgency=low + + * Use updated config.sub and config.guess so we properly build on all + architectures. (Closes: #115144) + + -- Robin Verduijn Wed, 10 Oct 2001 10:27:01 -0600 + +kvirc (1:2.1.2-3) unstable; urgency=low + + * Removed the build dependency on automake by moving the autogen.sh + outside of the debian/rules and shipping the configure and Makefile.in + files in the source package. In the long term kvirc will have to be able + to use automake 1.5 but in the mean time I will keep the old automake + around on my machine. (Closes: #114714) + * Modified the descriptions a bit to make them more, well... descriptive. + + -- Robin Verduijn Mon, 8 Oct 2001 17:41:36 -0600 + +kvirc (1:2.1.2-2) unstable; urgency=low + + * Small fix in the handling of options to configure. + * Include .xpm files in source package to avoid the segfault in convert. + * Removed the build-dependency on imagemagick. + * Fixed ldconfig handling in postinst and postrm scripts. + * Cleaned up rules files. + + -- Robin Verduijn Fri, 5 Oct 2001 14:26:35 -0600 + +kvirc (1:2.1.2-1) unstable; urgency=low + + * Change the version number to 2.1.2 to match upstream version. + * Hopefully with dependencies installed on arm and powerpc the package + will build for those platforms now... + * Fixed a harmless warning during doc generation. + * Disable objprelink for Debian build since it confuses lintian + (shlib-with-non-pic code). + * Previous upload fixed the segfault bug. (Closes: #111625) + + -- Robin Verduijn Mon, 24 Sep 2001 12:59:10 -0600 + +kvirc (2.1.2-pre8) unstable; urgency=low + + * Fixed the segfault on exit bug. + * Change build dependency on libqt-dev. + + -- Robin Verduijn Tue, 11 Sep 2001 18:26:29 -0600 + +kvirc (2.1.2-pre7) unstable; urgency=low + + * Add ldconfig to postinst script for kvirc. + * Fix -rpath issues. For good this time, I hope. + * Change build dependency on imagemagick (>= 5.2.8) since older + versions of imagemagick would segfault on big-endian systems. + Hopefully this makes the autobuilders happy again. + See #107294 for details. + + -- Robin Verduijn Thu, 6 Sep 2001 15:41:09 -0600 + +kvirc (2.1.2-pre6) unstable; urgency=low + + * Upstream: more bug fixes. + * Upstream: better sound support. + * Upstream: Xft fixes. + * Upstream: documentation updates. + * Upstream: usability enhancements. + * Enable -O3 optimisation for x86 platforms. + * Generate 64x64 icons. + * Sanitized debian/rules. + * Add hints to the menu file. + * Integrate objprelink with libtool to make for faster startup. + * Have KVIrc report the proper version. + * kvirc-doc should be Architecture: all. + * KVIrc is now lintian-clean. + * Font anti-aliasing was turned on in 2.1.2-pre3. (Closes: #108490) + + -- Robin Verduijn Wed, 29 Aug 2001 11:54:52 -0600 + +kvirc (2.1.2-pre5) unstable; urgency=low + + * Yet more upstream enhancements... Triskelios never sleeps, it seems. + * Enabled multithread support. + * Do not patch Makefile; patch acinclude.m4.in instead. + * Add Depends: kvirc to kvirc-dev and kvirc-doc. + * Make the configure target change the literal $PREFIX in the man page + to the prefix we're installing in, i.e. /usr. + * Add a versioned dependancy on libqt2 (>= 2.3) and kdelibs3 (>= 2.2) + since I think only specifying libqt2 was creating problems for + people on older systems. + * Supply rfc2810.txt, rfc2811.txt, rfc2812.txt and rfc2813.txt with + kvirc-doc, since the documentation mentions their existence. + * Supply Plugins-devel-HOWTO with kvirc-dev. + * Supply the example plugin with kvirc-dev, to help people figure out + how to write their own plugins. + * Have a working basicplugin example that compiles properly. + * Allow for compilation of plugins using the kvirc-config script. This + used not to work unless one had the full source package installed. + * KVIrc is compliant with standards version 3.5.6 now. + * It should now be easier for (beginning) developers to sit down and + write plugins for KVIrc :) + + -- Robin Verduijn Mon, 30 Jul 2001 19:55:37 -0600 + +kvirc (2.1.2-pre4) unstable; urgency=low + + * New logo. + * Do not use --with-o3-optimisation. + * Xft fixes. + + -- Robin Verduijn Sun, 29 Jul 2001 02:47:57 -0600 + +kvirc (2.1.2-pre3) unstable; urgency=low + + * More upstream fixes. + * Xft support added. + * New icons. + + -- Robin Verduijn Wed, 18 Jul 2001 09:43:01 -0600 + +kvirc (2.1.2-pre2) unstable; urgency=low + + * Added imagemagick to Build-Depends. (Closes: #102836) + * Lots of upstream fixes and enhancements, such as: + * - Support for more Qt styles. + * - New IRC commands (33). + * - KDE-style icon sets. + * - More dock widget configurability. + * - Cosmetic fixes. + * Bug fixes. + + -- Robin Verduijn Mon, 2 Jul 2001 16:21:34 -0600 + +kvirc (2.1.2-pre1) unstable; urgency=low + + * New upstream version. + + -- Robin Verduijn Thu, 28 Jun 2001 15:23:52 -0600 + +kvirc (2.1.1-4) unstable; urgency=low + + * Added Build-Depends: field. (Closes: #101989) + * Changed KVirc to KVIrc everywhere. + * Capitalize Description: field in control. + + -- Robin Verduijn Sat, 23 Jun 2001 18:28:00 -0600 + +kvirc (2.1.1-3) unstable; urgency=low + + * First Debian upload. + * Use DH_COMPAT=3 + * Removed some unnecessary cruft from the {pre,post}-inst scripts since + debhelper now takes care of that. + * Add error-checking to 'for' loop in debian/rules. + * Updated description for KVIrc. + * Compiled with Standards-Version 3.5.5 + * Use DEB_BUILD_OPTIONS to build a debug-enabled version, if desired. + * Use DEB_BUILD_GNU_CPU to determine C++ compile flags. + * Move static libraries to kvirc-dev. + * Add "set -e" to kvi* scripts. + + -- Robin Verduijn Wed, 20 Jun 2001 00:00:22 -0600 + +kvirc (2.1.1-2) unstable; urgency=low + + * Synchronized with cvs. + * Fix lintian warnings about .../doc/*/INSTALL.gz. + + -- Robin Verduijn Tue, 2 May 2001 11:33:10 -0700 + +kvirc (2.1.1-1) unstable; urgency=low + + * Synchronized with cvs. + + -- Robin Verduijn Tue, 11 Apr 2001 22:36:12 -0700 + +kvirc (2.1.0-1) unstable; urgency=low + + * Synchronized with cvs. + + -- Robin Verduijn Fri, 16 Feb 2001 11:23:34 +0000 + +kvirc (2.1.0) unstable; urgency=low + + * Enabled IPv6 support. + * Removed my icon stuff since the main tree is doing it correctly now. + * Bumped the version number to 2.1.0. Release time! + + -- Robin Verduijn Thu, 1 Feb 2001 14:07:15 +0000 + +kvirc (2.1.0-pre4) unstable; urgency=low + + * Added a #DEBHELPER# line to each of the {pre,post}inst scripts + * Synchronized with CVS. + + -- Robin Verduijn Wed, 31 Jan 2001 10:16:35 +0000 + +kvirc (2.1.0-pre3) unstable; urgency=low + + * Synchronized with CVS. + + -- Robin Verduijn Thu, 25 Jan 2001 19:31:04 +0000 + +kvirc (2.1.0-pre2) unstable; urgency=low + + * Ran lintian and corrected all warnings. + + -- Robin Verduijn Thu, 18 Jan 2001 23:44:00 -0700 + +kvirc (2.1.0-pre1) unstable; urgency=low + + * Install the proper icon files to improve KDE2 icon handling. + * Synchronized with CVS. + * Re-enabled the tkjb plugin. + * Moved some documentation files to the kvirc-doc package. + * Bumped the version number. + + -- Robin Verduijn Thu, 28 Dec 2000 14:21:44 +0000 + +kvirc (2.0-4) unstable; urgency=low + + * Added files to dh_installdocs. + * Synchronized with CVS. + + -- Robin Verduijn Wed, 29 Nov 2000 18:52:07 +0000 + +kvirc (2.0-3) unstable; urgency=low + + * Removed --without-kde-support flag since it caused KDE support to be + enabled. + + -- Robin Verduijn Tue, 22 Nov 2000 23:22:19 +0000 + +kvirc (2.0-2) unstable; urgency=low + + * Synchronized with CVS. + + -- Robin Verduijn Thu, 2 Nov 2000 16:00:22 +0000 + +kvirc (2.0-1) unstable; urgency=low + + * Initial release. + + -- Robin Verduijn Tue, 10 Oct 2000 14:25:47 +0000 + --- kvirc-3.2.0.orig/debian/kvirc-data.postinst +++ kvirc-3.2.0/debian/kvirc-data.postinst @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e + +case "$1" in + configure) + update-alternatives --quiet --install \ + /usr/share/services/irc.protocol irc.protocol \ + /usr/share/kvirc/3.2.0/services/irc.protocol 60 + update-alternatives --quiet --install \ + /usr/share/services/irc6.protocol irc6.protocol \ + /usr/share/kvirc/3.2.0/services/irc6.protocol 60 + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +#DEBHELPER# + +exit 0 --- kvirc-3.2.0.orig/debian/kvirc.postinst +++ kvirc-3.2.0/debian/kvirc.postinst @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +if [ "$1" = "configure" ]; then + ldconfig +fi + +#DEBHELPER# --- kvirc-3.2.0.orig/debian/kvirc-dev.postinst +++ kvirc-3.2.0/debian/kvirc-dev.postinst @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +#DEBHELPER# --- kvirc-3.2.0.orig/debian/kvirc-data.install +++ kvirc-3.2.0/debian/kvirc-data.install @@ -0,0 +1,16 @@ +debian/tmp/usr/bin/kvi_run_netscape.sh +debian/tmp/usr/bin/kvi_search_help.sh +debian/tmp/usr/share/applnk/Internet/kvirc.desktop +debian/tmp/usr/share/icons/hicolor/ +debian/tmp/usr/share/kvirc/*/config/ +debian/tmp/usr/share/kvirc/*/defscript/ +debian/tmp/usr/share/kvirc/*/help/ +debian/tmp/usr/share/kvirc/*/license/ +debian/tmp/usr/share/kvirc/*/locale/ +debian/tmp/usr/share/kvirc/*/modules/caps/ +debian/tmp/usr/share/kvirc/*/msgcolors/ +debian/tmp/usr/share/kvirc/*/pics/ +debian/tmp/usr/share/kvirc/*/services/ +debian/tmp/usr/share/kvirc/*/themes/ +debian/tmp/usr/share/man/man1/kvirc.1 +debian/tmp/usr/share/mimelnk/text/x-kvs.desktop --- kvirc-3.2.0.orig/debian/kvirc.install +++ kvirc-3.2.0/debian/kvirc.install @@ -0,0 +1,4 @@ +debian/overrides/kvirc usr/share/lintian/overrides +debian/tmp/usr/bin/kvirc +debian/tmp/usr/lib/*.so.* +debian/tmp/usr/share/kvirc/*/modules/*.so --- kvirc-3.2.0.orig/debian/compat +++ kvirc-3.2.0/debian/compat @@ -0,0 +1 @@ +4 --- kvirc-3.2.0.orig/debian/patches/05_Kvi_Avatar_Resize.patch +++ kvirc-3.2.0/debian/patches/05_Kvi_Avatar_Resize.patch @@ -0,0 +1,26 @@ +--- kvirc-3.2.0.new/src/kvilib/irc/kvi_avatar.cpp.old 2005-04-19 00:28:17.000000000 +0200 ++++ kvirc-3.2.0.new/src/kvilib/irc/kvi_avatar.cpp 2005-04-19 00:47:21.000000000 +0200 +@@ -138,10 +138,20 @@ + m_uLastScaleHeight = h; + + int scaleW = w; +- int scaleH = h; ++ int scaleH; + +- if(curW > curH)scaleH = (curH * scaleW) / curW; +- else scaleW = (scaleH * curW) / curH; ++ /* We want to maintain the aspect of the image instead simply set ++ height and width. The first step is trying to adapt the image size ++ by "w" vaule */ ++ ++ scaleH = (curH * scaleW) / curW; ++ ++ /* Now check the resized image size. If it is too wide or too tall, ++ resize it again by "h" value */ ++ if(scaleH > h) { ++ scaleH = h; ++ scaleW = (scaleH * curW) / curH; ++ } + + QImage img = m_pPixmap->convertToImage(); + --- kvirc-3.2.0.orig/debian/patches/07_awaybackaction.patch +++ kvirc-3.2.0/debian/patches/07_awaybackaction.patch @@ -0,0 +1,17 @@ +--- kvirc-3.2.0.new/src/kvirc/kernel/kvi_coreactions.cpp.old 2005-04-19 16:20:28.000000000 +0200 ++++ kvirc-3.2.0.new/src/kvirc/kernel/kvi_coreactions.cpp 2005-04-19 16:21:07.000000000 +0200 +@@ -958,12 +958,14 @@ + b->setTextLabel(txt); + } + m_uFlags |= KVI_ACTION_FLAG_ENABLED; ++ setEnabled(true); + } else { + for(QToolButton * b = (QToolButton *)bl->first();b;b = (QToolButton *)bl->next()) + { + if(b->isEnabled())b->setEnabled(false); + } + m_uFlags &= ~KVI_ACTION_FLAG_ENABLED; ++ setEnabled(false); + } + } + --- kvirc-3.2.0.orig/debian/patches/08_gcc4fix.patch +++ kvirc-3.2.0/debian/patches/08_gcc4fix.patch @@ -0,0 +1,32 @@ +--- ./src/kvirc/module/kvi_moduleextension.h.orig 2005-02-27 19:20:29.000000000 +0100 ++++ ./src/kvirc/module/kvi_moduleextension.h 2005-08-27 17:45:18.000000000 +0200 +@@ -95,6 +95,8 @@ + + typedef KviPtrList KviModuleExtensionDescriptorList; + ++class KviModuleExtensionManager; ++ + extern KVIRC_API KviModuleExtensionManager * g_pModuleExtensionManager; + + class KVIRC_API KviModuleExtensionManager +--- ./src/kvirc/kernel/kvi_irccontext.h.orig 2005-08-27 16:49:51.000000000 +0000 ++++ ./src/kvirc/kernel/kvi_irccontext.h 2005-08-27 16:51:03.000000000 +0000 +@@ -29,6 +29,7 @@ + #include + + class KviChannel; ++class KviConsole; + class KviQuery; + class KviQuery; + class KviFrame; +--- src/kvirc/ui/kvi_console.h 2005-08-27 16:26:44.000000000 +0200 ++++ src/kvirc/ui/kvi_console.h.new 2005-08-27 21:12:51.000000000 +0200 +@@ -46,6 +46,8 @@ + class KviIrcServer; + class KviIrcNetwork; + class KviProxy; ++class KviIrcSocketMonitor; ++class KviIrcServerDataBase; + #ifndef COMPILE_ON_WINDOWS + class KviChannel; + class KviQuery; --- kvirc-3.2.0.orig/debian/patches/06_resizeavatar.patch +++ kvirc-3.2.0/debian/patches/06_resizeavatar.patch @@ -0,0 +1,21 @@ +--- kvirc-3.2.0.new/src/kvirc/ui/kvi_userlistview.cpp.old 2005-04-18 05:45:51.000000000 +0200 ++++ kvirc-3.2.0.new/src/kvirc/ui/kvi_userlistview.cpp 2005-04-18 05:46:54.000000000 +0200 +@@ -114,7 +114,17 @@ + if(m_iHeight < 22)m_iHeight = 22; + if(av) + { +- m_iHeight += KVI_OPTION_BOOL(KviOption_boolScaleAvatars) ? (int)KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight) : av->pixmap()->height(); ++ if(KVI_OPTION_BOOL(KviOption_boolScaleAvatars)) ++ { ++ QPixmap * pix = av->scaledPixmap(KVI_OPTION_UINT(KviOption_uintAvatarScaleWidth), KVI_OPTION_UINT(KviOption_uintAvatarScaleHeight)); ++ ++ m_iHeight += pix->height(); ++ } ++ else ++ { ++ m_iHeight += av->pixmap()->height(); ++ } ++ + m_iHeight += 3; + } + } --- kvirc-3.2.0.orig/debian/patches/02_xpmicon.patch +++ kvirc-3.2.0/debian/patches/02_xpmicon.patch @@ -0,0 +1,632 @@ +diff -Nur kvirc/data/icons/32x32/kvirc.xpm kvirc.new/data/icons/32x32/kvirc.xpm +--- kvirc/data/icons/32x32/kvirc.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ kvirc.new/data/icons/32x32/kvirc.xpm 2005-02-09 12:31:44.000000000 +0100 +@@ -0,0 +1,295 @@ ++/* XPM */ ++static char *kvirc3[] = { ++/* columns rows colors chars-per-pixel */ ++"32 32 257 2", ++" c #000000", ++". c #09050A", ++"X c #0C0A0C", ++"o c #070408", ++"O c #0F0810", ++"+ c #130A14", ++"@ c #171218", ++"# c #1F1420", ++"$ c #201E21", ++"% c #2A1A2B", ++"& c #251526", ++"* c #331C35", ++"= c #361E38", ++"- c #242024", ++"; c #2D282D", ++": c #2A242A", ++"> c #2F2930", ++", c #372538", ++"< c #3E2E40", ++"1 c #6D3B08", ++"2 c #4A294C", ++"3 c #47274A", ++"4 c #4E2B50", ++"5 c #4F275E", ++"6 c #483C49", ++"7 c #532E55", ++"8 c #542C5B", ++"9 c #592F57", ++"0 c #56315A", ++"q c #59315B", ++"w c #4F2661", ++"e c #552C62", ++"r c #572B67", ++"t c #5D3361", ++"y c #5E3268", ++"u c #613664", ++"i c #653669", ++"p c #653868", ++"a c #6A3A6D", ++"s c #643F66", ++"d c #623372", ++"f c #6D3C71", ++"g c #6A367A", ++"h c #713E74", ++"j c #753D7C", ++"k c #79440A", ++"l c #69586A", ++"z c #744077", ++"x c #754078", ++"c c #79427C", ++"v c #794F7B", ++"b c #6F626F", ++"n c #7A607B", ++"m c #6E3C83", ++"M c #763681", ++"N c #7C4582", ++"B c #79418A", ++"V c #7D4F84", ++"C c #7E7080", ++"Z c #8D3E00", ++"A c #993F00", ++"S c #8D4000", ++"D c #894808", ++"F c #944400", ++"G c #984100", ++"H c #885615", ++"J c #9E5422", ++"K c #905031", ++"L c #92611C", ++"P c #9C6B21", ++"I c #967533", ++"U c #A54800", ++"Y c #AB4B00", ++"T c #A65409", ++"R c #B24F00", ++"E c #B35400", ++"W c #B95700", ++"Q c #BD5A01", ++"! c #B9610B", ++"~ c #B9621D", ++"^ c #A96A21", ++"/ c #A77825", ++"( c #BA7B37", ++") c #835343", ++"_ c #915B48", ++"` c #975A5A", ++"' c #8A4972", ++"] c #885E66", ++"[ c #94665C", ++"{ c #8F6F67", ++"} c #836266", ++"| c #97656A", ++" . c #AA704E", ++".. c #B37351", ++"X. c #A96358", ++"o. c #A07D6A", ++"O. c #C25A00", ++"+. c #CD5800", ++"@. c #C45700", ++"#. c #CF6100", ++"$. c #D36200", ++"%. c #DF6900", ++"&. c #D5680C", ++"*. c #E56400", ++"=. c #E06A00", ++"-. c #E86700", ++";. c #EA6900", ++":. c #EE7000", ++">. c #F27100", ++",. c #FD7600", ++"<. c #FE7A02", ++"1. c #FF7D0A", ++"2. c #823A8B", ++"3. c #804684", ++"4. c #85448B", ++"5. c #854A8A", ++"6. c #8A4D8E", ++"7. c #8D4D93", ++"8. c #88568F", ++"9. c #924C9B", ++"0. c #945699", ++"q. c #98568C", ++"w. c #975CA1", ++"e. c #9E56A1", ++"r. c #9850AE", ++"t. c #9E58A3", ++"y. c #9551A4", ++"u. c #9650B0", ++"i. c #9B54B3", ++"p. c #866787", ++"a. c #8F6894", ++"s. c #976993", ++"d. c #9861A1", ++"f. c #A057A5", ++"g. c #A159A6", ++"h. c #A55BAA", ++"j. c #AA5EAF", ++"k. c #A25ABB", ++"l. c #AB5EB0", ++"z. c #A658BA", ++"x. c #A967AD", ++"c. c #AE61B3", ++"v. c #AF6BB5", ++"b. c #A872AA", ++"n. c #AD7AB3", ++"m. c #B063B5", ++"M. c #B564BB", ++"N. c #B869BE", ++"B. c #B469B9", ++"V. c #B574B9", ++"C. c #BD6BC2", ++"Z. c #B769C7", ++"A. c #BE74C3", ++"S. c #BD79C1", ++"D. c #BA75C9", ++"F. c #C16FC7", ++"G. c #C06ED4", ++"H. c #C171C6", ++"J. c #C272C9", ++"K. c #C57ACA", ++"L. c #C27AC6", ++"P. c #9F833F", ++"I. c #AE8224", ++"U. c #BA8532", ++"Y. c #BB9657", ++"T. c #B2837C", ++"R. c #BEA262", ++"E. c #D98B32", ++"W. c #DBAD33", ++"Q. c #E1961E", ++"!. c #FF830B", ++"~. c #FF8519", ++"^. c #FF881C", ++"/. c #FF8816", ++"(. c #FF8C24", ++"). c #FF8E28", ++"_. c #FF9120", ++"`. c #FF912F", ++"'. c #FF963A", ++"]. c #FF993D", ++"[. c #FE9833", ++"{. c #F6A908", ++"}. c #F7A927", ++"|. c #FFBA2A", ++" X c #C78441", ++".X c #CA8D53", ++"XX c #CA827B", ++"oX c #CBA157", ++"OX c #D5BD58", ++"+X c #CBB656", ++"@X c #CABF6B", ++"#X c #D4AA6F", ++"$X c #C9A967", ++"%X c #EA9D43", ++"&X c #FF9C44", ++"*X c #E1BF4F", ++"=X c #E7BF5A", ++"-X c #FFA241", ++";X c #FEA556", ++":X c #FFA759", ++">X c #E0B662", ++",X c #EEB374", ++" sXpX< > a.pXS.L.L.K.K.H.M.m.V.p.; 6 b.b.- YXYXYX", ++"YXYXYX X a.d.0.d.d.d.v.K.K.K.K.J.J.F.M.9.M 4.4.M M V @ YXYX", ++"YXYX : s.vXJXGXGXAXAXiXJ.J.J.J.F.C.C.l.iXJXLXLXHXLXfX8.@ YXYX", ++"YXYX X n.T.LXIXIXIXIXnX9.Z.k.k.z.z.z.M KXUXUXPXHXKX} 0.o YXYX", ++"YXYXYX , s.lXDXDXSXSXxX| dX%X}.}.].XX| SXSXnXnXlX,Xj > YXYX", ++"YXYXYX % D...xXbXbXgX.<.,.,.,.) m x h h a a c + ", ++"+ l.j.c.c.m.h.i.Q.Q <.>.>.>.*.3X3X+.:.:.:.>.E >Xg h a a a p x O ", ++"+ j.g.j.h.h.g.u.}./ ;.=.=.=.*.U.I =.=.%.=.=./ eXd a a i i t h O ", ++"+ j.g.h.h.f.f.r.E.4XY $.$.$.$.T k $.#.#.#.U 8X#Xd i i u t q a O ", ++"o , 7 N h.f.f.y.X.6XL @.O.O.O.O.E O.O.O.@.L yX| y u t t q , = o ", ++" o * f.e.0.7.B |.8XG E E E E E E E E A OXtXr t q q t % ", ++"YXYX N 7.6.4.B ` 6XL E E E E E E E E H uX] e q q q q YXYX", ++"YXYXYX 3 6.3.3.c j .W.U E E E E E W Y +Xo.5 0 q q q * YXYX", ++"YXYXYX X N N c x j g [ k F Z Z Z S F 1 } 5 8 q q q q . YXYXYX", ++"YXYXYX @ c c x z z f g d [ oX=X9X$X{ e 0 0 q q q q q + YXYXYX", ++"YXYX o u c x h h a f a i y r e w 8 8 q q q q q q q t 4 YXYX", ++"YXYX X u x h h a a p i t t t q 9 q q q 8 q q q q q q 4 . YXYX", ++"YXYXYX . q h f p u p u q q q q q q q q q q q q q t 2 o YXYX", ++"YXYXYX . q 7 + . * 7 t q q q 0 q q q 7 * . + 4 4 o YXYXYX", ++"YXYXYXYX o & 7 q q q q 2 # o YXYXYXYX", ++"YXYXYXYXYXYX YXYXYX = q q q t * YXYX YXYXYXYXYX", ++"YXYXYXYXYXYXYXYXYXYXYXYX % t t t u & YXYXYXYXYXYXYXYXYXYXYXYX", ++"YXYXYXYXYXYXYXYXYXYXYXYX o o o o YXYXYXYXYXYXYXYXYXYXYXYX" ++}; +diff -Nur kvirc/data/icons/32x32/Makefile.am kvirc.new/data/icons/32x32/Makefile.am +--- kvirc/data/icons/32x32/Makefile.am 2003-02-25 09:46:27.000000000 +0100 ++++ kvirc.new/data/icons/32x32/Makefile.am 2005-02-09 17:13:00.000000000 +0100 +@@ -1,4 +1,5 @@ +-iconapps32data_DATA = kvirc.png ++iconapps32data_DATA = kvirc.png \ ++ kvirc.xpm + + iconmime32data_DATA = kvs.png + +diff -Nur kvirc/data/icons/48x48/kvirc.xpm kvirc.new/data/icons/48x48/kvirc.xpm +--- kvirc/data/icons/48x48/kvirc.xpm 1970-01-01 01:00:00.000000000 +0100 ++++ kvirc.new/data/icons/48x48/kvirc.xpm 2005-02-09 12:32:20.000000000 +0100 +@@ -0,0 +1,311 @@ ++/* XPM */ ++static char *kvirc3[] = { ++/* columns rows colors chars-per-pixel */ ++"48 48 257 2", ++" c #000000", ++". c #09060B", ++"X c #150B17", ++"o c #181019", ++"O c #1E1122", ++"+ c #251528", ++"@ c #2D1932", ++"# c #331C35", ++"$ c #351D38", ++"% c #38273B", ++"& c #2D2931", ++"* c #3E2242", ++"= c #5A2C33", ++"- c #633201", ++"; c #68301A", ++": c #442549", ++"> c #4E2B52", ++", c #423B45", ++"< c #522C55", ++"1 c #542E59", ++"2 c #54345A", ++"3 c #542E62", ++"4 c #562E65", ++"5 c #573062", ++"6 c #5B3162", ++"7 c #5B326B", ++"8 c #5A3467", ++"9 c #5D3271", ++"0 c #613565", ++"q c #62356B", ++"w c #65396D", ++"e c #693A6C", ++"r c #623572", ++"t c #663873", ++"y c #6B3B73", ++"u c #6B3A7B", ++"i c #653679", ++"p c #713E7A", ++"a c #703C76", ++"s c #7A5616", ++"d c #75480C", ++"f c #6E4B21", ++"g c #6D5529", ++"h c #78713E", ++"j c #504D52", ++"k c #454345", ++"l c #704259", ++"z c #654365", ++"x c #67546C", ++"c c #6C5A73", ++"v c #75407B", ++"b c #77447C", ++"n c #6E6072", ++"m c #6C3A82", ++"M c #733D82", ++"N c #773D89", ++"B c #7B4383", ++"V c #7C428B", ++"C c #764087", ++"Z c #7F4592", ++"A c #795680", ++"S c #843D00", ++"D c #863E16", ++"F c #8B4400", ++"G c #954600", ++"H c #955204", ++"J c #845A11", ++"K c #884332", ++"L c #98631E", ++"P c #8D6512", ++"I c #967823", ++"U c #856A22", ++"Y c #A44800", ++"T c #B45100", ++"R c #BA5400", ++"E c #B65D0B", ++"W c #A45407", ++"Q c #A97F1E", ++"! c #BD600C", ++"~ c #A56E13", ++"^ c #A17936", ++"/ c #AA6C24", ++"( c #914B45", ++") c #895965", ++"_ c #8A5878", ++"` c #955C6C", ++"' c #986A54", ++"] c #896A7A", ++"[ c #977262", ++"{ c #BA7353", ++"} c #A67F6A", ++"| c #C35600", ++" . c #C55800", ++".. c #CB5A00", ++"X. c #D25D00", ++"o. c #D46100", ++"O. c #DC6200", ++"+. c #D46E09", ++"@. c #CA792B", ++"#. c #E46500", ++"$. c #E86700", ++"%. c #EA6800", ++"&. c #E36900", ++"*. c #F36C00", ++"=. c #FE7300", ++"-. c #FF7B00", ++";. c #F47403", ++":. c #82468A", ++">. c #83498A", ++",. c #854991", ++"<. c #874895", ++"1. c #915B9D", ++"2. c #8C5098", ++"3. c #9753A5", ++"4. c #9B54B3", ++"5. c #924FA6", ++"6. c #86658D", ++"7. c #8D6A94", ++"8. c #807182", ++"9. c #8C7792", ++"0. c #96799A", ++"q. c #986483", ++"w. c #9963A3", ++"e. c #9C77A4", ++"r. c #A459AC", ++"t. c #A355BB", ++"y. c #A459B3", ++"u. c #A45ABA", ++"i. c #AA5CB4", ++"p. c #A75AB7", ++"a. c #AF63BB", ++"s. c #B162BA", ++"d. c #B26BBC", ++"f. c #AF73A7", ++"g. c #AC5DC2", ++"h. c #B35DC8", ++"j. c #B363C2", ++"k. c #BC69CB", ++"l. c #B765C8", ++"z. c #BC66D1", ++"x. c #BA76C5", ++"c. c #C06CCF", ++"v. c #C26BD5", ++"b. c #C46CD7", ++"n. c #C07BC9", ++"m. c #C473D4", ++"M. c #C97CD4", ++"N. c #CC7ADB", ++"B. c #C773D8", ++"V. c #9C803F", ++"C. c #AA8729", ++"Z. c #A98B32", ++"A. c #8C8240", ++"S. c #BE9D63", ++"D. c #AA8C6F", ++"F. c #BEAE4F", ++"G. c #B7AA59", ++"H. c #B9A56B", ++"J. c #D38837", ++"K. c #C88C37", ++"L. c #EF821D", ++"P. c #FF8102", ++"I. c #FF850C", ++"U. c #FF890B", ++"Y. c #FF8C14", ++"T. c #FF8C1A", ++"R. c #FF901A", ++"E. c #EE8321", ++"W. c #E69426", ++"Q. c #FF8F21", ++"!. c #FF9324", ++"~. c #FF9928", ++"^. c #FF9A33", ++"/. c #FF9F3E", ++"(. c #FFB607", ++"). c #FFBC16", ++"_. c #EFAC2D", ++"`. c #EDB033", ++"'. c #FFA03C", ++"]. c #F6A533", ++"[. c #D6AA2E", ++"{. c #C49140", ++"}. c #C89155", ++"|. c #C69774", ++" X c #D68E72", ++".X c #D3AC5C", ++"XX c #D1BD53", ++"oX c #CCA777", ++"OX c #EB9D47", ++"+X c #EBA250", ++"@X c #FFA542", ++"#X c #FFAB47", ++"$X c #FFAC53", ++"%X c #FFB25C", ++"&X c #FFBB63", ++"*X c #FFBD70", ++"=X c #E4B070", ++"-X c #FFC517", ++";X c #FFC82A", ++":X c #F9C535", ++">X c #FFD227", ++",X c #FFD333", ++".x YXYXYXYXYX", ++"YXYXYXYX 0.D.JXJXHXGXHXHXHXFXHX6.N.x.b.B.b.z.v.v.v.v.h.h.] FXJXJXJXJXJXJXLXHX) 7. YXYXYXYX", ++"YXYXYXYX % lXq.LXUXUXUXUXUXUXUXIXiXj.k.z.z.h.l.h.h.h.h.g.<.fXUXUXUXUXUXUXUXUXMXy d.+ YXYXYXYX", ++"YXYXYXYX 7.x.|.PXUXUXUXUXUXUXIXAXC h.g.t.t.g.t.t.t.t.t.e KXUXUXUXUXIXPXPXKX[ 3.A YXYXYXYX", ++"YXYXYXYXYX . dX` ZXPXIXPXPXPXLXGXnX) 4.f. X$X].].OX Xf.4.' HXPXPXKXGXAXAXZXvX0 w.. YXYXYXYXYX", ++"YXYXYXYXYX z j.}.ZXGXGXGXGXAXbX6X}.K.).`.,X2X,X;X(.(./ =XnXAXmXbXnXbX6X6X' ,.2 YXYXYXYXYX", ++"YXYXYXYXYX w.x.) 6XbXnXbXbXcX*X%X%XZ.NXwXwXwXqX2X2X(.P *X*XcXcXvX7X7X7X%X< 2.,. YXYXYXYXYX", ++"YXYXYXYXYX @ x.B.l.@.&X6X6X7X%X%X/.@X/ NXBXNXNXNXqX0X`.L %X%X&X%X#X].'.]./ C Z 3.O YXYXYXYXYX", ++"YXYXYXYXYX b c.B.B.( ].$X%X@X'.^.!.!.;.H.VXVXCXNXNXqXZ.L././.'.~.~.!.R.~.= Z Z Z 9 YXYXYXYX", ++"YXYXYXYX . d.m.B.B.r.+.~.@X^.~.!.T.Q.!.^ SXSXVXCXBXrXP !.^.^.R.Y.Y.R.R.! i V V V 2. YXYXYXYX", ++"YXYXYXYX 2 c.c.b.b.z.K U.R.R.~.Q.I.L.I.! DXSXSXVXNX8XH Q.~.Y.I.U.U.U.U.= N N C C B > YXYXYX", ++" 3.c.c.b.v.l.,.&.U.Y.Y.Y.I.-.-.P.D.SXSXVXBXV.&.-.-.P.-.P.P.P.o.5 C C C C C B ", ++" % w >.i.k.k.c.v.h.g.g.D -.U.U.-.-.-.-.-.L SXVXBXNXs =.;.-.-.-.-.-.-.; m M M M M p p >.y 6 # ", ++" v d.s.d.k.k.c.z.h.g.4.l $.-.P.P.=.=.=.=.X. ", ++" 0 i.r.s.s.s.i.y.y.4.4.J.,XI X.O.O.O.O.O.O.O.L g O.O.O.O.O.O.&.o.I tXoXi i r r w w w w 6 6 > ", ++" 0 r.r.r.i.i.p.r.t.t.4.{ ;X2XS X.X.X.X.X.X.X.S - ......X.X.X.o.S 3XyXD.r r r w 7 q 8 8 6 0 > ", ++" + : e :.r.i.p.i.4.4.3._ -X9XI ..... . . .| | Y | . .| .....U rXrXb 9 9 7 7 7 6 7 4 > = o ", ++" a i.r.y.4.4.5.Z W.9X1XS | R R R R R T R T R R R R R S 4XyX8X9 7 7 7 6 6 6 < ", ++"YXYXYX # 3.r.r.3.3.2.,.` >X9XU T T T T T T T T T T T T T R s yXyX_ 9 7 4 6 5 4 6 + YXYXYX", ++"YXYXYXYX B 5.3.1.2.Z Z C J.9X4XS T T T T T T T T T T T R F XXyXoX4 4 4 4 5 6 6 5 YXYXYXYX", ++"YXYXYXYXYX : 2.2.,.,.Z Z V v _.3XJ T T T T T T T T T R R R s yX5X7 4 3 3 3 6 1 6 # YXYXYXYX", ++"YXYXYXYXYX . :.<.,.:.V N N M v `.[.F T T R R R R R R R R G .X5X8 3 3 3 3 1 6 6 6 . YXYXYXYXYX", ++"YXYXYXYXYX 1 ,.>.:.B :.M M M v {.J R R R | R R R R R R d H.2 3 3 3 1 3 6 6 6 * YXYXYXYXYX", ++"YXYXYXYXYXYX + >.>.:.N B C p M u i < f Q C.C.C.C.Z.Z.Z.g * 3 3 3 3 3 3 6 6 6 6 O YXYXYXYXYX", ++"YXYXYXYXYX e >.>._ N C p v u u u t r z [ }..X.XS.} z 3 3 3 1 3 3 3 5 6 0 6 0 < YXYXYXYXYX", ++"YXYXYXYX : >.:.:.B B p p p u y r r 9 r 9 7 7 8 4 3 3 3 3 3 3 5 5 6 6 6 0 0 0 e $ YXYXYXYX", ++"YXYXYXYX X p :._ :.b p v p u y t r r w 7 7 4 4 3 3 3 3 3 3 3 3 5 6 6 6 6 0 0 0 0 0 . YXYXYXYX", ++"YXYXYXYX : :.M M b b v y y y w w q 7 4 6 5 3 3 3 5 3 3 3 6 6 6 6 6 6 0 0 0 0 0 $ YXYXYXYX", ++"YXYXYXYXYX % _ p v v y y y w q q 6 7 6 5 5 5 5 5 5 5 6 6 6 6 0 6 0 0 0 0 0 0 $ YXYXYXYXYX", ++"YXYXYXYXYXYX * a p y 1 + : 6 q 6 6 6 6 6 6 6 1 6 6 6 6 6 6 6 1 : + 1 0 0 0 $ YXYXYXYXYX", ++"YXYXYXYXYXYXYX * e $ . @ 1 6 6 6 1 2 6 6 6 6 6 6 6 < @ . % 0 $ YXYXYXYXYXYX", ++"YXYXYXYXYXYXYXYX . O : 6 6 6 0 6 6 6 6 : o . YXYXYXYXYXYXYX", ++"YXYXYXYXYXYXYXYXYX YXYXYXYX 1 6 0 2 0 6 6 < YXYXYXYX YXYXYXYXYXYXYXYXYX", ++"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX : 2 0 6 0 0 2 : YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", ++"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX # 0 0 0 6 0 0 + YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", ++"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX X # # # # # # X YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX", ++"YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX YXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYXYX" ++}; +diff -Nur kvirc/data/icons/48x48/Makefile.am kvirc.new/data/icons/48x48/Makefile.am +--- kvirc/data/icons/48x48/Makefile.am 2003-02-25 09:46:27.000000000 +0100 ++++ kvirc.new/data/icons/48x48/Makefile.am 2005-02-09 17:13:29.000000000 +0100 +@@ -1,4 +1,4 @@ +-iconapps48data_DATA = kvirc.png ++iconapps48data_DATA = kvirc.png kvirc.xpm + + iconmime48data_DATA = kvs.png --- kvirc-3.2.0.orig/debian/patches/04_buildlog.patch.noauto_apply +++ kvirc-3.2.0/debian/patches/04_buildlog.patch.noauto_apply @@ -0,0 +1,36 @@ +--- admin/acinclude.m4.in.orig 2005-02-24 22:58:30.455077480 -0500 ++++ admin/acinclude.m4.in 2005-02-24 22:59:09.864086400 -0500 +@@ -74,33 +74,26 @@ + + AC_DEFUN([AC_SS_HEADER], + [ +- echo -en "\\033\\1331;32m" + echo "################################################################################" + echo "### $1" + echo "################################################################################" +- echo -en "\\033\\1330;39m" + ]) + + AC_DEFUN([AC_SS_SECTION], + [ +- echo -en "\\033\\1331;33m" + echo "### $1" +- echo -en "\\033\\1330;39m" + ]) + + AC_DEFUN([AC_SS_SET_REDINK], + [ +- echo -en "\\033\\1331;31m" + ]) + + AC_DEFUN([AC_SS_SET_GREENINK], + [ +- echo -en "\\033\\1331;32m" + ]) + + AC_DEFUN([AC_SS_SET_NORMALINK], + [ +- echo -en "\\033\\1330;39m" + ]) + + dnl # // ################################################################################################################## --- kvirc-3.2.0.orig/debian/patches/01_rpath.patch.noauto_apply +++ kvirc-3.2.0/debian/patches/01_rpath.patch.noauto_apply @@ -0,0 +1,48 @@ +--- admin/acinclude.m4.in.orig 2005-02-23 17:10:48.111742600 -0500 ++++ admin/acinclude.m4.in 2005-02-23 17:11:56.567335768 -0500 +@@ -1015,7 +1015,7 @@ + ss_save_LIBS="$LIBS" + CPPFLAGS="-I$SS_X_INCDIR -I$SS_QT_INCDIR -I$SS_KDE_INCDIR $CPPFLAGS $X_CFLAGS" + CXXFLAGS="-O2 -Wall $CXXFLAGS" +- LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME -Wl,-rpath $SS_KDE_LIBDIR" ++ LIBS="-L$SS_KDE_LIBDIR -L$SS_X_LIBDIR $SS_X_LDFLAGS $SS_X_LIBLINK -L$SS_QT_LIBDIR $LIBS -lsoundserver_idl -lkdecore -l$SS_QTLIB_NAME" + if test "$SS_LINK_TO_LIBDL" = "yes"; then + LIBS="$LIBS -ldl"; + fi +@@ -1864,7 +1864,7 @@ + if test -n "$SS_X_LIBLINK"; then + LIBS="$LIBS $SS_X_LIBLINK" + fi +- LIBS="-L$SS_KDE_LIBDIR -L$SS_QT_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS -Wl,-rpath $SS_KDE_LIBDIR" ++ LIBS="-L$SS_KDE_LIBDIR -L$SS_QT_LIBDIR -lkdecore -l$SS_QTLIB_NAME $LIBS" + if test "$SS_LINK_TO_LIBDL" = "yes"; then + LIBS="$LIBS -ldl"; + fi +@@ -2016,10 +2016,7 @@ + SS_LDFLAGS="" + fi + +- SS_RPATH="-rpath $SS_QT_LIBDIR -rpath $libdir" +- if test -n "$SS_X_LIBDIR"; then +- SS_RPATH="$SS_RPATH -rpath $SS_X_LIBDIR" +- fi ++ SS_RPATH= + + SS_LIBDIRS="-L$SS_TOPSRCDIR/src/kvilib/build/ -L$SS_QT_LIBDIR" + if test -n "$SS_X_LIBDIR"; then +@@ -2053,7 +2050,6 @@ + + if test "$SS_KDE_REQUESTED" = "yes"; then + SS_INCDIRS="$SS_INCDIRS -I$SS_KDE_INCDIR" +- SS_RPATH="$SS_RPATH -rpath $SS_KDE_LIBDIR" + SS_LIBDIRS="$SS_LIBDIRS -L$SS_KDE_LIBDIR" + SS_LIBLINK="-lkdecore -lkdeui -lkparts $SS_LIBLINK" + AC_DEFINE([COMPILE_KDE_SUPPORT], 1, [define if you want to compile the KDE 2.x support]) +@@ -2067,7 +2063,6 @@ + if test -n "$SS_OTHER_LIBDIRS"; then + SS_LIBDIRS="$SS_LIBDIRS $SS_OTHER_LIBDIRS" + $SS_OTHER_LIBDIRS=`echo "$SS_OTHER_LIBDIRS" | sed -e s/-L//g` +- SS_RPATH="$SS_RPATH -rpath $SS_OTHER_LIBDIRS" + fi + + if test -n "$SS_OTHER_INCDIRS"; then --- kvirc-3.2.0.orig/debian/patches/09_parseIrcUrl_security_fix.patch +++ kvirc-3.2.0/debian/patches/09_parseIrcUrl_security_fix.patch @@ -0,0 +1,12 @@ +diff -Nru kvirc-3.2.0.orig/src/kvirc/uparser/kvi_ircurl.cpp kvirc-3.2.0/src/kvirc/uparser/kvi_ircurl.cpp +--- kvirc-3.2.0.orig/src/kvirc/uparser/kvi_ircurl.cpp 2005-02-28 20:51:33.000000000 -0600 ++++ kvirc-3.2.0/src/kvirc/uparser/kvi_ircurl.cpp 2007-07-02 13:01:58.000000000 -0500 +@@ -30,6 +30,8 @@ + { + // irc[6]://[:][/[?]] + KviStr szUrl = url; ++ szUrl.replaceAll("$", "\\$"); ++ szUrl.replaceAll(";", "\\;"); + bool bIpV6 = false; + bool bSSL = false; + KviStr szServer; --- kvirc-3.2.0.orig/debian/patches/03_eula.patch +++ kvirc-3.2.0/debian/patches/03_eula.patch @@ -0,0 +1,22 @@ +--- ./src/modules/about/aboutdialog.cpp.orig 2005-02-23 23:04:30.601029816 -0500 ++++ ./src/modules/about/aboutdialog.cpp 2005-02-23 23:04:50.553996504 -0500 +@@ -122,7 +122,7 @@ + QString szLicense; + + QString szLicensePath; +- g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); ++ g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA"); + + if(!KviFileUtils::loadFile(szLicensePath,szLicense)) + { +--- ./src/modules/setup/setupwizard.cpp.orig 2005-02-23 23:04:37.434990896 -0500 ++++ ./src/modules/setup/setupwizard.cpp 2005-02-23 23:04:46.255649952 -0500 +@@ -154,7 +154,7 @@ + ed->setWordWrap(QTextEdit::NoWrap); + KviStr szLicense; + KviStr szLicensePath; +- g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"COPYING"); ++ g_pApp->getGlobalKvircDirectory(szLicensePath,KviApp::License,"EULA"); + + if(!kvi_loadFile(szLicensePath.ptr(),szLicense)) + { --- kvirc-3.2.0.orig/debian/copyright +++ kvirc-3.2.0/debian/copyright @@ -0,0 +1,46 @@ +This package was debianized by Andrea Briganti on +Wed, 8 Sep 2004 18:49:44 +0100 + +It was downloaded from www.kvirc.net + +Upstream Author: Szymon Stefanek + +Copyright: + +This is the KVIrc Irc Client license. It is based on the GNU General Public License. +It contains all the GPL terms and conditions and adds a special exception +(see Terms and Conditions , clause 13) to its distribution limitations. + +Note that the GPL below is copyrighted by the Free Software +Foundation, but the instance of code that it refers to is copyrighted by Me. + +The source code for all versions of KVIrc is freely +available at http://www.kvirc.net + +Have fun! +Szymon Stefanek :) + + This package 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; version 2 dated June, 1991. + + This package 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 package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, 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'. + +clause 13) + + 13. As a special exception, Szymon Stefanek gives permission to link this +program with Qt non-commercial edition for Windows, and distribute the resulting executable, +without including the source code for the Qt non-commercial edition in the source +distribution. The Qt non-commercial edition library is covered by the +Qt Non-Commercial license. See http://www.trolltech.com for informations. --- kvirc-3.2.0.orig/debian/kvirc-dev.install +++ kvirc-3.2.0/debian/kvirc-dev.install @@ -0,0 +1,5 @@ +debian/tmp/usr/bin/kvirc-config +debian/tmp/usr/include/kvirc/ +debian/tmp/usr/lib/*.la +debian/tmp/usr/lib/*.so +debian/tmp/usr/share/kvirc/*/modules/*.la --- kvirc-3.2.0.orig/debian/kvirc.postrm +++ kvirc-3.2.0/debian/kvirc.postrm @@ -0,0 +1,7 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then ldconfig; fi + +#DEBHELPER# --- kvirc-3.2.0.orig/Makefile.in +++ kvirc-3.2.0/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.9.5 from Makefile.am. +# Makefile.in generated by automake 1.9.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,