diff -rud --new-file aptitude-0.0.7.19-orig/Makefile.am aptitude-0.0.7.19/Makefile.am
--- aptitude-0.0.7.19-orig/Makefile.am	Sun Mar  4 08:09:15 2001
+++ aptitude-0.0.7.19/Makefile.am	Mon Mar  5 16:07:17 2001
@@ -9,11 +9,11 @@
 pkgdata_DATA=help.txt help-fr.txt help-pl.txt
 
 install-data-local:
-	[ -d $(DESTDIR)/var/state/aptitude ] || mkdir $(DESTDIR)/var/state/aptitude
+	[ -d $(DESTDIR)/var/lib/aptitude ] || mkdir $(DESTDIR)/var/lib/aptitude
 	# FIXME: this really ought to use the autoconf directory variables
 
 uninstall-local:
-	rm -fr $(DESTDIR)/var/state/aptitude
+	rm -fr $(DESTDIR)/var/lib/aptitude
 	# Is -r a good idea here?
 
 dist-hook:
diff -rud --new-file aptitude-0.0.7.19-orig/Makefile.in aptitude-0.0.7.19/Makefile.in
--- aptitude-0.0.7.19-orig/Makefile.in	Sun Mar  4 11:43:40 2001
+++ aptitude-0.0.7.19/Makefile.in	Mon Mar  5 16:08:43 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -44,9 +44,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -105,14 +106,14 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -298,6 +299,11 @@
 	-rm -rf $(distdir)
 	mkdir $(distdir)
 	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -344,7 +350,7 @@
 all-am: Makefile $(DATA) config.h
 all-redirect: all-recursive-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(pkgdatadir)
@@ -398,11 +404,11 @@
 
 
 install-data-local:
-	[ -d $(DESTDIR)/var/state/aptitude ] || mkdir $(DESTDIR)/var/state/aptitude
+	[ -d $(DESTDIR)/var/lib/aptitude ] || mkdir $(DESTDIR)/var/lib/aptitude
 	# FIXME: this really ought to use the autoconf directory variables
 
 uninstall-local:
-	rm -fr $(DESTDIR)/var/state/aptitude
+	rm -fr $(DESTDIR)/var/lib/aptitude
 	# Is -r a good idea here?
 
 dist-hook:
diff -rud --new-file aptitude-0.0.7.19-orig/README aptitude-0.0.7.19/README
--- aptitude-0.0.7.19-orig/README	Sun Mar  4 11:42:40 2001
+++ aptitude-0.0.7.19/README	Mon Mar  5 16:07:17 2001
@@ -615,7 +615,7 @@
 Dir::Aptitude::state
 			 Aptitude now has some persistent state information;
 			this directory holds that information.
-	default: /var/state/aptitude
+	default: /var/lib/aptitude
 
 Aptitude::Allow-ReInstall
 			 If this is set, you will be able to select
diff -rud --new-file aptitude-0.0.7.19-orig/aclocal.m4 aptitude-0.0.7.19/aclocal.m4
--- aptitude-0.0.7.19-orig/aclocal.m4	Sun Mar  4 11:43:04 2001
+++ aptitude-0.0.7.19/aclocal.m4	Mon Mar  5 16:07:17 2001
@@ -1,4 +1,4 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
+dnl aclocal.m4 generated automatically by aclocal 1.4a
 
 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
