1 diff -ru aptitude-0.1.4/configure.in aptitude-0.1.4-AX/configure.in
2 --- aptitude-0.1.4/configure.in Tue Apr 10 13:25:42 2001
3 +++ aptitude-0.1.4-AX/configure.in Wed May 23 00:58:48 2001
8 +LIBS="$LIBS -lrpm -lrpmbuild -lrpmio -lpopt"
10 dnl Checks for libraries.
11 -AC_CHECK_LIB(curses, initscr, ,
12 +AC_CHECK_LIB(ncurses, initscr, ,
13 AC_MSG_ERROR([Can't find the curses libraries -- please install libncurses5-dev]))
14 AC_CHECK_LIB(apt-pkg, main, , AC_MSG_ERROR([Can't find the APT libraries -- please install libapt-pkg-dev]))
15 AC_CHECK_LIB(pthread, main,
16 diff -ru aptitude-0.1.4/src/Makefile.am aptitude-0.1.4-AX/src/Makefile.am
17 --- aptitude-0.1.4/src/Makefile.am Sun Mar 4 04:34:25 2001
18 +++ aptitude-0.1.4-AX/src/Makefile.am Wed May 23 00:58:16 2001
20 SUBDIRS=generic vscreen
22 localedir = $(datadir)/locale
23 -INCLUDES = -Wall -Werror -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
24 +INCLUDES = -Wall -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl #-Werror
25 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
28 diff -ru aptitude-0.1.4/src/dep_item.cc aptitude-0.1.4-AX/src/dep_item.cc
29 --- aptitude-0.1.4/src/dep_item.cc Sun Mar 18 18:53:10 2001
30 +++ aptitude-0.1.4-AX/src/dep_item.cc Wed May 23 00:59:42 2001
32 #include "generic/apt.h"
33 #include "generic/config_signal.h"
35 -#include <apt-pkg/version.h>
36 +//#include <apt-pkg/version.h>
37 +#include <apt-pkg/systemfactory.h>
39 +#define pkgCheckDep _system->checkDep
41 class pkg_depitem:public pkg_subtree
43 diff -ru aptitude-0.1.4/src/download.cc aptitude-0.1.4-AX/src/download.cc
44 --- aptitude-0.1.4/src/download.cc Sun Apr 8 22:08:43 2001
45 +++ aptitude-0.1.4-AX/src/download.cc Wed May 23 00:58:16 2001
47 #include <apt-pkg/error.h>
48 #include <apt-pkg/dpkgpm.h>
49 #include <apt-pkg/packagemanager.h>
50 +#include <apt-pkg/systemfactory.h>
51 #include <apt-pkg/sourcelist.h>
52 #include <apt-pkg/acquire.h>
53 #include <apt-pkg/acquire-item.h>
57 // Make a package manager, get ready to download
58 - pkgDPkgPM pm(*apt_cache_file);
59 + //pkgDPkgPM pm(*apt_cache_file);
60 + pkgPackageManager *pm_ = _system->CreatePackageManager(*apt_cache_file);
61 + pkgPackageManager &pm = *pm_;
62 if(!pm.GetArchives(&fetcher, &list, apt_package_records) || _error->PendingError())
64 _error->Error(_("Internal error: couldn't generate list of packages to download"));
68 fprintf(f, "Aptitude " VERSION ": log report\n\n");
69 - fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\ndpkg problems may not be completed.\n\n"));
70 + fprintf(f, _("IMPORTANT: this log only lists intended actions; actions which fail due to\nrpm problems may not be completed.\n\n"));
71 fprintf(f, _("Will install %li packages, and remove %li packages.\n"), (*apt_cache_file)->InstCount(), (*apt_cache_file)->DelCount());
72 if((*apt_cache_file)->UsrSize()>0)
73 fprintf(f, _("%li bytes of disk space will be used\n"), (long int) (*apt_cache_file)->UsrSize());
76 cerr<<_("Ack! Something bad happened while installing packages. Trying to recover:")<<endl;
77 // and this is really a hack:
78 - system("dpkg --configure -a");
79 + //system("dpkg --configure -a");
83 Only in aptitude-0.1.4-AX/src: download.cc.orig
84 diff -ru aptitude-0.1.4/src/generic/Makefile.am aptitude-0.1.4-AX/src/generic/Makefile.am
85 --- aptitude-0.1.4/src/generic/Makefile.am Mon Dec 4 04:54:18 2000
86 +++ aptitude-0.1.4-AX/src/generic/Makefile.am Wed May 23 00:58:16 2001
88 MAINTAINERCLEANFILES=Makefile.in
90 localedir = $(datadir)/locale
91 -INCLUDES = -Wall -Werror -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
92 +INCLUDES = -Wall -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl #-Werror
93 DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
96 diff -ru aptitude-0.1.4/src/generic/aptcache.cc aptitude-0.1.4-AX/src/generic/aptcache.cc
97 --- aptitude-0.1.4/src/generic/aptcache.cc Tue Apr 10 13:09:15 2001
98 +++ aptitude-0.1.4-AX/src/generic/aptcache.cc Wed May 23 00:58:16 2001
100 #include <apt-pkg/pkgsystem.h>
101 #include <apt-pkg/policy.h>
103 +#include <apt-pkg/systemfactory.h>
111 - string statefile=_config->FindDir("Dir::Aptitude::state", "/var/state/aptitude")+"pkgstates";
112 + string statefile=_config->FindDir("Dir::Aptitude::state", "/var/lib/aptitude")+"pkgstates";
114 FileFd newstate(statefile+".new", FileFd::WriteEmpty);
115 if(!newstate.IsOpen())
117 bool aptitudeCacheFile::Open(OpProgress &Progress, bool WithLock)
120 - Lock=new pkgDpkgLock;
121 + Lock=new pkgRpmLock; // pkgDpkgLock;
123 if(_error->PendingError())
129 - pkgMakeStatusCache(List, Progress);
130 + //pkgMakeStatusCache(List, Progress);
131 + _system->makeStatusCache(List, Progress);
132 if(_error->PendingError())
133 return _error->Error(_("The package lists or status file could not be parsed or opened."));
139 - Map=pkgMakeStatusCacheMem(List, Progress);
140 + //Map=pkgMakeStatusCacheMem(List, Progress);
141 + Map=_system->makeStatusCacheMem(List, Progress);
145 Only in aptitude-0.1.4-AX/src/generic: aptcache.cc.orig
146 diff -ru aptitude-0.1.4/src/generic/aptcache.h aptitude-0.1.4-AX/src/generic/aptcache.h
147 --- aptitude-0.1.4/src/generic/aptcache.h Sun Mar 18 18:53:12 2001
148 +++ aptitude-0.1.4-AX/src/generic/aptcache.h Wed May 23 00:58:16 2001
152 #include <apt-pkg/depcache.h>
153 +#include <apt-pkg/rpminit.h>
155 #include <sigc++/basic_signal.h>
160 aptitudeDepCache *Cache;
162 + //pkgDpkgLock *Lock;
165 // We look pretty much exactly like a pointer to a dep cache
166 inline operator aptitudeDepCache &() {return *Cache;};
167 Only in aptitude-0.1.4-AX/src/generic: aptcache.h.orig
168 diff -ru aptitude-0.1.4/src/main.cc aptitude-0.1.4-AX/src/main.cc
169 --- aptitude-0.1.4/src/main.cc Fri Mar 23 22:44:16 2001
170 +++ aptitude-0.1.4-AX/src/main.cc Wed May 23 00:58:16 2001
173 #include <sigc++/func_slot.h>
175 -#include <apt-pkg/init.h>
176 +//#include <apt-pkg/init.h>
177 +#include <apt-pkg/rpmfactory.h>
178 +#include <apt-pkg/rpminit.h>
184 int main(int argc, char *argv[])
187 + static RPMFactory bla;
188 + static pkgRpmLock lock;
193 setlocale(LC_ALL, "");
194 Only in aptitude-0.1.4-AX/src: main.cc.orig
195 diff -ru aptitude-0.1.4/src/pkg_columnizer.cc aptitude-0.1.4-AX/src/pkg_columnizer.cc
196 --- aptitude-0.1.4/src/pkg_columnizer.cc Sun Mar 18 18:53:11 2001
197 +++ aptitude-0.1.4-AX/src/pkg_columnizer.cc Wed May 23 00:58:16 2001
199 #ifdef HAVE_LIBAPT_PKG3
200 #include <apt-pkg/pkgsystem.h>
202 +#include <apt-pkg/systemfactory.h>
203 +#define pkgCheckDep _system->checkDep
206 column_definition_list *pkg_item::pkg_columnizer::columns=NULL;
207 column_definition_list *pkg_item::pkg_columnizer::status_columns=NULL;
208 diff -ru aptitude-0.1.4/src/pkg_info_screen.cc aptitude-0.1.4-AX/src/pkg_info_screen.cc
209 --- aptitude-0.1.4/src/pkg_info_screen.cc Sat Jan 27 02:12:37 2001
210 +++ aptitude-0.1.4-AX/src/pkg_info_screen.cc Wed May 23 00:58:16 2001
212 tree->add_child(new pkg_description(pkg.VersionList(), _("Description")));
213 tree->add_child(new vs_staticitem(_("Priority: "),ver.PriorityType()?ver.PriorityType():"Unknown"));
214 tree->add_child(new vs_staticitem(_("Section: "),pkg.Section()?pkg.Section():_("Unknown")));
215 - tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
216 + //tree->add_child(new vs_staticitem(_("Maintainer: "),rec.Maintainer()));
217 tree->add_child(new vs_staticitem(_("Compressed size: "), SizeToStr(ver->Size)));
218 tree->add_child(new vs_staticitem(_("Uncompressed size: "), SizeToStr(ver->InstalledSize)));
220 if(!rec.SourcePkg().empty())
221 tree->add_child(new vs_staticitem(_("Source Package: "),rec.SourcePkg()));
224 setup_package_deps<pkg_item_with_generic_subtree>(pkg, ver, tree, sig);
226 Only in aptitude-0.1.4-AX/src: pkg_info_screen.cc.orig
227 diff -ru aptitude-0.1.4/src/pkg_ver_item.cc aptitude-0.1.4-AX/src/pkg_ver_item.cc
228 --- aptitude-0.1.4/src/pkg_ver_item.cc Tue Apr 10 02:21:49 2001
229 +++ aptitude-0.1.4-AX/src/pkg_ver_item.cc Wed May 23 00:58:16 2001
231 #include <apt-pkg/configuration.h>
232 #include <apt-pkg/strutl.h>
234 +#define pkgCheckDep _system->checkDep
236 class pkg_ver_columnizer:public column_generator
238 pkgCache::VerIterator ver;
239 Only in aptitude-0.1.4-AX/src: pkg_ver_item.cc.orig
240 diff -ru aptitude-0.1.4/src/pkg_ver_item.h aptitude-0.1.4-AX/src/pkg_ver_item.h
241 --- aptitude-0.1.4/src/pkg_ver_item.h Sun Mar 18 18:53:11 2001
242 +++ aptitude-0.1.4-AX/src/pkg_ver_item.h Wed May 23 00:58:16 2001
244 #include "pkg_grouppolicy.h"
245 #include "pkg_item_with_subtree.h"
247 -#include <apt-pkg/version.h>
248 +/* #include <apt-pkg/version.h> */
249 #include <apt-pkg/depcache.h>
250 +#include <apt-pkg/systemfactory.h>
251 +#include <apt-pkg/depcache.h>
252 +#define pkgVersionCompare _system->versionCompare
253 #ifdef HAVE_LIBAPT_PKG3
254 #include <apt-pkg/pkgsystem.h>
256 Only in aptitude-0.1.4-AX/src: pkg_ver_item.h.orig
257 diff -ru aptitude-0.1.4/src/vs_progress.cc aptitude-0.1.4-AX/src/vs_progress.cc
258 --- aptitude-0.1.4/src/vs_progress.cc Mon Apr 9 22:42:29 2001
259 +++ aptitude-0.1.4-AX/src/vs_progress.cc Wed May 23 00:58:16 2001
264 - assert(Percent>=0 && Percent<=100);
265 + //assert(Percent>=0 && Percent<=100);
266 barsize=int(Percent*width/100.0);
268 snprintf(percent_string, 50, ": %i%%", int(Percent));
269 Only in aptitude-0.1.4-AX/src: vs_progress.cc.orig