@@ -37,6 +37,8 @@
 
 AC_DEFUN(AM_INIT_AUTOMAKE,
 [AC_REQUIRE([AC_PROG_INSTALL])
+dnl We require 2.13 because we rely on SHELL being computed by configure.
+AC_PREREQ([2.13])
 PACKAGE=[$1]
 AC_SUBST(PACKAGE)
 VERSION=[$2]
@@ -342,8 +344,8 @@
    AC_REQUIRE([AC_PROG_RANLIB])dnl
    AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
+dnl   AC_REQUIRE([AC_C_CONST])dnl
+dnl   AC_REQUIRE([AC_C_INLINE])dnl
    AC_REQUIRE([AC_TYPE_OFF_T])dnl
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
diff -rud --new-file aptitude-0.0.7.19-orig/config.h.in aptitude-0.0.7.19/config.h.in
--- aptitude-0.0.7.19-orig/config.h.in	Tue Dec 12 20:56:16 2000
+++ aptitude-0.0.7.19/config.h.in	Mon Mar  5 16:07:17 2001
@@ -3,9 +3,6 @@
 /* Define if using alloca.c.  */
 #undef C_ALLOCA
 
-/* Define to empty if the keyword does not work.  */
-#undef const
-
 /* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
    This function is required for alloca.c support on those systems.  */
 #undef CRAY_STACKSEG_END
@@ -19,9 +16,6 @@
 /* Define if you have a working `mmap' system call.  */
 #undef HAVE_MMAP
 
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #undef off_t
 
@@ -154,6 +148,12 @@
 
 /* Define if you have the i library (-li).  */
 #undef HAVE_LIBI
+
+/* Define if you have the popt library (-lpopt).  */
+#undef HAVE_LIBPOPT
+
+/* Define if you have the rpm library (-lrpm).  */
+#undef HAVE_LIBRPM
 
 /* Name of package */
 #undef PACKAGE
diff -rud --new-file aptitude-0.0.7.19-orig/configure aptitude-0.0.7.19/configure
--- aptitude-0.0.7.19-orig/configure	Sun Mar  4 11:43:04 2001
+++ aptitude-0.0.7.19/configure	Mon Mar  5 16:08:47 2001
@@ -697,6 +697,7 @@
 fi
 
 
+
 PACKAGE=aptitude
 
 VERSION=0.0.7.19
@@ -716,7 +717,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:720: checking for working aclocal" >&5
+echo "configure:721: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -729,7 +730,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:733: checking for working autoconf" >&5
+echo "configure:734: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -742,7 +743,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:746: checking for working automake" >&5
+echo "configure:747: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -755,7 +756,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:759: checking for working autoheader" >&5
+echo "configure:760: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -768,7 +769,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:772: checking for working makeinfo" >&5
+echo "configure:773: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -798,7 +799,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:802: checking for $ac_word" >&5
+echo "configure:803: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -830,7 +831,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:834: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:835: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -841,12 +842,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 845 "configure"
+#line 846 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -872,12 +873,12 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:876: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:877: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:881: checking whether we are using GNU C++" >&5
+echo "configure:882: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -886,7 +887,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:891: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -905,7 +906,7 @@
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:909: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:910: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -939,7 +940,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:943: checking for $ac_word" >&5
+echo "configure:944: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -971,7 +972,7 @@
 ac_cv_c_inline=yes
 
 echo $ac_n "checking for initscr in -lcurses""... $ac_c" 1>&6
-echo "configure:975: checking for initscr in -lcurses" >&5
+echo "configure:976: checking for initscr in -lcurses" >&5
 ac_lib_var=`echo curses'_'initscr | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -979,7 +980,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 983 "configure"
+#line 984 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -993,7 +994,7 @@
 initscr()
 ; return 0; }
 EOF
-if { (eval echo configure:997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1020,8 +1021,110 @@
   echo "$ac_t""no" 1>&6
 fi
 
+echo $ac_n "checking for poptGetArg in -lpopt""... $ac_c" 1>&6
+echo "configure:1026: checking for poptGetArg in -lpopt" >&5
+ac_lib_var=`echo popt'_'poptGetArg | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lpopt  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1034 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char poptGetArg();
+
+int main() {
+poptGetArg()
+; return 0; }
+EOF
+if { (eval echo configure:1048: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo popt | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lpopt $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Can't find the popt library -- please install popt-devel" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
+echo "configure:1077: checking for rpmdbOpen in -lrpm" >&5
+ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  ac_save_LIBS="$LIBS"
+LIBS="-lrpm  $LIBS"
+cat > conftest.$ac_ext <<EOF
+#line 1085 "configure"
+#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char rpmdbOpen();
+
+int main() {
+rpmdbOpen()
+; return 0; }
+EOF
+if { (eval echo configure:1099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+LIBS="$ac_save_LIBS"
+
+fi
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo rpm | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+
+  LIBS="-lrpm $LIBS"
+
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Can't find the RPM library -- please install rpm-devel" 1>&2; exit 1; }
+fi
+
 echo $ac_n "checking for main in -lapt-pkg""... $ac_c" 1>&6
-echo "configure:1025: checking for main in -lapt-pkg" >&5
+echo "configure:1128: checking for main in -lapt-pkg" >&5
 ac_lib_var=`echo apt-pkg'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1029,14 +1132,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lapt-pkg  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1033 "configure"
+#line 1136 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1061,11 +1164,12 @@
 
 else
   echo "$ac_t""no" 1>&6
-{ echo "configure: error: Can't find the APT libraries -- please install libapt-pkg-dev" 1>&2; exit 1; }
+{ echo "configure: error: Can't find the APT libraries -- please install libapt-pkg-devel" 1>&2; exit 1; }
 fi
 
+
 echo $ac_n "checking for main in -lpthread""... $ac_c" 1>&6
-echo "configure:1069: checking for main in -lpthread" >&5
+echo "configure:1173: checking for main in -lpthread" >&5
 ac_lib_var=`echo pthread'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1073,14 +1177,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1077 "configure"
+#line 1181 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:1084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1104,7 +1208,7 @@
 
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:1108: checking how to run the C++ preprocessor" >&5
+echo "configure:1212: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1117,12 +1221,12 @@
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 1121 "configure"
+#line 1225 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1147,12 +1251,12 @@
 echo "$ac_t""$CXXCPP" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1151: checking for ANSI C header files" >&5
+echo "configure:1255: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1156 "configure"
+#line 1260 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1160,7 +1264,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1177,7 +1281,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1181 "configure"
+#line 1285 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1195,7 +1299,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1199 "configure"
+#line 1303 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1216,7 +1320,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1220 "configure"
+#line 1324 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -1230,7 +1334,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1257,17 +1361,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1261: checking for $ac_hdr" >&5
+echo "configure:1365: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1266 "configure"
+#line 1370 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1296,17 +1400,17 @@
 
 ac_safe=`echo "apt-pkg/init.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for apt-pkg/init.h""... $ac_c" 1>&6
-echo "configure:1300: checking for apt-pkg/init.h" >&5
+echo "configure:1404: checking for apt-pkg/init.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1305 "configure"
+#line 1409 "configure"
 #include "confdefs.h"
 #include <apt-pkg/init.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1328,19 +1432,53 @@
 { echo "configure: error: Can't find the APT header files -- please install libapt-pkg-dev" 1>&2; exit 1; }
 fi
 
+ac_safe=`echo "rpm/dbindex.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for rpm/dbindex.h""... $ac_c" 1>&6
+echo "configure:1438: checking for rpm/dbindex.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 1443 "configure"
+#include "confdefs.h"
+#include <rpm/dbindex.h>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:1448: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+fi
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+  CXXFLAGS="$CXXFLAGS -I/usr/include/rpm" 
+else
+  echo "$ac_t""no" 1>&6
+{ echo "configure: error: Can't find the RPM header files -- please install librpm-devel" 1>&2; exit 1; }
+fi
+
 ac_safe=`echo "apt-pkg/policy.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for apt-pkg/policy.h""... $ac_c" 1>&6
-echo "configure:1334: checking for apt-pkg/policy.h" >&5
+echo "configure:1472: checking for apt-pkg/policy.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1339 "configure"
+#line 1477 "configure"
 #include "confdefs.h"
 #include <apt-pkg/policy.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1368,17 +1506,17 @@
 then
   ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for pthread.h""... $ac_c" 1>&6
-echo "configure:1372: checking for pthread.h" >&5
+echo "configure:1510: checking for pthread.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1377 "configure"
+#line 1515 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1412,7 +1550,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1416: checking for $ac_word" >&5
+echo "configure:1554: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1442,7 +1580,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1446: checking for $ac_word" >&5
+echo "configure:1584: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1493,7 +1631,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1497: checking for $ac_word" >&5
+echo "configure:1635: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1525,7 +1663,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1529: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1667: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1536,12 +1674,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1540 "configure"
+#line 1678 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1567,12 +1705,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1571: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1709: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1576: checking whether we are using GNU C" >&5
+echo "configure:1714: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1581,7 +1719,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1600,7 +1738,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1604: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1742: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1632,7 +1770,7 @@
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1636: checking for POSIXized ISC" >&5
+echo "configure:1774: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1652,128 +1790,13 @@
   ISC=
 fi
 
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1657: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1662 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:1711: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1732: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 1739 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:1746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1772: checking for off_t" >&5
+echo "configure:1795: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1777 "configure"
+#line 1800 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1801,12 +1824,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1805: checking for size_t" >&5
+echo "configure:1828: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1810 "configure"
+#line 1833 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1836,19 +1859,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:1840: checking for working alloca.h" >&5
+echo "configure:1863: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1845 "configure"
+#line 1868 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1869,12 +1892,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1873: checking for alloca" >&5
+echo "configure:1896: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1878 "configure"
+#line 1901 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1902,7 +1925,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1934,12 +1957,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1938: checking whether alloca needs Cray hooks" >&5
+echo "configure:1961: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1943 "configure"
+#line 1966 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1964,12 +1987,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:1968: checking for $ac_func" >&5
+echo "configure:1991: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1973 "configure"
+#line 1996 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1995,7 +2018,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2022,7 +2045,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2026: checking stack direction for C alloca" >&5
+echo "configure:2049: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2030,7 +2053,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2034 "configure"
+#line 2057 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -2052,7 +2075,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2077,17 +2100,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2081: checking for $ac_hdr" >&5
+echo "configure:2104: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2086 "configure"
+#line 2109 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2091: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2116,12 +2139,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2120: checking for $ac_func" >&5
+echo "configure:2143: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2125 "configure"
+#line 2148 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2147,7 +2170,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2172,7 +2195,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2176: checking for working mmap" >&5
+echo "configure:2199: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2180,7 +2203,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2184 "configure"
+#line 2207 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -2323,7 +2346,7 @@
 }
 
 EOF
-if { (eval echo configure:2327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2345,23 +2368,23 @@
 
 fi
 
-                              
+                        
    for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
 unistd.h sys/param.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2355: checking for $ac_hdr" >&5
+echo "configure:2378: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2360 "configure"
+#line 2383 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2388: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2391,12 +2414,12 @@
 strdup __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2395: checking for $ac_func" >&5
+echo "configure:2418: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2400 "configure"
+#line 2423 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2422,7 +2445,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2451,12 +2474,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2455: checking for $ac_func" >&5
+echo "configure:2478: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2460 "configure"
+#line 2483 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2482,7 +2505,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2516,19 +2539,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2520: checking for LC_MESSAGES" >&5
+echo "configure:2543: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2525 "configure"
+#line 2548 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2549,7 +2572,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2553: checking whether NLS is requested" >&5
+echo "configure:2576: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -2569,7 +2592,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2573: checking whether included gettext is requested" >&5
+echo "configure:2596: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -2588,17 +2611,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2592: checking for libintl.h" >&5
+echo "configure:2615: checking for libintl.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2597 "configure"
+#line 2620 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2615,19 +2638,19 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2619: checking for gettext in libc" >&5
+echo "configure:2642: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2624 "configure"
+#line 2647 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -2643,7 +2666,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2647: checking for bindtextdomain in -lintl" >&5
+echo "configure:2670: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2651,7 +2674,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2655 "configure"
+#line 2678 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2665,7 +2688,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:2669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2681,12 +2704,12 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2685: checking for gettext in libintl" >&5
+echo "configure:2708: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:2690: checking for gettext in -lintl" >&5
+echo "configure:2713: checking for gettext in -lintl" >&5
 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2694,7 +2717,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2698 "configure"
+#line 2721 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
@@ -2708,7 +2731,7 @@
 gettext()
 ; return 0; }
 EOF
-if { (eval echo configure:2712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2747,7 +2770,7 @@
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2751: checking for $ac_word" >&5
+echo "configure:2774: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2781,12 +2804,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2785: checking for $ac_func" >&5
+echo "configure:2808: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2790 "configure"
+#line 2813 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2812,7 +2835,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2839,7 +2862,7 @@
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2843: checking for $ac_word" >&5
+echo "configure:2866: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2875,7 +2898,7 @@
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2879: checking for $ac_word" >&5
+echo "configure:2902: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2907,7 +2930,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 2911 "configure"
+#line 2934 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2915,7 +2938,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -2938,7 +2961,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2942: checking whether catgets can be used" >&5
+echo "configure:2965: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -2951,7 +2974,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2955: checking for main in -li" >&5
+echo "configure:2978: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2959,14 +2982,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2963 "configure"
+#line 2986 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2994,12 +3017,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2998: checking for catgets" >&5
+echo "configure:3021: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3003 "configure"
+#line 3026 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -3025,7 +3048,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -3047,7 +3070,7 @@
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3051: checking for $ac_word" >&5
+echo "configure:3074: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3083,7 +3106,7 @@
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3087: checking for $ac_word" >&5
+echo "configure:3110: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3120,7 +3143,7 @@
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3124: checking for $ac_word" >&5
+echo "configure:3147: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3155,7 +3178,7 @@
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3159: checking for $ac_word" >&5
+echo "configure:3182: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3213,7 +3236,7 @@
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3217: checking for $ac_word" >&5
+echo "configure:3240: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3247,7 +3270,7 @@
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3251: checking for $ac_word" >&5
+echo "configure:3274: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3283,7 +3306,7 @@
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3287: checking for $ac_word" >&5
+echo "configure:3310: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3376,7 +3399,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3380: checking for catalogs to be installed" >&5
+echo "configure:3403: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -3404,17 +3427,17 @@
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3408: checking for linux/version.h" >&5
+echo "configure:3431: checking for linux/version.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3413 "configure"
+#line 3436 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3494,12 +3517,12 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3498: checking for size_t" >&5
+echo "configure:3521: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3503 "configure"
+#line 3526 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3530,12 +3553,12 @@
 for ac_func in strdup
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3534: checking for $ac_func" >&5
+echo "configure:3557: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3539 "configure"
+#line 3562 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3561,7 +3584,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
diff -rud --new-file aptitude-0.0.7.19-orig/configure.in aptitude-0.0.7.19/configure.in
--- aptitude-0.0.7.19-orig/configure.in	Sun Mar  4 11:42:50 2001
+++ aptitude-0.0.7.19/configure.in	Mon Mar  5 16:07:17 2001
@@ -16,7 +16,10 @@
 
 dnl Checks for libraries.
 AC_CHECK_LIB(curses, initscr)
-AC_CHECK_LIB(apt-pkg, main, , AC_MSG_ERROR([Can't find the APT libraries -- please install libapt-pkg-dev]))
+AC_CHECK_LIB(popt, poptGetArg, , AC_MSG_ERROR([Can't find the popt library -- please install popt-devel]))
+AC_CHECK_LIB(rpm, rpmdbOpen, , AC_MSG_ERROR([Can't find the RPM library -- please install rpm-devel]))
+AC_CHECK_LIB(apt-pkg, main, , AC_MSG_ERROR([Can't find the APT libraries -- please install libapt-pkg-devel]))
+
 AC_CHECK_LIB(pthread, main,
 	HAVE_LIBPTHREAD=1
 	, AC_MSG_WARN([Can't find the POSIX thread libraries -- configuring without threads]))
@@ -25,6 +28,7 @@
 AC_HEADER_STDC
 AC_CHECK_HEADERS(fcntl.h sys/ioctl.h unistd.h, , AC_MSG_ERROR([Can't find needed header file.]))
 AC_CHECK_HEADER(apt-pkg/init.h, , AC_MSG_ERROR([Can't find the APT header files -- please install libapt-pkg-dev]))
+AC_CHECK_HEADER(rpm/dbindex.h, CXXFLAGS="$CXXFLAGS -I/usr/include/rpm" , AC_MSG_ERROR([Can't find the RPM header files -- please install librpm-devel]))
 AC_CHECK_HEADER(apt-pkg/policy.h, AC_DEFINE(HAVE_LIBAPT_PKG3))
 if test x$HAVE_LIBPTHREAD = x1
 then
diff -rud --new-file aptitude-0.0.7.19-orig/mkinstalldirs aptitude-0.0.7.19/mkinstalldirs
--- aptitude-0.0.7.19-orig/mkinstalldirs	Sat Mar 11 04:25:38 2000
+++ aptitude-0.0.7.19/mkinstalldirs	Mon Mar  5 16:07:17 2001
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.13 1999/01/05 03:18:55 bje Exp $
+# $Id: mkinstalldirs,v 1.2 2000/10/16 19:57:13 claudio Exp $
 
 errstatus=0
 
diff -rud --new-file aptitude-0.0.7.19-orig/po/es_ES.po aptitude-0.0.7.19/po/es_ES.po
--- aptitude-0.0.7.19-orig/po/es_ES.po	Sun Mar  4 11:43:43 2001
+++ aptitude-0.0.7.19/po/es_ES.po	Mon Mar  5 16:07:17 2001
@@ -464,12 +464,12 @@
 #: src/download.cc:297
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
-"dpkg problems may not be completed.\n"
+"rpm problems may not be completed.\n"
 "\n"
 msgstr ""
 "IMPORTANTE: este log slo muestra pretensin de las acciones; las acciones "
 "fallidas\n"
-"debidas a problemas dpkg no se completarn.\n"
+"debidas a problemas rpm no se completarn.\n"
 "\n"
 
 #: src/download.cc:298
diff -rud --new-file aptitude-0.0.7.19-orig/po/es_ES.po~ aptitude-0.0.7.19/po/es_ES.po~
--- aptitude-0.0.7.19-orig/po/es_ES.po~	Wed Dec 31 19:00:00 1969
+++ aptitude-0.0.7.19/po/es_ES.po~	Sun Mar  4 11:43:43 2001
@@ -0,0 +1,613 @@
+# Copyright (C) 2000 Conectiva S.A. <info@connectiva.com>
+msgid ""
+msgstr ""
+"Project-Id-Version: aptitude\n"
+"POT-Creation-Date: 2001-03-04 11:43-0500\n"
+"PO-Revision-Date: 2000-09-19 16:15+03000\n"
+"Last-Translator: Jorge Carrasquilla Soares <jorge@conectiva.com.br>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Transfer-Encoding: 8 bit\n"
+
+#: src/load_config.cc:23
+#, fuzzy, c-format
+msgid "Invalid entry in color definition group: \"%s\""
+msgstr "Entrada sin etiqueta no vlida en grupo de definicin de colores"
+
+#: src/load_config.cc:25
+#, fuzzy, c-format
+msgid "Invalid tagless entry in color definition group: \"%s\""
+msgstr "Entrada sin etiqueta no vlida en grupo de definicin de colores"
+
+#: src/load_config.cc:27
+#, fuzzy, c-format
+msgid "Need exactly two colors in color definition \"%s\""
+msgstr "Entrada sin etiqueta no vlida en grupo de definicin de colores"
+
+#: src/load_config.cc:32
+#, c-format
+msgid "Can't parse foreground of color \"%s\""
+msgstr "No se pudo ajustar el color de primer plano \"%s\""
+
+#: src/load_config.cc:34
+#, c-format
+msgid "Can't parse background of color \"%s\""
+msgstr "No se pudo ajustar el color de fondo \"%s\""
+
+#: src/load_config.cc:45
+msgid "Internal error: NULL group passed to load_bindings()!"
+msgstr "Error interno: NULL pasado a la funcin load_bindings()!"
+
+#: src/load_config.cc:60 src/load_config.cc:62
+#, c-format
+msgid "Invalid entry in keybinding group: \"%s\""
+msgstr "Entrada no vlida en grupo de teclas de referencia: \"%s\""
+
+#: src/load_config.cc:77
+#, c-format
+msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
+msgstr "Ignorando tecla de referencia \"%s\" -> \"%s\" no vlida"
+
+#: src/apt_tree.cc:44
+msgid "Enter the new package display format: "
+msgstr "Introduzca el formato de visualizacin de paquete nuevo:"
+
+#: src/apt_tree.cc:64
+msgid "Enter the new status display format: "
+msgstr "Introduzca el formato de visualizacin de nuevo status:"
+
+#: src/apt_tree.cc:85
+msgid "Some packages are broken.  Fix them? "
+msgstr "Algunos paquetes estn errneos. Los arreglo?"
+
+#: src/apt_tree.cc:122
+msgid "Really quit (and discard changes) ? "
+msgstr "Realmente quiere salir (y descartar los cambios)?"
+
+#: src/apt_tree.cc:123
+msgid "Really quit (and save changes) ? "
+msgstr "Realmente quiere salir (y salvar los cambios)?"
+
+#: src/apt_tree.cc:124
+msgid "Really quit?"
+msgstr "Realmente quiere salir?"
+
+#: src/apt_tree.cc:305
+msgid "/help.txt"
+msgstr "/help.txt"
+
+#: src/apt_tree.cc:306
+msgid "Aptitude online help"
+msgstr "Ayuda online de Aptitude"
+
+#: src/apt_tree.cc:333
+msgid "DL Size: "
+msgstr "Tamao de DL:"
+
+#: src/apt_tree.cc:341
+#, c-format
+msgid "Will use %sB of disk space"
+msgstr "Usar %sB de espacio del disco"
+
+#: src/apt_tree.cc:349
+#, c-format
+msgid "Will free %sB of disk space"
+msgstr "Liberar %sB de espacio de disco"
+
+#: src/pkg_item.cc:208
+msgid "ChangeLog of "
+msgstr "ChangeLog de "
+
+#: src/pkg_columnizer.cc:58
+msgid "Package"
+msgstr "Paquete"
+
+#: src/pkg_columnizer.cc:58
+msgid "InstSz"
+msgstr "InstSz"
+
+#: src/pkg_columnizer.cc:58
+msgid "DebSz"
+msgstr "DebSz"
+
+#: src/pkg_columnizer.cc:58
+msgid "State"
+msgstr "Estado"
+
+#: src/pkg_columnizer.cc:58
+msgid "Action"
+msgstr "Accin"
+
+#: src/pkg_columnizer.cc:58 src/pkg_description_treeitem.h:90
+#: src/pkg_info_screen.cc:69
+msgid "Description"
+msgstr "Descripcin"
+
+#: src/pkg_columnizer.cc:58
+msgid "InstVer"
+msgstr "InstVer"
+
+#: src/pkg_columnizer.cc:58
+msgid "CandVer"
+msgstr "CandVer"
+
+#: src/pkg_columnizer.cc:58
+msgid "LongState"
+msgstr "LongState"
+
+#: src/pkg_columnizer.cc:58
+msgid "LongAction"
+msgstr "LongAction"
+
+#: src/pkg_columnizer.cc:58
+msgid "Maintainer"
+msgstr "Mantenedor"
+
+#: src/pkg_columnizer.cc:58
+msgid "Priority"
+msgstr "Prioridad"
+
+#: src/pkg_columnizer.cc:58
+msgid "Section"
+msgstr "Seccin"
+
+#: src/pkg_columnizer.cc:58
+msgid "RC"
+msgstr "RC"
+
+#: src/pkg_columnizer.cc:72 src/pkg_columnizer.cc:82 src/pkg_ver_item.cc:75
+#: src/pkg_ver_item.cc:80
+msgid "<N/A>"
+msgstr "<N/A>"
+
+#: src/pkg_columnizer.cc:91 src/pkg_columnizer.cc:99
+msgid "<none>"
+msgstr "<none>"
+
+#: src/pkg_columnizer.cc:129 src/pkg_grouppolicy.cc:97
+msgid "virtual"
+msgstr "virtual"
+
+#: src/pkg_columnizer.cc:136 src/pkg_columnizer.cc:180 src/pkg_ver_item.cc:115
+#: src/pkg_ver_item.cc:122
+msgid "purge"
+msgstr "purgar"
+
+#: src/pkg_columnizer.cc:141 src/pkg_ver_item.cc:127
+msgid "unpacked"
+msgstr "desempaquetado"
+
+#: src/pkg_columnizer.cc:143 src/pkg_ver_item.cc:129
+msgid "half-config"
+msgstr "half-config"
+
+#: src/pkg_columnizer.cc:145 src/pkg_ver_item.cc:131
+msgid "half-install"
+msgstr "half-install"
+
+#: src/pkg_columnizer.cc:147 src/pkg_ver_item.cc:133
+msgid "config-files"
+msgstr "config-files"
+
+#: src/pkg_columnizer.cc:149 src/pkg_ver_item.cc:135
+msgid "installed"
+msgstr "instalado"
+
+#: src/pkg_columnizer.cc:151 src/pkg_columnizer.cc:251 src/pkg_ver_item.cc:137
+#: src/pkg_ver_item.cc:254
+msgid "ERROR"
+msgstr "ERROR"
+
+#: src/pkg_columnizer.cc:178 src/pkg_ver_item.cc:176
+msgid "hold"
+msgstr "retener"
+
+#: src/pkg_columnizer.cc:180 src/pkg_ver_item.cc:198
+msgid "delete"
+msgstr "eliminar"
+
+#: src/pkg_columnizer.cc:182 src/pkg_ver_item.cc:117 src/pkg_ver_item.cc:180
+msgid "broken"
+msgstr "errneo"
+
+#: src/pkg_columnizer.cc:184 src/pkg_ver_item.cc:184 src/pkg_ver_item.cc:191
+#: src/pkg_ver_item.cc:200
+msgid "install"
+msgstr "instalar"
+
+#: src/pkg_columnizer.cc:186
+msgid "reinstall"
+msgstr "reinstalar"
+
+#: src/pkg_columnizer.cc:188
+msgid "upgrade"
+msgstr "actualizar"
+
+#: src/pkg_columnizer.cc:190 src/pkg_columnizer.cc:192 src/pkg_ver_item.cc:186
+#: src/pkg_ver_item.cc:193 src/pkg_ver_item.cc:203
+msgid "none"
+msgstr "ninguno"
+
+#: src/pkg_columnizer.cc:210 src/pkg_columnizer.cc:215
+#: src/pkg_grouppolicy.cc:91 src/pkg_info_screen.cc:71 src/pkg_ver_item.cc:213
+#: src/pkg_ver_item.cc:218
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: src/pkg_columnizer.cc:321 src/pkg_columnizer.cc:344
+msgid "Internal error: Default column string is unparsable"
+msgstr "Error interno: la columna por defecto es ininteligible"
+
+#: src/pkg_tree.cc:79
+msgid "All Packages"
+msgstr "Todos los paquetes"
+
+#: src/pkg_action_tree.cc:46
+msgid "Actions to be taken"
+msgstr "Acciones a emprender"
+
+#: src/pkg_grouppolicy.cc:85
+msgid "Tasks/Tasks"
+msgstr ""
+
+#: src/pkg_grouppolicy.cc:85
+msgid "Tasks"
+msgstr ""
+
+#: src/pkg_grouppolicy.cc:91
+msgid "Unknown/Unknown"
+msgstr "Desconocido/Desconocido"
+
+#: src/pkg_grouppolicy.cc:97
+msgid "virtual/virtual"
+msgstr "virtual/virtual"
+
+#: src/pkg_grouppolicy.cc:108
+msgid "main"
+msgstr "principal"
+
+#: src/pkg_grouppolicy.cc:173
+msgid "New Packages"
+msgstr "Nuevos Paquetes"
+
+#: src/pkg_grouppolicy.cc:174
+msgid "Upgradable Packages"
+msgstr "Paquetes susceptibles de actualizacin"
+
+#: src/pkg_grouppolicy.cc:175
+msgid "Installed Packages"
+msgstr "Paquetes instalados"
+
+#: src/pkg_grouppolicy.cc:176
+msgid "Not Installed Packages"
+msgstr "Paquetes no instalados"
+
+#: src/pkg_grouppolicy.cc:177
+msgid "Virtual Packages"
+msgstr "Paquetes virtuales"
+
+#: src/pkg_grouppolicy.cc:178
+msgid "Obsolete and Locally Created Packages"
+msgstr "Paquetes obsoletos o creados localmente"
+
+#: src/pkg_grouppolicy.cc:312
+msgid "Packages to be removed"
+msgstr "Paquetes a eliminar"
+
+#: src/pkg_grouppolicy.cc:313
+msgid "Packages to be upgraded"
+msgstr "Paquetes a actualizar"
+
+#: src/pkg_grouppolicy.cc:314
+msgid "Packages to be installed"
+msgstr "Paquetes a instalar"
+
+#: src/pkg_grouppolicy.cc:315
+msgid "Packages to be reinstalled"
+msgstr "Paquetes a reinstalar"
+
+#: src/pkg_grouppolicy.cc:316
+msgid "Packages being held back"
+msgstr "Paquetes a retener"
+
+#: src/pkg_grouppolicy.cc:317
+msgid "Packages being held in their current state due to broken dependencies"
+msgstr "Paquetes retenidos en su estado actual debido a error de dependencias"
+
+#: src/pkg_grouppolicy.cc:318
+msgid "Packages being deleted due to broken dependencies"
+msgstr "Paquetes eliminados debido a error de dependencias"
+
+#: src/pkg_grouppolicy.cc:319
+msgid "Packages being installed to satisfy dependencies"
+msgstr "Paquetes instalados para atender las dependencias"
+
+#: src/pkg_ver_item.cc:420
+msgid "Available versions of "
+msgstr "Versiones disponibles de "
+
+#: src/dep_item.cc:187 src/pkg_info_screen.cc:81
+#, c-format
+msgid "Packages which depend on %s"
+msgstr "Paquetes que dependen de %s"
+
+#: src/dep_item.cc:187
+#, c-format
+msgid "Dependencies of %s"
+msgstr "Dependencias de %s"
+
+#: src/pkg_description_treeitem.cc:66 src/pkg_description_treeitem.cc:74
+msgid "Description of "
+msgstr "Descripcin de "
+
+#: src/pkg_info_screen.cc:70
+msgid "Priority: "
+msgstr "Prioridad: "
+
+#: src/pkg_info_screen.cc:71
+msgid "Section: "
+msgstr "Seccin: "
+
+#: src/pkg_info_screen.cc:72
+#, fuzzy
+msgid "Maintainer: "
+msgstr "Mantenedor"
+
+#: src/pkg_info_screen.cc:73
+msgid "Compressed size: "
+msgstr "Tamao comprimido: "
+
+#: src/pkg_info_screen.cc:74
+msgid "Uncompressed size: "
+msgstr "Tamao sin comprimir: "
+
+#: src/pkg_info_screen.cc:76
+msgid "Source Package: "
+msgstr "Paquete origen: "
+
+#: src/pkg_info_screen.cc:86
+msgid "Versions"
+msgstr "Versiones"
+
+#: src/pkg_info_screen.cc:96
+#, c-format
+msgid "Information about %s"
+msgstr "Informacin sobre %s"
+
+#: src/download_bar.cc:46
+msgid "Please insert the disc labeled \""
+msgstr "Por favor, introduzca el disco etiquetado \""
+
+#: src/download_bar.cc:46
+msgid "\" into the drive \""
+msgstr "\" en la unidad \""
+
+#: src/download_bar.cc:62
+msgid "Hit "
+msgstr "Presionar "
+
+#: src/download_bar.cc:74
+msgid "Downloading "
+msgstr "Descargando "
+
+#: src/download_bar.cc:86
+msgid "Got "
+msgstr "Listo "
+
+#: src/download_bar.cc:138
+msgid "Downloading..."
+msgstr "Descargando..."
+
+#: src/download_item.cc:64 src/download_item.cc:68 src/download_item.cc:98
+msgid " [Working]"
+msgstr " [Trabajando]"
+
+#: src/download_item.cc:102
+msgid "[Hit]"
+msgstr "[Presionar]"
+
+#: src/download_item.cc:102
+msgid "[Downloaded]"
+msgstr "[Descargado]"
+
+#: src/download_screen.cc:155
+#, c-format
+msgid "Downloaded %sB in %ss (%sB/s). Press any key to continue..."
+msgstr "Descargados %sB en %ss (%sB/s). Presione una tecla para continuar..."
+
+#: src/download_screen.cc:174
+msgid "Total Progress: "
+msgstr "Progreso total: "
+
+#: src/download_screen.cc:189
+msgid " [ %i%% ] (%sB/s, %s remaining)"
+msgstr " [ %i%% ] (%sB/s, faltan %s)"
+
+#: src/download.cc:48
+msgid "Couldn't read list of package sources"
+msgstr "No se pudo leer la lista de paquetes fuente"
+
+#: src/download.cc:59 src/download.cc:179
+msgid "Couldn't lock list directory..are you root?"
+msgstr "No se pudo bloquear el directorio de la lista...es ud. root?"
+
+#: src/download.cc:73
+msgid "Updating package lists"
+msgstr "Actualizando lista de paquetes"
+
+#: src/download.cc:149
+msgid "Couldn't clean out list directories"
+msgstr "No se pudo borrar los directorios de lista"
+
+#: src/download.cc:193
+msgid "Downloading and installing packages"
+msgstr "Descargando e instalando paquetes"
+
+#: src/download.cc:202
+msgid "Couldn't read source list"
+msgstr "No se pudo leer la lista de fuentes"
+
+#: src/download.cc:219
+msgid "Internal error: couldn't generate list of packages to download"
+msgstr "Error interno: no se pudo generar la lista de paquetes a descargar"
+
+#: src/download.cc:262
+msgid "Unrecoverable missing packages.  Press any key to continue..."
+msgstr "Paquetes irrecuperables. Presione una tecla para continuar..."
+
+#: src/download.cc:291
+#, c-format
+msgid "Unable to open %s to log actions"
+msgstr "Imposible abrir %s para realizar log"
+
+#: src/download.cc:297
+msgid ""
+"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
+"dpkg problems may not be completed.\n"
+"\n"
+msgstr ""
+"IMPORTANTE: este log slo muestra pretensin de las acciones; las acciones "
+"fallidas\n"
+"debidas a problemas dpkg no se completarn.\n"
+"\n"
+
+#: src/download.cc:298
+#, c-format
+msgid "Will install %li packages, and remove %li packages.\n"
+msgstr "Se instalarn %li paquetes y se eliminarn %li.\n"
+
+#: src/download.cc:300
+#, c-format
+msgid "%li bytes of disk space will be used\n"
+msgstr "Se usarn %li bytes de espacio en disco\n"
+
+#: src/download.cc:302
+#, c-format
+msgid "%li bytes of disk space will be freed\n"
+msgstr "Se liberarn %li bytes de espacio en disco\n"
+
+#: src/download.cc:309
+#, c-format
+msgid "[UPGRADE] %s %s -> %s\n"
+msgstr ""
+
+#: src/download.cc:319
+msgid "REMOVE"
+msgstr "ELIMINAR"
+
+#: src/download.cc:325
+msgid "INSTALL"
+msgstr "INSTALAR"
+
+#: src/download.cc:328
+msgid "REINSTALL"
+msgstr "REINSTALAR"
+
+#: src/download.cc:331
+msgid "HOLD"
+msgstr "RETENER"
+
+#: src/download.cc:334
+msgid "HOLD, DEPENDENCIES"
+msgstr "RETENER, DEPENDENCIAS"
+
+#: src/download.cc:337
+msgid "REMOVE, DEPENDENCIES"
+msgstr "ELIMINAR, DEPENDENCIAS"
+
+#: src/download.cc:340
+msgid "INSTALL, DEPENDENCIES"
+msgstr "INSTALAR, DEPENDENCIAS"
+
+#: src/download.cc:343
+msgid "????????"
+msgstr "????????"
+
+#: src/download.cc:347
+#, c-format
+msgid "[%s] %s\n"
+msgstr "[%s] %s\n"
+
+#: src/download.cc:350
+msgid ""
+"============================================================================="
+"==\n"
+"\n"
+"Log complete.\n"
+msgstr ""
+"============================================================================="
+"==\n"
+"\n"
+"Log completado.\n"
+
+#: src/download.cc:371
+msgid ""
+"Ack!  Something bad happened while installing packages.  Trying to recover:"
+msgstr ""
+"Argghh! Algo malo pas mientras se instalaban los paquetes. Intentado "
+"recuperar:"
+
+#: src/download.cc:377
+msgid "Press return to continue.\n"
+msgstr "Presione ENTER para continuar.\n"
+
+#: src/generic/aptcache.cc:178
+msgid "Can't open Aptitude extended state file"
+msgstr "No se pudo abrir el archivo de estado extendido de Aptitude"
+
+#: src/generic/aptcache.cc:184 src/generic/aptcache.cc:218
+#: src/generic/aptcache.cc:220
+msgid "Reading extended state information"
+msgstr "Leyendo la informacin sobre estado extendido"
+
+#: src/generic/aptcache.cc:273
+msgid "Cannot open Aptitude state file"
+msgstr "No se puede abrir el archivo de estado de Aptitude"
+
+#: src/generic/aptcache.cc:277 src/generic/aptcache.cc:309
+msgid "Writing extended state information"
+msgstr "Escribiendo informacin sobre estado extendido"
+
+#: src/generic/aptcache.cc:295
+#, c-format
+msgid "Internal buffer overflow on package \"%s\" while writing state file"
+msgstr ""
+"Desbordamiento de bfer interno en el paquete \"%s\" al escribir el archivo "
+"de estado"
+
+#: src/generic/aptcache.cc:302
+msgid "Couldn't write state file"
+msgstr "No se pudo escribir el archivo de estado"
+
+#: src/generic/aptcache.cc:315
+msgid "Error writing state file"
+msgstr "Error al escribir el archivo de estado"
+
+#: src/generic/aptcache.cc:325
+msgid "couldn't replace old state file"
+msgstr "No se pudo reemplazar el archivo de estado anterior"
+
+#: src/generic/aptcache.cc:509
+msgid "Unable to correct dependencies, some packages cannot be installed"
+msgstr ""
+"Imposible corregir dependencias, algunos de los paquetes no se pueden "
+"instalar"
+
+#: src/generic/aptcache.cc:658 src/generic/aptcache.cc:707
+msgid "The list of sources could not be read."
+msgstr "La lista de fuentes no se pudo leer."
+
+#: src/generic/aptcache.cc:664 src/generic/aptcache.cc:714
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"No se pudo abrir o interpretar las listas de paquetes o el archivo de estado."
+
+#: src/generic/aptcache.cc:666 src/generic/aptcache.cc:718
+msgid "You may want to update the package lists to correct these missing files"
+msgstr ""
+"Puede que quiera actualizar las listas de paquetes para corregir los "
+"archivos que faltan"
+
+#~ msgid "UPGRADE"
+#~ msgstr "ACTUALIZAR"
diff -rud --new-file aptitude-0.0.7.19-orig/po/pt_BR.po aptitude-0.0.7.19/po/pt_BR.po
--- aptitude-0.0.7.19-orig/po/pt_BR.po	Sun Mar  4 11:43:44 2001
+++ aptitude-0.0.7.19/po/pt_BR.po	Mon Mar  5 16:07:17 2001
@@ -465,11 +465,11 @@
 #: src/download.cc:297
 msgid ""
 "IMPORTANT: this log only lists intended actions; actions which fail due to\n"
-"dpkg problems may not be completed.\n"
+"rpm problems may not be completed.\n"
 "\n"
 msgstr ""
 "IMPORTANTE: este registro lista somente as aes pretendidas; aes que\n"
-"falharem devido a problemas de dpkg podero no ser completadas.\n"
+"falharem devido a problemas de rpm podero no ser completadas.\n"
 "\n"
 
 #: src/download.cc:298
diff -rud --new-file aptitude-0.0.7.19-orig/po/pt_BR.po~ aptitude-0.0.7.19/po/pt_BR.po~
--- aptitude-0.0.7.19-orig/po/pt_BR.po~	Wed Dec 31 19:00:00 1969
+++ aptitude-0.0.7.19/po/pt_BR.po~	Sun Mar  4 11:43:44 2001
@@ -0,0 +1,611 @@
+# Copyright (C) 2000 Conectiva S.A.
+msgid ""
+msgstr ""
+"Project-Id-Version: aptitude\n"
+"POT-Creation-Date: 2001-03-04 11:43-0500\n"
+"PO-Revision-Date: 2000-10-19 15:00-0200\n"
+"Last-Translator: Douglas Moura Ferreira <douglas@conectiva.com.br>\n"
+"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-1\n"
+"Content-Transfer-Encoding: 8 bit\n"
+
+#: src/load_config.cc:23
+#, fuzzy, c-format
+msgid "Invalid entry in color definition group: \"%s\""
+msgstr "Entrada invlida sem marcao no grupo de definio de cores"
+
+#: src/load_config.cc:25
+#, fuzzy, c-format
+msgid "Invalid tagless entry in color definition group: \"%s\""
+msgstr "Entrada invlida sem marcao no grupo de definio de cores"
+
+#: src/load_config.cc:27
+#, fuzzy, c-format
+msgid "Need exactly two colors in color definition \"%s\""
+msgstr "Entrada invlida sem marcao no grupo de definio de cores"
+
+#: src/load_config.cc:32
+#, c-format
+msgid "Can't parse foreground of color \"%s\""
+msgstr "Impossvel ajustar primeiro plano da cor \"%s\""
+
+#: src/load_config.cc:34
+#, c-format
+msgid "Can't parse background of color \"%s\""
+msgstr "Impossvel ajustar plano de fundo da cor \"%s\""
+
+#: src/load_config.cc:45
+msgid "Internal error: NULL group passed to load_bindings()!"
+msgstr "Erro interno: grupo NULL passado para load_bindings()!"
+
+#: src/load_config.cc:60 src/load_config.cc:62
+#, c-format
+msgid "Invalid entry in keybinding group: \"%s\""
+msgstr "Entrada invlida no grupo de teclas de referncia: \"%s\""
+
+#: src/load_config.cc:77
+#, c-format
+msgid "Ignoring invalid keybinding \"%s\" -> \"%s\""
+msgstr "Ignorando teclas de referncia invlidas \"%s\" -> \"%s\""
+
+#: src/apt_tree.cc:44
+msgid "Enter the new package display format: "
+msgstr "Informe o novo formato de visualizao de pacotes:"
+
+#: src/apt_tree.cc:64
+msgid "Enter the new status display format: "
+msgstr "Informe o novo formato de visualizao de status:"
+
+#: src/apt_tree.cc:85
+msgid "Some packages are broken.  Fix them? "
+msgstr "Alguns pacotes esto corrompidos. Consertar? "
+
+#: src/apt_tree.cc:122
+msgid "Really quit (and discard changes) ? "
+msgstr "Deseja mesmo sair (e ignorar as modificaes) ? "
+
+#: src/apt_tree.cc:123
+msgid "Really quit (and save changes) ? "
+msgstr "Deseja mesmo sair (e salvar as modificaes) ? "
+
+#: src/apt_tree.cc:124
+msgid "Really quit?"
+msgstr "Deseja mesmo sair?"
+
+#: src/apt_tree.cc:305
+msgid "/help.txt"
+msgstr "/help.txt"
+
+#: src/apt_tree.cc:306
+msgid "Aptitude online help"
+msgstr "Ajuda online do Aptitude"
+
+#: src/apt_tree.cc:333
+msgid "DL Size: "
+msgstr "Tamanho DL: "
+
+#: src/apt_tree.cc:341
+#, c-format
+msgid "Will use %sB of disk space"
+msgstr "Ocupa %sB de espao em disco"
+
+#: src/apt_tree.cc:349
+#, c-format
+msgid "Will free %sB of disk space"
+msgstr "Libera %sB de espaco em disco"
+
+#: src/pkg_item.cc:208
+msgid "ChangeLog of "
+msgstr "ChangeLog de "
+
+#: src/pkg_columnizer.cc:58
+msgid "Package"
+msgstr "Pacote"
+
+#: src/pkg_columnizer.cc:58
+msgid "InstSz"
+msgstr "InstSz"
+
+#: src/pkg_columnizer.cc:58
+msgid "DebSz"
+msgstr "DebSz"
+
+#: src/pkg_columnizer.cc:58
+msgid "State"
+msgstr "Estado"
+
+#: src/pkg_columnizer.cc:58
+msgid "Action"
+msgstr "Ao"
+
+#: src/pkg_columnizer.cc:58 src/pkg_description_treeitem.h:90
+#: src/pkg_info_screen.cc:69
+msgid "Description"
+msgstr "Descrio"
+
+#: src/pkg_columnizer.cc:58
+msgid "InstVer"
+msgstr "InstVer"
+
+#: src/pkg_columnizer.cc:58
+msgid "CandVer"
+msgstr "CandVer"
+
+#: src/pkg_columnizer.cc:58
+msgid "LongState"
+msgstr "LongState"
+
+#: src/pkg_columnizer.cc:58
+msgid "LongAction"
+msgstr "LongAction"
+
+#: src/pkg_columnizer.cc:58
+msgid "Maintainer"
+msgstr "Mantenedor"
+
+#: src/pkg_columnizer.cc:58
+msgid "Priority"
+msgstr "Prioridade"
+
+#: src/pkg_columnizer.cc:58
+msgid "Section"
+msgstr "Seo"
+
+#: src/pkg_columnizer.cc:58
+msgid "RC"
+msgstr "RC"
+
+#: src/pkg_columnizer.cc:72 src/pkg_columnizer.cc:82 src/pkg_ver_item.cc:75
+#: src/pkg_ver_item.cc:80
+msgid "<N/A>"
+msgstr "<N/A>"
+
+#: src/pkg_columnizer.cc:91 src/pkg_columnizer.cc:99
+msgid "<none>"
+msgstr "<none>"
+
+#: src/pkg_columnizer.cc:129 src/pkg_grouppolicy.cc:97
+msgid "virtual"
+msgstr "virtual"
+
+#: src/pkg_columnizer.cc:136 src/pkg_columnizer.cc:180 src/pkg_ver_item.cc:115
+#: src/pkg_ver_item.cc:122
+msgid "purge"
+msgstr "depurar"
+
+#: src/pkg_columnizer.cc:141 src/pkg_ver_item.cc:127
+msgid "unpacked"
+msgstr "desempacotado"
+
+#: src/pkg_columnizer.cc:143 src/pkg_ver_item.cc:129
+msgid "half-config"
+msgstr "half-config"
+
+#: src/pkg_columnizer.cc:145 src/pkg_ver_item.cc:131
+msgid "half-install"
+msgstr "half-install"
+
+#: src/pkg_columnizer.cc:147 src/pkg_ver_item.cc:133
+msgid "config-files"
+msgstr "config-files"
+
+#: src/pkg_columnizer.cc:149 src/pkg_ver_item.cc:135
+msgid "installed"
+msgstr "instalado"
+
+#: src/pkg_columnizer.cc:151 src/pkg_columnizer.cc:251 src/pkg_ver_item.cc:137
+#: src/pkg_ver_item.cc:254
+msgid "ERROR"
+msgstr "ERRO"
+
+#: src/pkg_columnizer.cc:178 src/pkg_ver_item.cc:176
+msgid "hold"
+msgstr "manter"
+
+#: src/pkg_columnizer.cc:180 src/pkg_ver_item.cc:198
+msgid "delete"
+msgstr "apagar"
+
+#: src/pkg_columnizer.cc:182 src/pkg_ver_item.cc:117 src/pkg_ver_item.cc:180
+msgid "broken"
+msgstr "corrompido"
+
+#: src/pkg_columnizer.cc:184 src/pkg_ver_item.cc:184 src/pkg_ver_item.cc:191
+#: src/pkg_ver_item.cc:200
+msgid "install"
+msgstr "instalar"
+
+#: src/pkg_columnizer.cc:186
+msgid "reinstall"
+msgstr "reinstalar"
+
+#: src/pkg_columnizer.cc:188
+msgid "upgrade"
+msgstr "atualizar"
+
+#: src/pkg_columnizer.cc:190 src/pkg_columnizer.cc:192 src/pkg_ver_item.cc:186
+#: src/pkg_ver_item.cc:193 src/pkg_ver_item.cc:203
+msgid "none"
+msgstr "none"
+
+#: src/pkg_columnizer.cc:210 src/pkg_columnizer.cc:215
+#: src/pkg_grouppolicy.cc:91 src/pkg_info_screen.cc:71 src/pkg_ver_item.cc:213
+#: src/pkg_ver_item.cc:218
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: src/pkg_columnizer.cc:321 src/pkg_columnizer.cc:344
+msgid "Internal error: Default column string is unparsable"
+msgstr "Erro interno: No  possvel resolver contedo da coluna padro."
+
+#: src/pkg_tree.cc:79
+msgid "All Packages"
+msgstr "Todos os Pacotes"
+
+#: src/pkg_action_tree.cc:46
+msgid "Actions to be taken"
+msgstr "Aes a ser tomadas"
+
+#: src/pkg_grouppolicy.cc:85
+msgid "Tasks/Tasks"
+msgstr ""
+
+#: src/pkg_grouppolicy.cc:85
+msgid "Tasks"
+msgstr ""
+
+#: src/pkg_grouppolicy.cc:91
+msgid "Unknown/Unknown"
+msgstr "Desconhecido/Desconhecido"
+
+#: src/pkg_grouppolicy.cc:97
+msgid "virtual/virtual"
+msgstr "virtual/virtual"
+
+#: src/pkg_grouppolicy.cc:108
+msgid "main"
+msgstr "principal"
+
+#: src/pkg_grouppolicy.cc:173
+msgid "New Packages"
+msgstr "Novos Pacotes"
+
+#: src/pkg_grouppolicy.cc:174
+msgid "Upgradable Packages"
+msgstr "Pacotes Atualizveis"
+
+#: src/pkg_grouppolicy.cc:175
+msgid "Installed Packages"
+msgstr "Pacotes Instalados"
+
+#: src/pkg_grouppolicy.cc:176
+msgid "Not Installed Packages"
+msgstr "Pacotes No Instalados"
+
+#: src/pkg_grouppolicy.cc:177
+msgid "Virtual Packages"
+msgstr "Pacotes Virtuais"
+
+#: src/pkg_grouppolicy.cc:178
+msgid "Obsolete and Locally Created Packages"
+msgstr "Pacotes Obsoletos e Criados Localmente"
+
+#: src/pkg_grouppolicy.cc:312
+msgid "Packages to be removed"
+msgstr "Pacotes a remover"
+
+#: src/pkg_grouppolicy.cc:313
+msgid "Packages to be upgraded"
+msgstr "Pacotes a atualizar"
+
+#: src/pkg_grouppolicy.cc:314
+msgid "Packages to be installed"
+msgstr "Pacotes a instalar"
+
+#: src/pkg_grouppolicy.cc:315
+msgid "Packages to be reinstalled"
+msgstr "Pacotes a reinstalar"
+
+#: src/pkg_grouppolicy.cc:316
+msgid "Packages being held back"
+msgstr "Pacotes sendo retidos"
+
+#: src/pkg_grouppolicy.cc:317
+msgid "Packages being held in their current state due to broken dependencies"
+msgstr ""
+"Pacotes sendo mantidos em seu estado atual devido a dependncias corrompidas"
+
+#: src/pkg_grouppolicy.cc:318
+msgid "Packages being deleted due to broken dependencies"
+msgstr "Pacotes sendo eliminados devido a dependncias corrompidas"
+
+#: src/pkg_grouppolicy.cc:319
+msgid "Packages being installed to satisfy dependencies"
+msgstr "Pacotes sendo instalados para satisfazer dependncias"
+
+#: src/pkg_ver_item.cc:420
+msgid "Available versions of "
+msgstr "Verses disponveis de "
+
+#: src/dep_item.cc:187 src/pkg_info_screen.cc:81
+#, c-format
+msgid "Packages which depend on %s"
+msgstr "Pacotes que dependem de %s"
+
+#: src/dep_item.cc:187
+#, c-format
+msgid "Dependencies of %s"
+msgstr "Dependncias de %s"
+
+#: src/pkg_description_treeitem.cc:66 src/pkg_description_treeitem.cc:74
+msgid "Description of "
+msgstr "Descrio de "
+
+#: src/pkg_info_screen.cc:70
+msgid "Priority: "
+msgstr "Prioridade: "
+
+#: src/pkg_info_screen.cc:71
+msgid "Section: "
+msgstr "Seo: "
+
+#: src/pkg_info_screen.cc:72
+#, fuzzy
+msgid "Maintainer: "
+msgstr "Mantenedor"
+
+#: src/pkg_info_screen.cc:73
+msgid "Compressed size: "
+msgstr "Tamanho compactado: "
+
+#: src/pkg_info_screen.cc:74
+msgid "Uncompressed size: "
+msgstr "Tamanho no compactado:"
+
+#: src/pkg_info_screen.cc:76
+msgid "Source Package: "
+msgstr "Pacote Fonte: "
+
+#: src/pkg_info_screen.cc:86
+msgid "Versions"
+msgstr "Verses"
+
+#: src/pkg_info_screen.cc:96
+#, c-format
+msgid "Information about %s"
+msgstr "Informao sobre %s"
+
+#: src/download_bar.cc:46
+msgid "Please insert the disc labeled \""
+msgstr "Por favor, insira o disco rotulado \""
+
+#: src/download_bar.cc:46
+msgid "\" into the drive \""
+msgstr "\" na unidade \""
+
+#: src/download_bar.cc:62
+msgid "Hit "
+msgstr "Acessar "
+
+#: src/download_bar.cc:74
+msgid "Downloading "
+msgstr "Baixando "
+
+#: src/download_bar.cc:86
+msgid "Got "
+msgstr "Pronto"
+
+#: src/download_bar.cc:138
+msgid "Downloading..."
+msgstr "Baixando..."
+
+#: src/download_item.cc:64 src/download_item.cc:68 src/download_item.cc:98
+msgid " [Working]"
+msgstr " [Trabalhando]"
+
+#: src/download_item.cc:102
+msgid "[Hit]"
+msgstr "[Acessar]"
+
+#: src/download_item.cc:102
+msgid "[Downloaded]"
+msgstr "[Baixado]"
+
+#: src/download_screen.cc:155
+#, c-format
+msgid "Downloaded %sB in %ss (%sB/s). Press any key to continue..."
+msgstr "Baixados %sB em %ss (%sB/s). Aperte qualquer tecla para continuar..."
+
+#: src/download_screen.cc:174
+msgid "Total Progress: "
+msgstr "Progresso Total: "
+
+#: src/download_screen.cc:189
+msgid " [ %i%% ] (%sB/s, %s remaining)"
+msgstr " [ %i%% ] (%sB/s, %s restantes)"
+
+#: src/download.cc:48
+msgid "Couldn't read list of package sources"
+msgstr "No foi possvel ler a lista de fontes do pacote"
+
+#: src/download.cc:59 src/download.cc:179
+msgid "Couldn't lock list directory..are you root?"
+msgstr "No foi possvel bloquear o diretrio de listas..voc  superusurio?"
+
+#: src/download.cc:73
+msgid "Updating package lists"
+msgstr "Atualizando listas de pacotes"
+
+#: src/download.cc:149
+msgid "Couldn't clean out list directories"
+msgstr "No foi possvel limpar diretrios de listas"
+
+#: src/download.cc:193
+msgid "Downloading and installing packages"
+msgstr "Baixando e instalando pacotes"
+
+#: src/download.cc:202
+msgid "Couldn't read source list"
+msgstr "No foi possvel ler a lista de fontes"
+
+#: src/download.cc:219
+msgid "Internal error: couldn't generate list of packages to download"
+msgstr "Erro interno: no foi possvel gerar lista de pacotes a baixar"
+
+#: src/download.cc:262
+msgid "Unrecoverable missing packages.  Press any key to continue..."
+msgstr "Pacotes irrecuperveis.  Aperte qualquer tecla para continuar..."
+
+#: src/download.cc:291
+#, c-format
+msgid "Unable to open %s to log actions"
+msgstr "Impossvel abrir %s para registrar aes"
+
+#: src/download.cc:297
+msgid ""
+"IMPORTANT: this log only lists intended actions; actions which fail due to\n"
+"dpkg problems may not be completed.\n"
+"\n"
+msgstr ""
+"IMPORTANTE: este registro lista somente as aes pretendidas; aes que\n"
+"falharem devido a problemas de dpkg podero no ser completadas.\n"
+"\n"
+
+#: src/download.cc:298
+#, c-format
+msgid "Will install %li packages, and remove %li packages.\n"
+msgstr "Instalar %li pacotes e remover %li pacotes.\n"
+
+#: src/download.cc:300
+#, c-format
+msgid "%li bytes of disk space will be used\n"
+msgstr "Sero utilizados %li bytes de espao em disco\n"
+
+#: src/download.cc:302
+#, c-format
+msgid "%li bytes of disk space will be freed\n"
+msgstr "Sero liberados %li bytes de espao em disco\n"
+
+#: src/download.cc:309
+#, c-format
+msgid "[UPGRADE] %s %s -> %s\n"
+msgstr ""
+
+#: src/download.cc:319
+msgid "REMOVE"
+msgstr "REMOVER"
+
+#: src/download.cc:325
+msgid "INSTALL"
+msgstr "INSTALAR"
+
+#: src/download.cc:328
+msgid "REINSTALL"
+msgstr "REINSTALAR"
+
+#: src/download.cc:331
+msgid "HOLD"
+msgstr "MANTER"
+
+#: src/download.cc:334
+msgid "HOLD, DEPENDENCIES"
+msgstr "MANTER, DEPENDNCIAS"
+
+#: src/download.cc:337
+msgid "REMOVE, DEPENDENCIES"
+msgstr "REMOVER, DEPENDNCIAS"
+
+#: src/download.cc:340
+msgid "INSTALL, DEPENDENCIES"
+msgstr "INSTALAR, DEPENDNCIAS"
+
+#: src/download.cc:343
+msgid "????????"
+msgstr "????????"
+
+#: src/download.cc:347
+#, c-format
+msgid "[%s] %s\n"
+msgstr "[%s] %s\n"
+
+#: src/download.cc:350
+msgid ""
+"============================================================================="
+"==\n"
+"\n"
+"Log complete.\n"
+msgstr ""
+"============================================================================="
+"==\n"
+"\n"
+"Registro completo.\n"
+
+#: src/download.cc:371
+msgid ""
+"Ack!  Something bad happened while installing packages.  Trying to recover:"
+msgstr ""
+"Ops!  Algo ruim aconteceu durante a instalao dos pacotes.  Tentando "
+"restaurar:"
+
+#: src/download.cc:377
+msgid "Press return to continue.\n"
+msgstr "Pressione retornar para continuar.\n"
+
+#: src/generic/aptcache.cc:178
+msgid "Can't open Aptitude extended state file"
+msgstr "No  possvel abrir o arquivo de estado estendido do Aptitude"
+
+#: src/generic/aptcache.cc:184 src/generic/aptcache.cc:218
+#: src/generic/aptcache.cc:220
+msgid "Reading extended state information"
+msgstr "Lendo informao de estado estendido."
+
+#: src/generic/aptcache.cc:273
+msgid "Cannot open Aptitude state file"
+msgstr "No  possvel abrir arquivo de estado do Aptitude"
+
+#: src/generic/aptcache.cc:277 src/generic/aptcache.cc:309
+msgid "Writing extended state information"
+msgstr "Salvando informao de estado estendido"
+
+#: src/generic/aptcache.cc:295
+#, c-format
+msgid "Internal buffer overflow on package \"%s\" while writing state file"
+msgstr ""
+"Estouro de buffer interno no pacote \"%s\" durante gravao de arquivo de "
+"estado"
+
+#: src/generic/aptcache.cc:302
+msgid "Couldn't write state file"
+msgstr "No foi possvel salvar arquivo de estado"
+
+#: src/generic/aptcache.cc:315
+msgid "Error writing state file"
+msgstr "Erro salvando arquivo de estado"
+
+#: src/generic/aptcache.cc:325
+msgid "couldn't replace old state file"
+msgstr "No foi possvel substituir arquivo de estado antigo"
+
+#: src/generic/aptcache.cc:509
+msgid "Unable to correct dependencies, some packages cannot be installed"
+msgstr ""
+"Impossvel corrigir dependncias, alguns pacotes no podem ser instalados."
+
+#: src/generic/aptcache.cc:658 src/generic/aptcache.cc:707
+msgid "The list of sources could not be read."
+msgstr "A lista de fontes no pde ser lida."
+
+#: src/generic/aptcache.cc:664 src/generic/aptcache.cc:714
+msgid "The package lists or status file could not be parsed or opened."
+msgstr ""
+"A lista de pacotes ou arquivo de status no pde ser analisada ou aberta."
+
+#: src/generic/aptcache.cc:666 src/generic/aptcache.cc:718
+msgid "You may want to update the package lists to correct these missing files"
+msgstr ""
+"Voc pode atualizar as listas de pacotes para corrigir os arquivos faltantes."
+
+#~ msgid "UPGRADE"
+#~ msgstr "ATUALIZAR"
diff -rud --new-file aptitude-0.0.7.19-orig/src/Makefile.am aptitude-0.0.7.19/src/Makefile.am
--- aptitude-0.0.7.19-orig/src/Makefile.am	Sat Sep 23 09:33:22 2000
+++ aptitude-0.0.7.19/src/Makefile.am	Mon Mar  5 16:07:17 2001
@@ -3,7 +3,7 @@
 SUBDIRS=generic vscreen
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall -Werror -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
+INCLUDES = -Wall -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl #-Werror
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 bin_PROGRAMS=aptitude
diff -rud --new-file aptitude-0.0.7.19-orig/src/Makefile.in aptitude-0.0.7.19/src/Makefile.in
--- aptitude-0.0.7.19-orig/src/Makefile.in	Sun Mar  4 11:43:41 2001
+++ aptitude-0.0.7.19/src/Makefile.in	Mon Mar  5 16:08:42 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -89,7 +90,7 @@
 SUBDIRS = generic vscreen
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall -Werror -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
+INCLUDES = -Wall -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl #-Werror
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 bin_PROGRAMS = aptitude
@@ -128,8 +129,16 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/apt_info_tree.P .deps/apt_tree.P .deps/defaults.P \
+.deps/dep_item.P .deps/download.P .deps/download_bar.P \
+.deps/download_item.P .deps/download_screen.P .deps/load_config.P \
+.deps/main.P .deps/pkg_action_tree.P .deps/pkg_columnizer.P \
+.deps/pkg_description_treeitem.P .deps/pkg_grouppolicy.P \
+.deps/pkg_info_screen.P .deps/pkg_item.P .deps/pkg_node.P \
+.deps/pkg_subtree.P .deps/pkg_tree.P .deps/pkg_ver_item.P \
+.deps/vs_progress.P
 SOURCES = $(aptitude_SOURCES)
 OBJECTS = $(aptitude_OBJECTS)
 
@@ -137,9 +146,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -158,8 +167,8 @@
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	    echo "  $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
+	     $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	  else :; fi; \
 	done
 
@@ -169,9 +178,6 @@
 	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -288,6 +294,11 @@
 subdir = src
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -308,166 +319,57 @@
 	      || exit 1; \
 	  fi; \
 	done
-apt_info_tree.o: apt_info_tree.cc apt_info_tree.h apt_tree.h \
-	vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_treeitem.h generic/apt.h generic/aptcache.h \
-	../config.h
-apt_tree.o: apt_tree.cc ../config.h aptitude.h apt_tree.h \
-	vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_treeitem.h generic/apt.h generic/aptcache.h \
-	generic/undo.h vscreen/vs_pager.h vscreen/vs_statusedit.h \
-	vscreen/vs_statuschoice.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	vs_progress.h pkg_action_tree.h pkg_tree.h generic/matchers.h \
-	pkg_item.h pkg_node.h pkg_columnizer.h \
-	vscreen/config/column_definition.h \
-	vscreen/config/../columnify.h pkg_grouppolicy.h download.h
-defaults.o: defaults.cc vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	vscreen/config/colors.h apt_tree.h vscreen/vs_tree.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
-	vscreen/vs_treeitem.h pkg_action_tree.h pkg_tree.h \
-	generic/matchers.h pkg_node.h generic/undo.h
-dep_item.o: dep_item.cc aptitude.h ../config.h dep_item.h \
-	vscreen/vs_subtree.h vscreen/vs_treeitem.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/vs_minibuf_win.h \
-	vscreen/vscreen.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	vscreen/vs_tree.h apt_info_tree.h apt_tree.h pkg_grouppolicy.h \
-	pkg_item.h pkg_node.h generic/undo.h pkg_subtree.h \
-	pkg_item_with_subtree.h pkg_columnizer.h \
-	vscreen/config/column_definition.h \
-	vscreen/config/../columnify.h vscreen/columnify.h \
-	pkg_grouppolicy_hash.h strhash.h pkg_ver_item.h generic/apt.h \
-	generic/aptcache.h
-download.o: download.cc aptitude.h ../config.h generic/apt.h \
-	generic/aptcache.h download_screen.h vscreen/vs_tree.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/vs_treeitem.h \
-	vscreen/vs_subtree.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	download_bar.h
-download_bar.o: download_bar.cc aptitude.h ../config.h download_bar.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h
-download_item.o: download_item.cc aptitude.h ../config.h download_item.h \
-	vscreen/vs_treeitem.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/vs_minibuf_win.h \
-	vscreen/vscreen.h vscreen/vs_tree.h
-download_screen.o: download_screen.cc aptitude.h ../config.h \
-	download_screen.h vscreen/vs_tree.h vscreen/vs_minibuf_win.h \
-	vscreen/vscreen.h vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_treeitem.h vscreen/vs_subtree.h \
-	vscreen/config/keybindings.h vscreen/config/../../strhash.h \
-	vscreen/config/../curses++.h download_item.h
-load_config.o: load_config.cc aptitude.h ../config.h \
-	vscreen/config/colors.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h
-main.o: main.cc aptitude.h ../config.h vscreen/curses++.h \
-	vscreen/vscreen.h vscreen/vs_tree.h vscreen/vs_minibuf_win.h \
-	vscreen/config/colors.h vscreen/vs_treeitem.h \
-	vscreen/vs_pager.h vscreen/vs_statuschoice.h \
-	vscreen/vs_statusedit.h vs_progress.h pkg_node.h generic/undo.h \
-	pkg_action_tree.h pkg_tree.h apt_tree.h generic/matchers.h \
-	pkg_grouppolicy.h generic/apt.h generic/aptcache.h \
-	load_config.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	defaults.h
-pkg_action_tree.o: pkg_action_tree.cc aptitude.h ../config.h \
-	pkg_action_tree.h pkg_tree.h apt_tree.h vscreen/vs_tree.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/vs_treeitem.h \
-	generic/matchers.h generic/apt.h generic/aptcache.h \
-	generic/undo.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h
-pkg_columnizer.o: pkg_columnizer.cc aptitude.h ../config.h \
-	pkg_columnizer.h pkg_item.h pkg_node.h vscreen/vs_treeitem.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h generic/undo.h \
-	vscreen/config/column_definition.h \
-	vscreen/config/../columnify.h generic/apt.h generic/aptcache.h
-pkg_description_treeitem.o: pkg_description_treeitem.cc aptitude.h \
-	../config.h pkg_description_treeitem.h vscreen/vs_treeitem.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h apt_info_tree.h \
-	apt_tree.h vscreen/vs_tree.h pkg_grouppolicy.h generic/apt.h \
-	generic/aptcache.h
-pkg_grouppolicy.o: pkg_grouppolicy.cc aptitude.h ../config.h \
-	pkg_grouppolicy.h pkg_item.h pkg_node.h vscreen/vs_treeitem.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h generic/undo.h \
-	pkg_subtree.h vscreen/vs_subtree.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	vscreen/vs_tree.h generic/apt.h generic/aptcache.h
-pkg_info_screen.o: pkg_info_screen.cc aptitude.h ../config.h \
-	pkg_info_screen.h pkg_grouppolicy.h apt_info_tree.h apt_tree.h \
-	vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_treeitem.h vscreen/vs_staticitem.h pkg_subtree.h \
-	vscreen/vs_subtree.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	pkg_node.h generic/undo.h pkg_item_with_subtree.h pkg_item.h \
-	pkg_columnizer.h vscreen/config/column_definition.h \
-	vscreen/config/../columnify.h vscreen/columnify.h dep_item.h \
-	pkg_ver_item.h pkg_description_treeitem.h generic/apt.h \
-	generic/aptcache.h
-pkg_item.o: pkg_item.cc aptitude.h ../config.h vscreen/vs_pager.h \
-	vscreen/vs_minibuf_win.h vscreen/vscreen.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/config/column_definition.h \
-	vscreen/config/../columnify.h dep_item.h vscreen/vs_subtree.h \
-	vscreen/vs_treeitem.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	vscreen/vs_tree.h apt_info_tree.h apt_tree.h pkg_grouppolicy.h \
-	pkg_item.h pkg_node.h generic/undo.h pkg_subtree.h \
-	pkg_item_with_subtree.h pkg_columnizer.h vscreen/columnify.h \
-	download.h pkg_action_tree.h pkg_tree.h generic/matchers.h \
-	pkg_description_treeitem.h pkg_info_screen.h pkg_ver_item.h \
-	download_bar.h generic/pkg_changelog.h generic/apt.h \
-	generic/aptcache.h
-pkg_node.o: pkg_node.cc vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	pkg_node.h vscreen/vs_treeitem.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/vs_minibuf_win.h \
-	vscreen/vscreen.h generic/undo.h generic/apt.h \
-	generic/aptcache.h ../config.h vscreen/vs_tree.h
-pkg_subtree.o: pkg_subtree.cc pkg_subtree.h vscreen/vs_subtree.h \
-	vscreen/vs_treeitem.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/vs_minibuf_win.h \
-	vscreen/vscreen.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	vscreen/vs_tree.h pkg_node.h generic/undo.h generic/apt.h \
-	generic/aptcache.h ../config.h
-pkg_tree.o: pkg_tree.cc aptitude.h ../config.h pkg_tree.h apt_tree.h \
-	vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_treeitem.h generic/matchers.h vs_progress.h \
-	pkg_node.h generic/undo.h pkg_item.h pkg_columnizer.h \
-	vscreen/config/column_definition.h \
-	vscreen/config/../columnify.h pkg_subtree.h \
-	vscreen/vs_subtree.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	pkg_grouppolicy.h download.h vscreen/columnify.h \
-	vscreen/vs_statusedit.h generic/apt.h generic/aptcache.h
-pkg_ver_item.o: pkg_ver_item.cc aptitude.h ../config.h pkg_item.h \
-	pkg_node.h vscreen/vs_treeitem.h vscreen/curses++.h \
-	vscreen/config/colors.h vscreen/vs_minibuf_win.h \
-	vscreen/vscreen.h generic/undo.h pkg_columnizer.h \
-	vscreen/config/column_definition.h \
-	vscreen/config/../columnify.h pkg_subtree.h \
-	vscreen/vs_subtree.h vscreen/config/keybindings.h \
-	vscreen/config/../../strhash.h vscreen/config/../curses++.h \
-	vscreen/vs_tree.h pkg_ver_item.h apt_info_tree.h apt_tree.h \
-	pkg_grouppolicy.h pkg_item_with_subtree.h vscreen/columnify.h \
-	pkg_description_treeitem.h dep_item.h pkg_info_screen.h \
-	generic/apt.h generic/aptcache.h
-vs_progress.o: vs_progress.cc aptitude.h ../config.h vs_progress.h \
-	vscreen/vs_tree.h vscreen/vs_minibuf_win.h vscreen/vscreen.h \
-	vscreen/curses++.h vscreen/config/colors.h \
-	vscreen/vs_treeitem.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+
+%.o: %.cc
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.cc
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-recursive
 dvi-am:
@@ -490,7 +392,7 @@
 all-am: Makefile $(PROGRAMS)
 all-redirect: all-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs)  $(DESTDIR)$(bindir)
@@ -507,23 +409,24 @@
 maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-recursive
 
 distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
-		distclean-generic clean-am
+		distclean-depend distclean-generic clean-am
 
 distclean: distclean-recursive
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -538,12 +441,14 @@
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -rud --new-file aptitude-0.0.7.19-orig/src/dep_item.cc aptitude-0.0.7.19/src/dep_item.cc
--- aptitude-0.0.7.19-orig/src/dep_item.cc	Sat Mar  3 14:13:56 2001
+++ aptitude-0.0.7.19/src/dep_item.cc	Mon Mar  5 16:07:17 2001
@@ -30,8 +30,11 @@
 
 #include "generic/apt.h"
 
-#include <apt-pkg/version.h>
+//#include <apt-pkg/version.h>
+#include <apt-pkg/systemfactory.h>
 #include <apt-pkg/configuration.h>
+
+#define pkgCheckDep _system->checkDep
 
 class pkg_depitem:public pkg_subtree
 {
diff -rud --new-file aptitude-0.0.7.19-orig/src/download.cc aptitude-0.0.7.19/src/download.cc
--- aptitude-0.0.7.19-orig/src/download.cc	Fri Dec 15 16:11:48 2000
+++ aptitude-0.0.7.19/src/download.cc	Mon Mar  5 16:07:17 2001
@@ -23,6 +23,7 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/dpkgpm.h>
 #include <apt-pkg/packagemanager.h>
+#include <apt-pkg/systemfactory.h>
 #include <apt-pkg/sourcelist.h>
 #include <apt-pkg/acquire.h>
 #include <apt-pkg/acquire-item.h>
@@ -213,7 +214,9 @@
     }
 
   // Make a package manager, get ready to download
-  pkgDPkgPM pm(*apt_cache_file);
+  //pkgDPkgPM pm(*apt_cache_file);
+  pkgPackageManager *pm_ = _system->CreatePackageManager(*apt_cache_file);
+  pkgPackageManager &pm = *pm_;
   if(!pm.GetArchives(&fetcher, &list, apt_package_records) || _error->PendingError())
     {
       _error->Error(_("Internal error: couldn't generate list of packages to download"));
@@ -294,7 +297,7 @@
 	}
 
       fprintf(f, "Aptitude " VERSION ": log report\n\n");
-      fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\ndpkg problems may not be completed.\n\n"));
+      fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\nrpm problems may not be completed.\n\n"));
       fprintf(f, _("Will install %li packages, and remove %li packages.\n"), (*apt_cache_file)->InstCount(), (*apt_cache_file)->DelCount());
       if((*apt_cache_file)->UsrSize()>0)
 	fprintf(f, _("%li bytes of disk space will be used\n"), (long int) (*apt_cache_file)->UsrSize());
@@ -370,7 +373,7 @@
       _error->DumpErrors();
       cerr<<_("Ack!  Something bad happened while installing packages.  Trying to recover:")<<endl;
       // and this is really a hack:
-      system("dpkg --configure -a");
+      //system("dpkg --configure -a");
       _error->Discard();
     }
 
diff -rud --new-file aptitude-0.0.7.19-orig/src/generic/Makefile.am aptitude-0.0.7.19/src/generic/Makefile.am
--- aptitude-0.0.7.19-orig/src/generic/Makefile.am	Fri Sep 22 20:35:10 2000
+++ aptitude-0.0.7.19/src/generic/Makefile.am	Mon Mar  5 16:07:17 2001
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES=Makefile.in
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall -Werror -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
+INCLUDES = -Wall -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl #-Werror
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = @INTLLIBS@
 
diff -rud --new-file aptitude-0.0.7.19-orig/src/generic/Makefile.in aptitude-0.0.7.19/src/generic/Makefile.in
--- aptitude-0.0.7.19-orig/src/generic/Makefile.in	Sun Mar  4 11:43:42 2001
+++ aptitude-0.0.7.19/src/generic/Makefile.in	Mon Mar  5 16:08:41 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -87,7 +88,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
 localedir = $(datadir)/locale
-INCLUDES = -Wall -Werror -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
+INCLUDES = -Wall -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl #-Werror
 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 LDADD = @INTLLIBS@
 
@@ -120,8 +121,10 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/apt.P .deps/aptcache.P .deps/matchers.P \
+.deps/pkg_changelog.P .deps/undo.P
 SOURCES = $(libgeneric_a_SOURCES)
 OBJECTS = $(libgeneric_a_OBJECTS)
 
@@ -129,9 +132,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/generic/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/generic/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -145,9 +148,6 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -205,6 +205,11 @@
 subdir = src/generic
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/generic/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -215,12 +220,57 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-apt.o: apt.cc apt.h aptcache.h ../../config.h undo.h
-aptcache.o: aptcache.cc ../aptitude.h ../../config.h aptcache.h undo.h
-matchers.o: matchers.cc matchers.h apt.h aptcache.h ../../config.h
-pkg_changelog.o: pkg_changelog.cc pkg_changelog.h
-undo.o: undo.cc undo.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+
+%.o: %.cc
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.cc
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -243,7 +293,7 @@
 all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 
 
@@ -258,23 +308,25 @@
 maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -284,12 +336,13 @@
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -rud --new-file aptitude-0.0.7.19-orig/src/generic/aptcache.cc aptitude-0.0.7.19/src/generic/aptcache.cc
--- aptitude-0.0.7.19-orig/src/generic/aptcache.cc	Sat Mar  3 09:10:44 2001
+++ aptitude-0.0.7.19/src/generic/aptcache.cc	Mon Mar  5 16:07:17 2001
@@ -32,6 +32,8 @@
 #ifdef HAVE_LIBAPT_PKG3
 #include <apt-pkg/pkgsystem.h>
 #include <apt-pkg/policy.h>
+#else
+#include <apt-pkg/systemfactory.h>
 #endif
 
 #include <vector>
@@ -142,7 +144,7 @@
   if(!pkgDepCache::Init(&Prog))
     return false;
 
-  string statedir=_config->FindDir("Dir::Aptitude::state", "/var/state/aptitude");
+  string statedir=_config->FindDir("Dir::Aptitude::state", "/var/lib/aptitude");
   // Should this not go under Dir:: ?  I'm not sure..
   delete package_states;
   package_states=new aptitude_state[Head().PackageCount];
@@ -266,7 +268,7 @@
 {
   if(lock==-1)
     return true;
-  string statefile=_config->FindDir("Dir::Aptitude::state", "/var/state/aptitude")+"pkgstates";
+  string statefile=_config->FindDir("Dir::Aptitude::state", "/var/lib/aptitude")+"pkgstates";
 
   FileFd newstate(statefile+".new", FileFd::WriteEmpty);
   if(!newstate.IsOpen())
@@ -648,7 +650,7 @@
 bool aptitudeCacheFile::Open(OpProgress &Progress, bool WithLock)
 {
   if(WithLock)
-    Lock=new pkgDpkgLock;
+    Lock=new pkgRpmLock (false);	// pkgDpkgLock;
 
   if(_error->PendingError())
     return false;
@@ -659,7 +661,8 @@
 
   if(WithLock)
     {
-      pkgMakeStatusCache(List, Progress);
+      //pkgMakeStatusCache(List, Progress);
+      _system->makeStatusCache(List, Progress);
       if(_error->PendingError())
 	return _error->Error(_("The package lists or status file could not be parsed or opened."));
       if(!_error->empty())
@@ -675,7 +678,8 @@
     }
   else
     {
-      Map=pkgMakeStatusCacheMem(List, Progress);
+      //Map=pkgMakeStatusCacheMem(List, Progress);
+      Map=_system->makeStatusCacheMem(List, Progress);
       Progress.Done();
       if(!Map)
 	return false;
diff -rud --new-file aptitude-0.0.7.19-orig/src/generic/aptcache.cc~ aptitude-0.0.7.19/src/generic/aptcache.cc~
--- aptitude-0.0.7.19-orig/src/generic/aptcache.cc~	Wed Dec 31 19:00:00 1969
+++ aptitude-0.0.7.19/src/generic/aptcache.cc~	Sat Mar  3 09:10:44 2001
@@ -0,0 +1,752 @@
+// aptcache.cc
+//
+//  Copyright 1999 Daniel Burrows
+//
+//  This program is free software; you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation; either version 2 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program; see the file COPYING.  If not, write to
+//  the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+//  Boston, MA 02111-1307, USA.
+
+#include "../aptitude.h"
+
+#include "aptcache.h"
+#include "undo.h"
+
+#include <apt-pkg/error.h>
+#include <apt-pkg/sourcelist.h>
+#include <apt-pkg/pkgcachegen.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/tagfile.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/algorithms.h>
+#ifdef HAVE_LIBAPT_PKG3
+#include <apt-pkg/pkgsystem.h>
+#include <apt-pkg/policy.h>
+#endif
+
+#include <vector>
+
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+
+class aptitudeDepCache::apt_undoer:public undoable
+// Allows an action performed on the package cache to be undone.  My first
+// thought was to just snapshot the package cache before the action and then
+// copy over the state, but this works better (IMO :) ) -- the other method
+// had the drawback of not telling what was actually happening, and potentially
+// leaving bits of the cache in weird states.
+//
+// Of course, there's always the danger that this won't properly restore the
+// cache state, so I'll have to revert to the original method..
+{
+  PkgIterator pkg;
+  int prev_mode;  // One of Delete,Keep,Install
+  int prev_flags; /* For Delete, tracks Purge mode; for Install, tracks 
+		   * Reinstall mode..
+		   */
+  pkgCache::State::PkgSelectedState prev_selection_state;
+
+  aptitudeDepCache *owner;
+public:
+  apt_undoer(PkgIterator _pkg, int _prev_mode, int _prev_flags,
+	     pkgCache::State::PkgSelectedState _prev_selection_state,
+	     aptitudeDepCache *_owner)
+    :pkg(_pkg), prev_mode(_prev_mode), prev_flags(_prev_flags), prev_selection_state(_prev_selection_state), owner(_owner)
+  {
+  }
+
+  void undo()
+  {
+    if(prev_flags&ReInstall)
+      owner->mark_install(pkg, false, true, NULL);
+    else switch(prev_mode)
+      {
+      case ModeDelete:
+	owner->mark_delete(pkg, prev_flags&Purge, NULL);
+	break;
+      case ModeKeep:
+	owner->mark_keep(pkg, prev_flags&AutoKept, prev_selection_state==pkgCache::State::Hold, NULL);
+	break;
+      case ModeInstall:
+	owner->mark_install(pkg, false, false, NULL);
+	break;
+      }
+  }
+};
+
+class aptitudeDepCache::forget_undoer:public undoable
+// Undoes a "forget_new" command
+{
+  vector<pkgCache::PkgIterator> packages;
+
+  aptitudeDepCache *owner;
+public:
+  forget_undoer(aptitudeDepCache *_owner):owner(_owner) {}
+
+  void add_item(pkgCache::PkgIterator item)
+  {
+    packages.push_back(item);
+  }
+
+  bool empty()
+  {
+    return packages.empty();
+  }
+
+  void undo()
+  {
+    for(vector<pkgCache::PkgIterator>::iterator i=packages.begin(); i!=packages.end(); i++)
+      owner->get_ext_state(*i).new_package=true;
+  }
+};
+
+#ifndef HAVE_LIBAPT_PKG3
+aptitudeDepCache::aptitudeDepCache(MMap &Map, OpProgress &Prog, bool WithLock)
+  :pkgDepCache(Map, Prog),package_states(NULL),lock(-1),group_level(0)
+{
+  if(!_error->PendingError())
+    build_selection_list(Prog, WithLock);
+}
+#else
+aptitudeDepCache::aptitudeDepCache(pkgCache *Cache, Policy *Plcy)
+  :pkgDepCache(Cache, Plcy), package_states(NULL), lock(-1), group_level(0)
+{
+}
+
+bool aptitudeDepCache::Init(OpProgress *Prog, bool WithLock)
+{
+  return build_selection_list(*Prog, WithLock);
+}
+#endif
+
+aptitudeDepCache::~aptitudeDepCache()
+{
+  delete[] package_states;
+  if(lock!=-1)
+    close(lock);
+}
+
+bool aptitudeDepCache::build_selection_list(OpProgress &Prog, bool WithLock)
+{
+  if(!pkgDepCache::Init(&Prog))
+    return false;
+
+  string statedir=_config->FindDir("Dir::Aptitude::state", "/var/state/aptitude");
+  // Should this not go under Dir:: ?  I'm not sure..
+  delete package_states;
+  package_states=new aptitude_state[Head().PackageCount];
+  for(unsigned int i=0; i<Head().PackageCount; i++)
+    {
+      package_states[i].new_package=true;
+      package_states[i].selection_state=package_states[i].dselect_state=pkgCache::State::Unknown;
+      package_states[i].reinstall=false;
+    }
+
+  if(WithLock && lock==-1)
+    {
+      lock=GetLock(statedir+"lock");
+
+      if(_error->PendingError())
+	{
+	  if(lock!=-1)
+	    close(lock);
+	  lock=-1;
+	  return false;
+	}
+    }
+  // Errrrr, I think we need to do this first in case the stuff below
+  // manages to trigger a mark operation.
+  duplicate_cache(&backup_state);
+
+  // Read in the states that we saved
+  FileFd state_file(statedir+"pkgstates", FileFd::ReadOnly);
+  if(!state_file.IsOpen())
+    {
+      _error->Discard();
+      if(errno!=ENOENT)
+	_error->Warning(_("Can't open Aptitude extended state file"));
+    }
+  else
+    {
+
+      int file_size=state_file.Size();
+      Prog.OverallProgress(0, file_size, 1, _("Reading extended state information"));
+
+#ifndef HAVE_LIBAPT_PKG3
+      pkgTagFile tagfile(state_file);
+#else
+      pkgTagFile tagfile(&state_file);
+#endif
+      pkgTagSection section;
+      int amt=0;
+      bool do_dselect=_config->FindB("Aptitude::Track-Dselect-State", true);
+      while(tagfile.Step(section))
+	{
+	  PkgIterator pkg=FindPkg(section.FindS("Package"));
+	  if(!pkg.end()) // Silently ignore unknown packages.
+	    {
+	      unsigned long tmp=0;
+	      aptitude_state &pkg_state=get_ext_state(pkg);
+
+	      section.FindFlag("Unseen", tmp, 1);
+	      pkg_state.new_package=(tmp==1);
+
+	      tmp=0;
+	      section.FindFlag("ReInstall", tmp, 1);
+	      pkg_state.reinstall=(tmp==1);
+
+	      pkg_state.selection_state=(pkgCache::State::PkgSelectedState) section.FindI("State", pkgCache::State::Unknown);
+	      pkg_state.dselect_state=(pkgCache::State::PkgSelectedState) section.FindI("Dselect-State", pkg->SelectedState);
+	      if(do_dselect && pkg->SelectedState!=pkg_state.dselect_state)
+		{
+		  MarkFromDselect(pkg);
+		  pkg_state.dselect_state=(pkgCache::State::PkgSelectedState) pkg->SelectedState;
+		}
+	    }
+	  amt+=section.size();
+	  Prog.OverallProgress(amt, file_size, 1, _("Reading extended state information"));
+	}
+      Prog.OverallProgress(amt, file_size, 1, _("Reading extended state information"));
+    }
+
+  // Act on them
+  for(pkgCache::PkgIterator i=PkgBegin(); !i.end(); i++)
+    {
+      StateCache &state=(*this)[i];
+      aptitude_state &estate=get_ext_state(i);
+      switch(estate.selection_state)
+	{
+	case pkgCache::State::Unknown:
+	  if(i.CurrentVer().end())
+	    estate.selection_state=pkgCache::State::DeInstall;
+	  else
+	    {
+	      estate.selection_state=pkgCache::State::Install;
+	      if(_config->FindB("Aptitude::Auto-Upgrade", true) && state.Status>0)
+		MarkInstall(i, _config->FindB("Aptitude::Auto-Install", false));
+	    }
+	  break;
+	case pkgCache::State::Install:
+	  if(_config->FindB("Aptitude::Auto-Upgrade", true) && state.Status>0)
+	    MarkInstall(i, _config->FindB("Aptitude::Auto-Install", false));
+	  SetReInstall(i, estate.reinstall);
+	  break;
+	case pkgCache::State::Hold:
+	  MarkKeep(i, false);
+	  estate.selection_state=pkgCache::State::Hold;
+	  break;
+	case pkgCache::State::DeInstall:
+	  if(!i.CurrentVer().end())
+	    MarkDelete(i, false);
+	  estate.selection_state=pkgCache::State::DeInstall;
+	  break;
+	case pkgCache::State::Purge:
+	  if(!i.CurrentVer().end())
+	    MarkDelete(i, true);
+	  estate.selection_state=pkgCache::State::Purge;
+	  break;
+	}
+    }
+
+  return true;
+}
+
+bool aptitudeDepCache::save_selection_list(OpProgress &prog)
+{
+  if(lock==-1)
+    return true;
+  string statefile=_config->FindDir("Dir::Aptitude::state", "/var/state/aptitude")+"pkgstates";
+
+  FileFd newstate(statefile+".new", FileFd::WriteEmpty);
+  if(!newstate.IsOpen())
+    _error->Error(_("Cannot open Aptitude state file"));
+  else
+    {
+      int num=0;
+      prog.OverallProgress(0, Head().PackageCount, 1, _("Writing extended state information"));
+
+      for(PkgIterator i=PkgBegin(); !i.end(); i++)
+	{
+	  aptitude_state &state=get_ext_state(i);
+	  char buf[400];
+	  int len;
+
+	  len=snprintf(buf,
+		       400,
+		       "Package: %s\nUnseen: %s\nState: %i\nDselect-State: %i\n%s\n",
+		       i.Name(),
+		       state.new_package?"yes":"no",
+		       state.selection_state,
+		       i->SelectedState,
+		       state.reinstall?"ReInstall: yes\n":"");
+	  if(len>=399)
+	    {
+	      _error->Error(_("Internal buffer overflow on package \"%s\" while writing state file"), i.Name());
+	      newstate.Close();
+	      unlink((statefile+".new").c_str());
+	      return false;
+	    }
+	  if(newstate.Failed() || !newstate.Write(buf, len))
+	    {
+	      _error->Error(_("Couldn't write state file"));
+	      newstate.Close();
+	      unlink((statefile+".new").c_str());
+	      return false;
+	    }
+
+	  num++;
+	  prog.OverallProgress(num, Head().PackageCount, 1, _("Writing extended state information"));
+	}
+
+      if(newstate.Failed())
+	// This is /probably/ redundant, but paranoia never hurts.
+	{
+	  _error->Error(_("Error writing state file"));
+	  newstate.Close();
+	  unlink((statefile+".new").c_str());
+	  return false;
+	}
+      newstate.Close();
+      // FIXME!  This potentially breaks badly on NFS.. (?) -- actually, it
+      //       wouldn't be harmful; you'd just get gratuitous errors..
+      if(rename((statefile+".new").c_str(), statefile.c_str())==-1)
+	{
+	  _error->Errno("save_selection_list", _("couldn't replace old state file"));
+	  unlink((statefile+".new").c_str());
+	  return false;
+	}
+    }
+
+  return true;
+}
+
+void aptitudeDepCache::forget_new(undoable **undoer)
+{
+  forget_undoer *undo=undoer?new forget_undoer(this):NULL;
+
+  for(pkgCache::PkgIterator i=PkgBegin(); !i.end(); i++)
+    if(package_states[i->ID].new_package)
+      {
+	package_states[i->ID].new_package=false;
+	if(undo)
+	  undo->add_item(i);
+      }
+
+  if(undoer && undo && !undo->empty())
+    *undoer=undo;
+  else
+    delete undo;
+
+  duplicate_cache(&backup_state);
+}
+
+inline undoable *aptitudeDepCache::state_restorer(PkgIterator pkg, StateCache &state, aptitude_state &ext_state)
+{
+  return new apt_undoer(pkg, state.Mode, state.iFlags, ext_state.selection_state, this);
+}
+
+void aptitudeDepCache::cleanup_after_change(undo_group *undo, bool alter_stickies)
+  // Finds any packages whose states have changed and: (a) updates the
+  // selected_state if it's not already updated; (b) adds an item to the
+  // undo group.
+{
+  for(pkgCache::PkgIterator pkg=PkgBegin(); !pkg.end(); pkg++)
+    {
+      if(PkgState[pkg->ID].Mode!=backup_state.PkgState[pkg->ID].Mode ||
+	 package_states[pkg->ID].selection_state!=backup_state.AptitudeState[pkg->ID].selection_state ||
+	 package_states[pkg->ID].reinstall!=backup_state.AptitudeState[pkg->ID].reinstall)
+	{
+	  if(alter_stickies &&
+	     PkgState[pkg->ID].Mode!=backup_state.PkgState[pkg->ID].Mode &&
+	     package_states[pkg->ID].selection_state==backup_state.AptitudeState[pkg->ID].selection_state)
+	    // Catch packages which switched without altering their Aptitude
+	    // selection mode
+	    {
+	      switch(PkgState[pkg->ID].Mode)
+		{
+		case ModeDelete:
+		  package_states[pkg->ID].selection_state=pkgCache::State::DeInstall;
+		  break;
+		case ModeKeep:
+		  package_states[pkg->ID].selection_state=pkgCache::State::Hold;
+		  break;
+		case ModeInstall:
+		  package_states[pkg->ID].selection_state=pkgCache::State::Install;
+		  break;
+		}
+	    }
+
+	  if(undo)
+	    undo->add_item(state_restorer(pkg,
+					  backup_state.PkgState[pkg->ID],
+					  backup_state.AptitudeState[pkg->ID]));
+	}
+    }
+}
+
+void aptitudeDepCache::mark_install(const PkgIterator &Pkg, bool AutoInst, bool ReInstall, undo_group *undo)
+{
+  if(!ReInstall)
+    pkgDepCache::MarkInstall(Pkg, AutoInst);
+  else
+    pkgDepCache::MarkKeep(Pkg, AutoInst);
+
+  pkgDepCache::SetReInstall(Pkg, ReInstall);
+
+  get_ext_state(Pkg).selection_state=pkgCache::State::Install;
+  get_ext_state(Pkg).reinstall=ReInstall;
+
+  if(group_level==0)
+    {
+      cleanup_after_change(undo);
+
+      duplicate_cache(&backup_state);
+    }
+}
+
+void aptitudeDepCache::mark_delete(const PkgIterator &Pkg, bool Purge, undo_group *undo)
+{
+  pkgDepCache::MarkDelete(Pkg, Purge);
+  pkgDepCache::SetReInstall(Pkg, false);
+
+  get_ext_state(Pkg).selection_state=(Purge?pkgCache::State::Purge:pkgCache::State::DeInstall);
+  get_ext_state(Pkg).reinstall=false;
+
+  if(group_level==0)
+    {
+      // No automagic changes, don't waste time..
+      if(undo)
+	undo->add_item(state_restorer(Pkg,
+				      backup_state.PkgState[Pkg->ID],
+				      backup_state.AptitudeState[Pkg->ID]));
+
+      duplicate_cache(&backup_state);
+      // Hmm.  Unnecessary waste of cycles!?
+    }
+}
+
+void aptitudeDepCache::mark_keep(const PkgIterator &Pkg, bool Soft, bool SetHold, undo_group *undo)
+{
+  pkgDepCache::MarkKeep(Pkg, Soft);
+  pkgDepCache::SetReInstall(Pkg, false);
+  get_ext_state(Pkg).reinstall=false;
+
+  if(Pkg.CurrentVer().end())
+    {
+      if((*this)[Pkg].iFlags&Purge)
+	get_ext_state(Pkg).selection_state=pkgCache::State::Purge;
+      else
+	get_ext_state(Pkg).selection_state=pkgCache::State::DeInstall;
+    }
+  else if(SetHold)
+    get_ext_state(Pkg).selection_state=pkgCache::State::Hold;
+  else
+    get_ext_state(Pkg).selection_state=pkgCache::State::Install;
+
+  if(group_level==0)
+    {
+      // No automagic changes, don't waste time..
+      if(undo)
+	undo->add_item(state_restorer(Pkg,
+				      backup_state.PkgState[Pkg->ID],
+				      backup_state.AptitudeState[Pkg->ID]));
+      duplicate_cache(&backup_state);
+    }
+}
+
+void aptitudeDepCache::mark_single_install(const PkgIterator &Pkg, undo_group *undo)
+{
+  for(PkgIterator i=PkgBegin(); !i.end(); i++)
+    pkgDepCache::MarkKeep(i, true);
+
+  pkgDepCache::MarkInstall(Pkg, true);
+
+  if(group_level==0)
+    {
+      cleanup_after_change(undo, false);
+
+      duplicate_cache(&backup_state);
+    }
+}
+
+bool aptitudeDepCache::try_fix_broken(undo_group *undo)
+{
+  bool founderr=false;
+
+#ifndef HAVE_LIBAPT_PKG3
+  pkgProblemResolver fixer(*this);
+#else
+  pkgProblemResolver fixer(this);
+#endif
+  for(pkgCache::PkgIterator i=PkgBegin(); !i.end(); i++)
+    if(!i.CurrentVer().end() &&
+       get_ext_state(i).selection_state==pkgCache::pkgCache::State::Hold)
+      fixer.Protect(i);
+    else
+      {
+	pkgDepCache::StateCache &state=(*this)[i];
+	if(state.InstBroken() || state.NowBroken())
+	  MarkInstall(i,true);
+	else if(state.Delete())
+	  fixer.Remove(i);
+      }
+  //fixer.InstallProtect();
+  if(!fixer.Resolve(true))
+    founderr=true;
+
+  if(founderr)
+    _error->Error(_("Unable to correct dependencies, some packages cannot be installed"));
+
+  if(group_level==0)
+    {
+      cleanup_after_change(undo);
+
+      duplicate_cache(&backup_state);
+    }
+
+  return !founderr;
+}
+
+void aptitudeDepCache::MarkFromDselect(const PkgIterator &Pkg)
+{
+  aptitude_state &state=get_ext_state(Pkg);
+
+  if(Pkg->SelectedState!=state.selection_state)
+    {
+      switch(Pkg->SelectedState)
+	{
+	case pkgCache::State::Unknown:
+	  break;
+	case pkgCache::State::Purge:
+	  if( (!Pkg.CurrentVer().end()) || !((*this)[Pkg].iFlags&Purge) )
+	    mark_delete(Pkg, true, NULL);
+	  else
+	    mark_keep(Pkg, false, false, NULL);
+	  break;
+	case pkgCache::State::DeInstall:
+	  if(!Pkg.CurrentVer().end())
+	    mark_delete(Pkg, false, NULL);
+	  else
+	    mark_keep(Pkg, false, false, NULL);
+	  break;
+	case pkgCache::State::Hold:
+	  if(!Pkg.CurrentVer().end())
+	    mark_keep(Pkg, false, true, NULL);
+	  break;
+	case pkgCache::State::Install:
+	  if(Pkg.CurrentVer().end())
+	    mark_install(Pkg, false, false, NULL);
+	  else
+	    mark_keep(Pkg, false, false, NULL);
+	  break;
+	}
+    }
+}
+
+void aptitudeDepCache::duplicate_cache(apt_state_snapshot *target)
+  // Remember: the tables in the target have to be correctly sized!
+{
+  if(!target->PkgState)
+    target->PkgState=new StateCache[Head().PackageCount];
+  if(!target->DepState)
+    target->DepState=new unsigned char[Head().DependsCount];
+  if(!target->AptitudeState)
+    target->AptitudeState=new aptitude_state[Head().PackageCount];
+
+  memcpy(target->PkgState, PkgState, sizeof(StateCache)*Head().PackageCount);
+  memcpy(target->DepState, DepState, sizeof(char)*Head().DependsCount);
+  memcpy(target->AptitudeState, package_states, sizeof(aptitude_state)*Head().PackageCount);
+
+  target->iUsrSize=iUsrSize;
+  target->iDownloadSize=iDownloadSize;
+  target->iInstCount=iInstCount;
+  target->iDelCount=iDelCount;
+  target->iKeepCount=iKeepCount;
+  target->iBrokenCount=iBrokenCount;
+  target->iBadCount=iBadCount;
+}
+
+void aptitudeDepCache::begin_action_group()
+{
+  group_level++;
+}
+
+void aptitudeDepCache::end_action_group(undo_group *undo)
+{
+  assert(group_level>0);
+
+  group_level--;
+
+  if(group_level==0)
+    {
+      cleanup_after_change(undo);
+
+      duplicate_cache(&backup_state);
+    }
+}
+
+const aptitudeDepCache::apt_state_snapshot *aptitudeDepCache::snapshot_apt_state()
+{
+  apt_state_snapshot *rval=new apt_state_snapshot;
+  duplicate_cache(rval);
+
+  return rval;
+}
+
+void aptitudeDepCache::restore_apt_state(const apt_state_snapshot *snapshot)
+{
+  memcpy(PkgState, snapshot->PkgState, sizeof(StateCache)*Head().PackageCount);
+  memcpy(DepState, snapshot->DepState, sizeof(char)*Head().DependsCount);
+  memcpy(package_states, snapshot->AptitudeState, sizeof(aptitude_state)*Head().PackageCount);
+
+  iUsrSize=snapshot->iUsrSize;
+  iDownloadSize=snapshot->iDownloadSize;
+  iInstCount=snapshot->iInstCount;
+  iDelCount=snapshot->iDelCount;
+  iKeepCount=snapshot->iKeepCount;
+  iBrokenCount=snapshot->iBrokenCount;
+  iBadCount=snapshot->iBadCount;
+}
+
+#ifndef HAVE_LIBAPT_PKG3
+aptitudeCacheFile::aptitudeCacheFile():Map(NULL), Cache(NULL), Lock(NULL)
+{
+}
+#else
+aptitudeCacheFile::aptitudeCacheFile()
+  :Map(NULL), Cache(NULL), DCache(NULL), Policy(NULL)
+{
+}
+#endif
+
+aptitudeCacheFile::~aptitudeCacheFile()
+{
+  delete Cache;
+  delete Map;
+#ifndef HAVE_LIBAPT_PKG3
+  delete Lock;
+#else
+  ReleaseLock();
+
+  delete DCache;
+  delete Policy;
+#endif
+}
+
+#ifndef HAVE_LIBAPT_PKG3
+bool aptitudeCacheFile::Open(OpProgress &Progress, bool WithLock)
+{
+  if(WithLock)
+    Lock=new pkgDpkgLock;
+
+  if(_error->PendingError())
+    return false;
+
+  pkgSourceList List;
+  if(!List.ReadMainList())
+    return _error->Error(_("The list of sources could not be read."));
+
+  if(WithLock)
+    {
+      pkgMakeStatusCache(List, Progress);
+      if(_error->PendingError())
+	return _error->Error(_("The package lists or status file could not be parsed or opened."));
+      if(!_error->empty())
+	_error->Warning(_("You may want to update the package lists to correct these missing files"));
+
+      FileFd File(_config->FindFile("Dir::Cache::pkgcache"), FileFd::ReadOnly);
+      if(_error->PendingError())
+	return false;
+
+      Map=new MMap(File, MMap::Public|MMap::ReadOnly);
+      if(_error->PendingError())
+	return false;
+    }
+  else
+    {
+      Map=pkgMakeStatusCacheMem(List, Progress);
+      Progress.Done();
+      if(!Map)
+	return false;
+    }
+
+  Cache=new aptitudeDepCache(*Map, Progress, WithLock);
+  Progress.Done();
+  if(_error->PendingError())
+    return false;
+
+  return true;
+}
+#else
+bool aptitudeCacheFile::Open(OpProgress &Progress, bool WithLock)
+{
+  if(WithLock)
+    {
+      if(!_system->Lock())
+	return false;
+
+      have_system_lock=true;
+    }
+
+  if(_error->PendingError())
+    return false;
+
+  pkgSourceList List;
+  if(!List.ReadMainList())
+    return _error->Error(_("The list of sources could not be read."));
+
+  // Read the caches:
+  bool Res=pkgMakeStatusCache(List, Progress, &Map, !WithLock);
+  Progress.Done();
+
+  if(!Res)
+    return _error->Error(_("The package lists or status file could not be parsed or opened."));
+
+  // Jason says this is bad.  I agree. :)
+  if(!_error->empty())
+    _error->Warning(_("You may want to update the package lists to correct these missing files"));
+
+  Cache=new pkgCache(Map);
+  if(_error->PendingError())
+    return false;
+
+  Policy=new pkgPolicy(Cache);
+  if(_error->PendingError())
+    return false;
+  if(!ReadPinFile(*Policy))
+    return false;
+
+  DCache=new aptitudeDepCache(Cache, Policy);
+  if(_error->PendingError())
+    return false;
+
+  DCache->Init(&Progress, WithLock);
+  Progress.Done();
+
+  if(_error->PendingError())
+    return false;
+
+  return true;
+}
+
+void aptitudeCacheFile::ReleaseLock()
+{
+  if(have_system_lock)
+    {
+      _system->UnLock();
+      have_system_lock=false;
+    }
+}
+
+#endif
diff -rud --new-file aptitude-0.0.7.19-orig/src/generic/aptcache.h aptitude-0.0.7.19/src/generic/aptcache.h
--- aptitude-0.0.7.19-orig/src/generic/aptcache.h	Fri Dec 15 16:12:04 2000
+++ aptitude-0.0.7.19/src/generic/aptcache.h	Mon Mar  5 16:07:17 2001
@@ -33,7 +33,8 @@
 #include <apt-pkg/depcache.h>
 
 #ifndef HAVE_LIBAPT_PKG3
-#include <apt-pkg/dpkginit.h>
+//#include <apt-pkg/dpkginit.h>
+#include <apt-pkg/rpminit.h>
 #endif
 
 class undoable;
@@ -207,7 +208,8 @@
 {
   MMap *Map;
   aptitudeDepCache *Cache;
-  pkgDpkgLock *Lock;
+  //pkgDpkgLock *Lock;
+  pkgRpmLock *Lock;
 public:
   // We look pretty much exactly like a pointer to a dep cache
   inline operator aptitudeDepCache &() {return *Cache;};
diff -rud --new-file aptitude-0.0.7.19-orig/src/main.cc aptitude-0.0.7.19/src/main.cc
--- aptitude-0.0.7.19-orig/src/main.cc	Thu Feb  1 08:20:43 2001
+++ aptitude-0.0.7.19/src/main.cc	Mon Mar  5 16:07:17 2001
@@ -43,7 +43,9 @@
 
 #include "../config.h"
 
-#include <apt-pkg/init.h>
+//#include <apt-pkg/init.h>
+#include <apt-pkg/rpmfactory.h>
+#include <apt-pkg/rpminit.h>
 
 class mypkgtree:public pkg_tree
 {
@@ -95,6 +97,11 @@
 
 int main(int argc, char *argv[])
 {
+  {
+    static RPMFactory bla;
+    static pkgRpmLock lock (false);
+  }
+
   srandom(time(0));
 
   setlocale(LC_ALL, "");
diff -rud --new-file aptitude-0.0.7.19-orig/src/pkg_columnizer.cc aptitude-0.0.7.19/src/pkg_columnizer.cc
--- aptitude-0.0.7.19-orig/src/pkg_columnizer.cc	Sat Mar  3 14:14:18 2001
+++ aptitude-0.0.7.19/src/pkg_columnizer.cc	Mon Mar  5 16:07:17 2001
@@ -28,9 +28,12 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
-#include <apt-pkg/version.h>
+//#include <apt-pkg/version.h>
 #ifdef HAVE_LIBAPT_PKG3
 #include <apt-pkg/pkgsystem.h>
+#else
+#include <apt-pkg/systemfactory.h>
+#define pkgCheckDep _system->checkDep
 #endif
 
 column_definition_list *pkg_item::pkg_columnizer::columns=NULL;
diff -rud --new-file aptitude-0.0.7.19-orig/src/pkg_info_screen.cc aptitude-0.0.7.19/src/pkg_info_screen.cc
--- aptitude-0.0.7.19-orig/src/pkg_info_screen.cc	Mon Dec 18 21:37:34 2000
+++ aptitude-0.0.7.19/src/pkg_info_screen.cc	Mon Mar  5 16:07:17 2001
@@ -69,11 +69,13 @@
       tree->add_child(new pkg_description(pkg.VersionList(), _("Description")));
       tree->add_child(new vs_staticitem(_("Priority: "),ver.PriorityType()?ver.PriorityType():"Unknown"));
       tree->add_child(new vs_staticitem(_("Section: "),pkg.Section()?pkg.Section():_("Unknown")));
-      tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
+      //tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
       tree->add_child(new vs_staticitem(_("Compressed size: "), SizeToStr(ver->Size)));
       tree->add_child(new vs_staticitem(_("Uncompressed size: "), SizeToStr(ver->InstalledSize)));
+#if 0
       if(!rec.SourcePkg().empty())
 	tree->add_child(new vs_staticitem(_("Source Package: "),rec.SourcePkg()));
+#endif
 
       setup_package_deps<pkg_item_with_generic_subtree>(pkg, ver, tree);
     }
diff -rud --new-file aptitude-0.0.7.19-orig/src/pkg_ver_item.cc aptitude-0.0.7.19/src/pkg_ver_item.cc
--- aptitude-0.0.7.19-orig/src/pkg_ver_item.cc	Sat Mar  3 14:14:38 2001
+++ aptitude-0.0.7.19/src/pkg_ver_item.cc	Mon Mar  5 16:07:17 2001
@@ -36,6 +36,8 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/strutl.h>
 
+#define pkgCheckDep _system->checkDep
+
 class pkg_ver_columnizer:public column_generator
 {
   pkgCache::VerIterator ver;
diff -rud --new-file aptitude-0.0.7.19-orig/src/pkg_ver_item.h aptitude-0.0.7.19/src/pkg_ver_item.h
--- aptitude-0.0.7.19-orig/src/pkg_ver_item.h	Sat Mar  3 14:14:59 2001
+++ aptitude-0.0.7.19/src/pkg_ver_item.h	Mon Mar  5 16:07:17 2001
@@ -28,10 +28,13 @@
 #include "pkg_grouppolicy.h"
 #include "pkg_item_with_subtree.h"
 
-#include <apt-pkg/version.h>
+//#include <apt-pkg/version.h>
 #include <apt-pkg/depcache.h>
 #ifdef HAVE_LIBAPT_PKG3
 #include <apt-pkg/pkgsystem.h>
+#else
+#include <apt-pkg/systemfactory.h>
+#define pkgVersionCompare _system->versionCompare
 #endif
 
 class pkg_ver_item:public pkg_tree_node
diff -rud --new-file aptitude-0.0.7.19-orig/src/vscreen/Makefile.in aptitude-0.0.7.19/src/vscreen/Makefile.in
--- aptitude-0.0.7.19-orig/src/vscreen/Makefile.in	Sun Mar  4 11:43:42 2001
+++ aptitude-0.0.7.19/src/vscreen/Makefile.in	Mon Mar  5 16:08:42 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -123,8 +124,12 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/columnify.P .deps/curses++.P .deps/vs_minibuf_win.P \
+.deps/vs_pager.P .deps/vs_staticitem.P .deps/vs_statuschoice.P \
+.deps/vs_statusedit.P .deps/vs_tree.P .deps/vs_treeitem.P \
+.deps/vscreen.P
 SOURCES = $(libvscreen_a_SOURCES)
 OBJECTS = $(libvscreen_a_OBJECTS)
 
@@ -132,9 +137,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/vscreen/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vscreen/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -148,9 +153,6 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -268,6 +270,11 @@
 subdir = src/vscreen
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/vscreen/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -288,32 +295,57 @@
 	      || exit 1; \
 	  fi; \
 	done
-columnify.o: columnify.cc columnify.h
-curses++.o: curses++.cc curses++.h
-vs_minibuf_win.o: vs_minibuf_win.cc vs_minibuf_win.h vscreen.h \
-	curses++.h config/colors.h
-vs_pager.o: vs_pager.cc vs_pager.h vs_minibuf_win.h vscreen.h curses++.h \
-	config/colors.h vs_statusedit.h config/keybindings.h \
-	config/../../strhash.h config/../curses++.h
-vs_staticitem.o: vs_staticitem.cc vs_staticitem.h vs_treeitem.h \
-	curses++.h config/colors.h vs_minibuf_win.h vscreen.h vs_tree.h
-vs_statuschoice.o: vs_statuschoice.cc vs_statuschoice.h vs_minibuf_win.h \
-	vscreen.h curses++.h config/colors.h config/keybindings.h \
-	config/../../strhash.h config/../curses++.h
-vs_statusedit.o: vs_statusedit.cc vs_statusedit.h vs_minibuf_win.h \
-	vscreen.h curses++.h config/colors.h config/keybindings.h \
-	config/../../strhash.h config/../curses++.h
-vs_tree.o: vs_tree.cc vs_tree.h vs_minibuf_win.h vscreen.h curses++.h \
-	config/colors.h vs_treeitem.h vs_statusedit.h \
-	config/keybindings.h config/../../strhash.h \
-	config/../curses++.h
-vs_treeitem.o: vs_treeitem.cc vs_treeitem.h curses++.h config/colors.h \
-	vs_minibuf_win.h vscreen.h vs_tree.h
-vscreen.o: vscreen.cc vscreen.h curses++.h config/keybindings.h \
-	config/../../strhash.h config/../curses++.h config/colors.h \
-	vs_tree.h vs_minibuf_win.h vs_treeitem.h vs_statusedit.h \
-	vs_statuschoice.h vs_pager.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+
+%.o: %.cc
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.cc
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-recursive
 dvi-am:
@@ -336,7 +368,7 @@
 all-am: Makefile $(LIBRARIES)
 all-redirect: all-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs: installdirs-recursive
 installdirs-am:
 
@@ -352,23 +384,25 @@
 maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-recursive
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-recursive
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -383,12 +417,14 @@
 all-recursive check-recursive installcheck-recursive info-recursive \
 dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
 maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+distclean-tags clean-tags maintainer-clean-tags distdir \
+mostlyclean-depend distclean-depend clean-depend \
+maintainer-clean-depend info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs-am installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -rud --new-file aptitude-0.0.7.19-orig/src/vscreen/config/Makefile.in aptitude-0.0.7.19/src/vscreen/config/Makefile.in
--- aptitude-0.0.7.19-orig/src/vscreen/config/Makefile.in	Sun Mar  4 11:43:43 2001
+++ aptitude-0.0.7.19/src/vscreen/config/Makefile.in	Mon Mar  5 16:08:42 2001
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -46,9 +46,10 @@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -119,8 +120,10 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
+DEP_FILES =  .deps/colors.P .deps/column_definition.P \
+.deps/keybindings.P
 SOURCES = $(libconf_a_SOURCES)
 OBJECTS = $(libconf_a_OBJECTS)
 
@@ -128,9 +131,9 @@
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .o .s
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/vscreen/config/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu src/vscreen/config/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -144,9 +147,6 @@
 
 maintainer-clean-noinstLIBRARIES:
 
-.c.o:
-	$(COMPILE) -c $<
-
 .s.o:
 	$(COMPILE) -c $<
 
@@ -204,6 +204,11 @@
 subdir = src/vscreen/config
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/vscreen/config/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -214,12 +219,57 @@
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-colors.o: colors.cc colors.h ../vscreen.h ../curses++.h ../../strhash.h
-column_definition.o: column_definition.cc column_definition.h \
-	../columnify.h
-keybindings.o: keybindings.cc keybindings.h ../../strhash.h \
-	../curses++.h ../../../config.h
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+	-rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
+
+%.o: %.cc
+	@echo '$(CXXCOMPILE) -c $<'; \
+	$(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-cp .deps/$(*F).pp .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm .deps/$(*F).pp
+
+%.lo: %.cc
+	@echo '$(LTCXXCOMPILE) -c $<'; \
+	$(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
+	  < .deps/$(*F).pp > .deps/$(*F).P; \
+	tr ' ' '\012' < .deps/$(*F).pp \
+	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+	    >> .deps/$(*F).P; \
+	rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -242,7 +292,7 @@
 all-am: Makefile $(LIBRARIES)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 
 
@@ -257,23 +307,25 @@
 maintainer-clean-generic:
 	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-noinstLIBRARIES mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
-clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-generic \
-		mostlyclean-am
+clean-am:  clean-noinstLIBRARIES clean-compile clean-tags clean-depend \
+		clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-noinstLIBRARIES distclean-compile \
-		distclean-tags distclean-generic clean-am
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-noinstLIBRARIES \
 		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean-am
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may require special tools to rebuild."
 
@@ -283,12 +335,13 @@
 clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info-am info \
+dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+install-exec install-data-am install-data install-am install \
+uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
