+++ /dev/null
---- aptitude-0.2.11.1/configure.in.orig Sun Jan 19 17:59:26 2003
-+++ aptitude-0.2.11.1/configure.in Sun Jan 19 18:01:18 2003
-@@ -37,12 +37,12 @@
- AC_CHECK_HEADER(apt-pkg/policy.h, AC_DEFINE(HAVE_LIBAPT_PKG3))
- AC_CHECK_HEADER(hash_map,
- AC_DEFINE(HAVE_HASH_MAP),
-- AC_CHECK_HEADER(ext/hash_map,
-- AC_DEFINE(HAVE_EXT_HASH_MAP)))
-+ [AC_CHECK_HEADER(ext/hash_map,
-+ AC_DEFINE(HAVE_EXT_HASH_MAP))])
- AC_CHECK_HEADER(hash_set,
- AC_DEFINE(HAVE_HASH_SET),
-- AC_CHECK_HEADER(ext/hash_set,
-- AC_DEFINE(HAVE_EXT_HASH_SET)))
-+ [AC_CHECK_HEADER(ext/hash_set,
-+ AC_DEFINE(HAVE_EXT_HASH_SET))])
-
- if test x$HAVE_LIBPTHREAD = x1
- then
--- /dev/null
+From Wilfried.Weissmann@gmx.at Fri Oct 20 22:16:18 2006
+Date: Fri, 20 Oct 2006 21:15:58 +0200
+From: Wilfried Weissmann <Wilfried.Weissmann@gmx.at>
+To: Panu Matilainen <pmatilai@laiskiainen.org>
+Cc: Wilfried Weissmann <wweissmann@gmx.at>, apt-rpm@lists.laiskiainen.org
+Subject: Re: [OT] who maintains aptitude for rpm? (fwd)
+
+Hi,
+
+Here is the aptitude patch for 0.3.5.1. The work is based on the patch
+from mandriva. I did some upgrades, installs and package removals this
+week on a fedora 5 computer and I did not have any serious problems.
+When I do a update of the repository I get warnings about that there are
+no checksum files. However the update is working fine.
+
+Bye,
+Wilfried
+
+ [ Part 2: "Attached Text" ]
+
+diff -Nurp aptitude-0.3.5.1-orig/configure.ac aptitude-0.3.5.1/configure.ac
+--- aptitude-0.3.5.1-orig/configure.ac 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/configure.ac 2006-10-12 15:39:30.000000000 +0200
+@@ -23,6 +23,15 @@ AC_CHECK_LIB(pthread, main,
+ HAVE_LIBPTHREAD=1
+ , [AC_MSG_ERROR([Can't find the POSIX thread libraries])])
+
++dnl popt checking
++AC_CHECK_LIB(popt, main,
++ HAVE_POPT=1,
++ AC_MSG_ERROR([Can't find the popt library -- please install popt-devel package]))
++dnl rpm checking
++AC_CHECK_LIB(rpm, main,
++ HAVE_RPM=1,
++ AC_MSG_ERROR([Can't find the rpm library -- please install librpm-devel package]))
++
+ ALL_LINGUAS="ar bs ca cs da de el es eu fi fr gl it ja lt nb nl nn pl pt pt_BR ro ru sk tl tr vi zh_CN zh_TW"
+ AM_GNU_GETTEXT([external])
+
+@@ -145,6 +154,24 @@ then
+ [AC_MSG_ERROR([POSIX thread header not installed])])
+ fi
+
++if test x$HAVE_RPM = x1
++then
++ AC_CHECK_HEADER(rpm/rpmio.h,
++ CXXFLAGS="$CXXFLAGS -I/usr/include/rpm"
++ LDFLAGS="$LDFLAGS -lrpm"
++ [AC_DEFINE(HAVE_RPM, , [Define if rpm is available])],
++ [AC_MSG_ERROR([RPM headers not found. Please verify your build system.])])
++fi
++
++if test x$HAVE_POPT = x1
++then
++ AC_CHECK_HEADER(popt.h,
++ CXXFLAGS="$CXXFLAGS"
++ LDFLAGS="$LDFLAGS -lpopt"
++ [AC_DEFINE(HAVE_POPT, , [Define if popt is available])],
++ [AC_MSG_ERROR([POPT headers not found. Please verify your build system.])])
++fi
++
+ WERROR="-Werror"
+
+ AC_ARG_ENABLE(dynamic-backtrace,
+diff -Nurp aptitude-0.3.5.1-orig/doc/aptitude-html.xsl aptitude-0.3.5.1/doc/aptitude-html.xsl
+--- aptitude-0.3.5.1-orig/doc/aptitude-html.xsl 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/doc/aptitude-html.xsl 2006-10-12 15:39:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/chunk.xsl"/>
++<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/chunk.xsl"/>
+
+ <xsl:import href="aptitude-common.xsl"/>
+
+diff -Nurp aptitude-0.3.5.1-orig/doc/aptitude-man.xsl aptitude-0.3.5.1/doc/aptitude-man.xsl
+--- aptitude-0.3.5.1-orig/doc/aptitude-man.xsl 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/doc/aptitude-man.xsl 2006-10-12 15:39:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl"/>
++<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"/>
+
+ <xsl:template match='replaceable'>
+ <xsl:text>\fI<</xsl:text><xsl:apply-templates/><xsl:text>>\fR</xsl:text>
+diff -Nurp aptitude-0.3.5.1-orig/doc/aptitude-txt.xsl aptitude-0.3.5.1/doc/aptitude-txt.xsl
+--- aptitude-0.3.5.1-orig/doc/aptitude-txt.xsl 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/doc/aptitude-txt.xsl 2006-10-12 15:39:30.000000000 +0200
+@@ -5,7 +5,7 @@
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ version="1.0">
+
+-<xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/html/docbook.xsl"/>
++<xsl:import href="/usr/share/sgml/docbook/xsl-stylesheets/html/docbook.xsl"/>
+
+ <xsl:import href="aptitude-common.xsl"/>
+
+diff -Nurp aptitude-0.3.5.1-orig/doc/cs/aptitude.xml aptitude-0.3.5.1/doc/cs/aptitude.xml
+--- aptitude-0.3.5.1-orig/doc/cs/aptitude.xml 2006-10-11 16:06:46.000000000 +0200
++++ aptitude-0.3.5.1/doc/cs/aptitude.xml 2006-10-12 15:39:30.000000000 +0200
+@@ -1,7 +1,7 @@
+ <?xml version="1.0" encoding="iso-8859-2" standalone="no"?>
+
+ <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+-"file:///usr/share/xml/docbook/schema/dtd/4.2/docbookx.dtd" [
++"file:///usr/share/sgml/docbook/xml-dtd-4.2-1.0-30/docbookx.dtd" [
+ <!ENTITY aptitude "<command>aptitude</command>">
+ <!ENTITY apt '<systemitem class="library">apt</systemitem>'>
+ <!ENTITY dselect '<command>dselect</command>'>
+diff -Nurp aptitude-0.3.5.1-orig/doc/cs/Makefile.am aptitude-0.3.5.1/doc/cs/Makefile.am
+--- aptitude-0.3.5.1-orig/doc/cs/Makefile.am 2006-10-11 16:06:46.000000000 +0200
++++ aptitude-0.3.5.1/doc/cs/Makefile.am 2006-10-12 15:39:30.000000000 +0200
+@@ -59,7 +59,7 @@ doc-html-stamp: aptitude.xml ../aptitude
+
+ mkdir output-html/images/
+ ln -f $(srcdir)/images/*.png output-html/images/
+- for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
+- for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
++ for x in caution important note tip warning; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.png output-html/images/; done
++ for x in home next prev up; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.gif output-html/images/; done
+
+ touch doc-html-stamp
+diff -Nurp aptitude-0.3.5.1-orig/doc/de/Makefile.am aptitude-0.3.5.1/doc/de/Makefile.am
+--- aptitude-0.3.5.1-orig/doc/de/Makefile.am 2006-10-11 16:06:46.000000000 +0200
++++ aptitude-0.3.5.1/doc/de/Makefile.am 2006-10-12 15:39:30.000000000 +0200
+@@ -61,8 +61,8 @@ doc-html-stamp: $(XMLSOURCES) $(srcdir)/
+
+ mkdir output-html/images/
+ ln -f $(srcdir)/images/*.png output-html/images/
+- for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
+- for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
++ for x in caution important note tip warning; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.png output-html/images/; done
++ for x in home next prev up; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.gif output-html/images/; done
+
+ touch doc-html-stamp
+
+diff -Nurp aptitude-0.3.5.1-orig/doc/en/Makefile.am aptitude-0.3.5.1/doc/en/Makefile.am
+--- aptitude-0.3.5.1-orig/doc/en/Makefile.am 2006-10-11 16:06:46.000000000 +0200
++++ aptitude-0.3.5.1/doc/en/Makefile.am 2006-10-12 15:39:30.000000000 +0200
+@@ -53,7 +53,7 @@ doc-html-stamp: aptitude.xml manpage.xml
+
+ mkdir output-html/images/
+ ln -f $(srcdir)/images/*.png output-html/images/
+- for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
+- for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
++ for x in caution important note tip warning; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.png output-html/images/; done
++ for x in home next prev up; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.gif output-html/images/; done
+
+ touch doc-html-stamp
+diff -Nurp aptitude-0.3.5.1-orig/doc/fi/Makefile.am aptitude-0.3.5.1/doc/fi/Makefile.am
+--- aptitude-0.3.5.1-orig/doc/fi/Makefile.am 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/doc/fi/Makefile.am 2006-10-12 15:39:30.000000000 +0200
+@@ -60,7 +60,7 @@ doc-html-stamp: aptitude.xml manpage.xml
+
+ mkdir output-html/images/
+ ln -f $(srcdir)/images/*.png output-html/images/
+- for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
+- for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
++ for x in caution important note tip warning; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.png output-html/images/; done
++ for x in home next prev up; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.gif output-html/images/; done
+
+ touch doc-html-stamp
+diff -Nurp aptitude-0.3.5.1-orig/doc/fr/Makefile.am aptitude-0.3.5.1/doc/fr/Makefile.am
+--- aptitude-0.3.5.1-orig/doc/fr/Makefile.am 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/doc/fr/Makefile.am 2006-10-12 15:39:30.000000000 +0200
+@@ -56,7 +56,7 @@ doc-html-stamp: aptitude.xml manpage.xml
+
+ mkdir output-html/images/
+ ln -f $(srcdir)/images/*.png output-html/images/
+- for x in caution important note tip warning; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.png output-html/images/; done
+- for x in home next prev up; do ln -s /usr/share/xml/docbook/stylesheet/nwalsh/images/$$x.gif output-html/images/; done
++ for x in caution important note tip warning; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.png output-html/images/; done
++ for x in home next prev up; do ln -s /usr/share/sgml/docbook/xsl-stylesheets/images/$$x.gif output-html/images/; done
+
+ touch doc-html-stamp
+diff -Nurp aptitude-0.3.5.1-orig/Makefile.am aptitude-0.3.5.1/Makefile.am
+--- aptitude-0.3.5.1-orig/Makefile.am 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/Makefile.am 2006-10-12 15:39:30.000000000 +0200
+@@ -17,12 +17,13 @@ EXTRA_DIST = config.rpath ChangeLog.SVN
+ $(TLMANPAGES) $(TLHELPTXTS)
+
+ pkgdatadir=$(datadir)/$(PACKAGE)
++pkgstatedir=$(localstatedir)/$(PACKAGE)
+
+ pkgdata_DATA = $(TLHELPTXTS) COPYING NEWS \
+ function_groups function_pkgs aptitude-defaults
+
+ install-data-local:
+- [ -d $(DESTDIR)$(STATEDIR) ] || $(mkinstalldirs) $(DESTDIR)$(STATEDIR)
++ [ -d $(DESTDIR)$(pkgstatedir) ] || $(mkinstalldirs) $(DESTDIR)$(pkgstatedir)
+ # FIXME: this really ought to use the autoconf directory variables
+
+ for l in $(MANPAGE_LOCALES); do \
+@@ -31,7 +32,7 @@ install-data-local:
+ done
+
+ uninstall-local:
+- rm -fr $(DESTDIR)$(STATEDIR)
++ rm -fr $(DESTDIR)$(pkgstatedir)
+ # Is -r a good idea here?
+
+
+diff -Nurp aptitude-0.3.5.1-orig/src/cmdline/cmdline_changelog.cc aptitude-0.3.5.1/src/cmdline/cmdline_changelog.cc
+--- aptitude-0.3.5.1-orig/src/cmdline/cmdline_changelog.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_changelog.cc 2006-10-12 15:39:47.000000000 +0200
+@@ -14,7 +14,6 @@
+ #include <generic/apt/pkg_changelog.h>
+
+ #include <apt-pkg/error.h>
+-#include <apt-pkg/metaindex.h>
+ #include <apt-pkg/progress.h>
+ #include <apt-pkg/sourcelist.h>
+ #include <apt-pkg/srcrecords.h>
+@@ -23,6 +22,7 @@
+
+ using namespace std;
+
++#if 0
+ /** Represents the information needed to retrieve a changelog. */
+ struct changelog_entity
+ {
+@@ -54,6 +54,7 @@ struct changelog_entity
+ pkg = other.pkg;
+ ver = other.ver;
+ section = other.section;
++ return *this;
+ }
+ };
+
+@@ -185,9 +186,12 @@ changelog_entity find_src_archive(pkgSou
+
+ return changelog_entity();
+ }
++#endif
+
+ bool do_cmdline_changelog(const vector<string> &packages)
+ {
++ _error->Error(_("Somebody was too lazy to implement this! FIXME"));
++#if 0
+ const char *pager="/usr/bin/sensible-pager";
+
+ if(access("/usr/bin/sensible-pager", X_OK)!=0)
+@@ -310,6 +314,7 @@ bool do_cmdline_changelog(const vector<s
+ // Run the user's pager.
+ system((string(pager) + " " + filename.get_name()).c_str());
+ }
++#endif
+ }
+
+ // TODO: fetch them all in one go.
+diff -Nurp aptitude-0.3.5.1-orig/src/cmdline/cmdline_prompt.cc aptitude-0.3.5.1/src/cmdline/cmdline_prompt.cc
+--- aptitude-0.3.5.1-orig/src/cmdline/cmdline_prompt.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_prompt.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -21,10 +21,10 @@
+ #include <vscreen/vscreen.h>
+
+ #include <apt-pkg/algorithms.h>
+-#include <apt-pkg/dpkgpm.h>
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/sourcelist.h>
+ #include <apt-pkg/strutl.h>
++#include <apt-pkg/pkgsystem.h>
+
+ using namespace std;
+
+@@ -51,7 +51,7 @@ static bool get_fetchinfo(fetchinfo &f)
+ if(!l.ReadMainList())
+ return _error->Error(_("Couldn't read list of sources"));
+
+- pkgDPkgPM pm(*apt_cache_file);
++ pkgPackageManager &pm = *_system->CreatePM(*apt_cache_file);
+ pm.GetArchives(&fetcher, &l, apt_package_records);
+
+ f.FetchBytes=fetcher.FetchNeeded();
+diff -Nurp aptitude-0.3.5.1-orig/src/dep_item.cc aptitude-0.3.5.1/src/dep_item.cc
+--- aptitude-0.3.5.1-orig/src/dep_item.cc 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/dep_item.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -31,7 +31,8 @@
+ #include <generic/apt/apt.h>
+ #include <generic/apt/config_signal.h>
+
+-#include <apt-pkg/version.h>
++#include <apt-pkg/pkgsystem.h>
++#include <apt-pkg/configuration.h>
+
+ using namespace std;
+ using namespace __gnu_cxx;
+diff -Nurp aptitude-0.3.5.1-orig/src/desc_parse.cc aptitude-0.3.5.1/src/desc_parse.cc
+--- aptitude-0.3.5.1-orig/src/desc_parse.cc 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/desc_parse.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -72,10 +72,14 @@ static fragment *make_level_fragment(con
+ wstring::size_type &start)
+ {
+ vector<fragment*> fragments;
++
++#if 0
+ bool first=true;
++#endif
+
+ while(start<desc.size())
+ {
++#if 0
+ wstring::size_type loc=start;
+ unsigned int nspaces;
+
+@@ -225,6 +229,19 @@ static fragment *make_level_fragment(con
+ fragments.push_back(wrapbox(text_fragment(par)));
+ }
+ }
++#endif
++ wstring::size_type amt=0;
++
++ while(start+amt<desc.size() && desc[start+amt]!=L'\n')
++ ++amt;
++
++ fragments.push_back(wrapbox(text_fragment(wstring(desc, start, amt))));
++
++ start+=amt;
++
++ // Skip the newline
++ if(start<desc.size())
++ ++start;
+ }
+
+ return sequence_fragment(fragments);
+@@ -235,13 +252,6 @@ fragment *make_desc_fragment(const wstri
+ wstring::size_type loc=0;
+ vector<fragment*> fragments;
+
+- // Skip the short description
+- while(loc<desc.size() && desc[loc]!=L'\n')
+- ++loc;
+-
+- if(loc<desc.size()) // Skip the '\n'
+- ++loc;
+-
+ // Skip leading whitespace on the first line if there is any.
+ if(loc<desc.size() && desc[loc] == L' ')
+ ++loc;
+diff -Nurp aptitude-0.3.5.1-orig/src/download_item.cc aptitude-0.3.5.1/src/download_item.cc
+--- aptitude-0.3.5.1-orig/src/download_item.cc 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/download_item.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -42,8 +42,11 @@ style download_item::get_normal_style()
+ return vs_treeitem::get_normal_style()+get_style("DownloadHit");
+ case pkgAcquire::Item::StatError:
+ return vs_treeitem::get_normal_style()+get_style("Error");
++// Not yet implemented in apt 0.5
++#if 0
+ case pkgAcquire::Item::StatAuthError:
+ return vs_treeitem::get_normal_style()+get_style("Error");
++#endif
+ default:
+ assert(0);
+ }
+@@ -104,9 +107,12 @@ void download_item::paint(vs_tree *win,
+ case pkgAcquire::Item::StatError:
+ output+=item.Owner->ErrorText;
+ break;
++// Not yet implemented in apt 0.5
++#if 0
+ case pkgAcquire::Item::StatAuthError:
+ output+=item.Owner->ErrorText;
+ break;
++#endif
+ }
+
+ win->show_string_as_progbar(0, y, transcode(output),
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/apt.cc aptitude-0.3.5.1/src/generic/apt/apt.cc
+--- aptitude-0.3.5.1-orig/src/generic/apt/apt.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/apt.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -597,6 +597,8 @@ bool package_recommended(const pkgCache:
+
+ bool package_trusted(const pkgCache::VerIterator &ver)
+ {
++// Not yet implemented in apt 0.5
++#if 0
+ for(pkgCache::VerFileIterator i = ver.FileList(); !i.end(); ++i)
+ {
+ pkgIndexFile *index;
+@@ -604,7 +606,7 @@ bool package_trusted(const pkgCache::Ver
+ if(apt_source_list->FindIndex(i.File(), index) && !index->IsTrusted())
+ return false;
+ }
+-
++#endif
+ return true;
+ }
+
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/aptitudepolicy.h aptitude-0.3.5.1/src/generic/apt/aptitudepolicy.h
+--- aptitude-0.3.5.1-orig/src/generic/apt/aptitudepolicy.h 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/aptitudepolicy.h 2006-10-12 15:39:30.000000000 +0200
+@@ -17,7 +17,7 @@
+ class aptitudePolicy:public pkgPolicy
+ {
+ public:
+- aptitudePolicy::aptitudePolicy(pkgCache *Owner)
++ aptitudePolicy(pkgCache *Owner)
+ :pkgPolicy(Owner) {}
+
+ bool IsImportantDep(pkgCache::DepIterator dep);
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/aptitude_resolver_universe.h aptitude-0.3.5.1/src/generic/apt/aptitude_resolver_universe.h
+--- aptitude-0.3.5.1-orig/src/generic/apt/aptitude_resolver_universe.h 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/aptitude_resolver_universe.h 2006-10-12 15:39:30.000000000 +0200
+@@ -20,6 +20,8 @@
+ #ifndef APTITUDE_RESOLVER_UNIVERSE_H
+ #define APTITUDE_RESOLVER_UNIVERSE_H
+
++#include <assert.h>
++
+ #include <apt-pkg/pkgcache.h>
+ #include <apt-pkg/pkgsystem.h>
+ #include <apt-pkg/version.h>
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/download_install_manager.cc aptitude-0.3.5.1/src/generic/apt/download_install_manager.cc
+--- aptitude-0.3.5.1-orig/src/generic/apt/download_install_manager.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/download_install_manager.cc 2006-10-12 15:39:47.000000000 +0200
+@@ -26,15 +26,16 @@
+ #include <aptitude.h>
+
+ #include <apt-pkg/acquire-item.h>
+-#include <apt-pkg/dpkgpm.h>
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/sourcelist.h>
++#include <apt-pkg/pkgsystem.h>
+
+ using namespace std;
+
+ download_install_manager::download_install_manager(bool _download_only)
+- : log(NULL), download_only(_download_only), pm(new pkgDPkgPM(*apt_cache_file))
++ : log(NULL), download_only(_download_only)
+ {
++ pm=_system->CreatePM(*apt_cache_file);
+ }
+
+ download_install_manager::~download_install_manager()
+@@ -133,13 +134,12 @@ download_manager::result download_instal
+
+ result rval = success;
+
+- pkgPackageManager::OrderResult pmres = pm->DoInstall(aptcfg->FindI("APT::Status-Fd", -1));
++ pkgPackageManager::OrderResult pmres = pm->DoInstall();
+ switch(pmres)
+ {
+ case pkgPackageManager::Failed:
+ _error->DumpErrors();
+- cerr << _("A package failed to install. Trying to recover:") << endl;
+- system("dpkg --configure -a");
++ cerr << _("A package failed to install.") << endl;
+ _error->Discard();
+
+ rval = failure;
+@@ -162,7 +162,7 @@ download_manager::result download_instal
+ if(!apt_cache_file->GainLock())
+ // This really shouldn't happen.
+ {
+- _error->Error(_("Could not regain the system lock! (Perhaps another apt or dpkg is running?)"));
++ _error->Error(_("Could not regain the system lock! (Perhaps another apt or rpm is running?)"));
+ return failure;
+ }
+
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/download_manager.cc aptitude-0.3.5.1/src/generic/apt/download_manager.cc
+--- aptitude-0.3.5.1-orig/src/generic/apt/download_manager.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/download_manager.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -36,5 +36,5 @@ pkgAcquire::RunResult download_manager::
+
+ pkgAcquire::RunResult download_manager::do_download(int PulseInterval)
+ {
+- return fetcher->Run(PulseInterval);
++ return fetcher->Run();
+ }
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/log.cc aptitude-0.3.5.1/src/generic/apt/log.cc
+--- aptitude-0.3.5.1-orig/src/generic/apt/log.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/log.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -66,7 +66,7 @@ bool do_log(const string &log,
+
+ fprintf(f, "Aptitude " VERSION ": %s\n%s\n\n",
+ _("log report"), timestr.c_str());
+- 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());
+
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/tags.cc aptitude-0.3.5.1/src/generic/apt/tags.cc
+--- aptitude-0.3.5.1-orig/src/generic/apt/tags.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/tags.cc 2006-10-12 15:39:47.000000000 +0200
+@@ -30,6 +30,7 @@
+
+ #include <ctype.h>
+ #include <string.h>
++#include <assert.h>
+
+ #include <sigc++/functors/mem_fun.h>
+
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/apt/tasks.cc aptitude-0.3.5.1/src/generic/apt/tasks.cc
+--- aptitude-0.3.5.1-orig/src/generic/apt/tasks.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/tasks.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -48,6 +48,7 @@ static void update_tasks(const pkgCache:
+ // tasks structure.
+ assert(tasks_by_package);
+
++#if 0
+ list<string> &lst=tasks_by_package[pkg->ID];
+
+ lst.clear();
+@@ -90,6 +91,7 @@ static void update_tasks(const pkgCache:
+ if(loc!=tasks.size())
+ lst.push_back(string(tasks, loc));
+ }
++#endif
+ }
+
+ bool task::keys_present()
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/problemresolver/dummy_universe.h aptitude-0.3.5.1/src/generic/problemresolver/dummy_universe.h
+--- aptitude-0.3.5.1-orig/src/generic/problemresolver/dummy_universe.h 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/problemresolver/dummy_universe.h 2006-10-12 15:39:30.000000000 +0200
+@@ -28,6 +28,7 @@
+ #include <set>
+ #include <string>
+ #include <vector>
++#include <assert.h>
+
+ #include <generic/util/exception.h>
+
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/util/temp.h aptitude-0.3.5.1/src/generic/util/temp.h
+--- aptitude-0.3.5.1-orig/src/generic/util/temp.h 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/util/temp.h 2006-10-12 15:39:30.000000000 +0200
+@@ -25,6 +25,8 @@
+
+ #include <string>
+
++#include <assert.h>
++
+ #include "exception.h"
+ #include "threads.h"
+
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/util/threads.h aptitude-0.3.5.1/src/generic/util/threads.h
+--- aptitude-0.3.5.1-orig/src/generic/util/threads.h 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/util/threads.h 2006-10-12 15:39:30.000000000 +0200
+@@ -586,7 +586,7 @@ namespace threads
+ * performed.
+ */
+ template<typename Mutator>
+- void box::update(const Mutator &m);
++ void update(const Mutator &m);
+ };
+
+ /** A box specialized for 'void'; may make it easier to write
+@@ -621,7 +621,7 @@ namespace threads
+ bool timed_put(const timespec &until);
+
+ template<typename Mutator>
+- void box::update(const Mutator &m)
++ void update(const Mutator &m)
+ {
+ take();
+ try
+diff -Nurp aptitude-0.3.5.1-orig/src/generic/util/util.cc aptitude-0.3.5.1/src/generic/util/util.cc
+--- aptitude-0.3.5.1-orig/src/generic/util/util.cc 2006-10-11 16:06:47.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/util/util.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include <sys/types.h>
+ #include <time.h>
+ #include <unistd.h>
++#include <assert.h>
+
+ using namespace std;
+
+diff -Nurp aptitude-0.3.5.1-orig/src/pkg_info_screen.cc aptitude-0.3.5.1/src/pkg_info_screen.cc
+--- aptitude-0.3.5.1-orig/src/pkg_info_screen.cc 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/pkg_info_screen.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -79,7 +79,7 @@ void pkg_grouppolicy_info::setup_package
+ pkgRecords::Parser &rec=apt_package_records->Lookup(ver.FileList());
+
+ string desc=apt_package_records->Lookup(ver.FileList()).LongDesc();
+- string shortdesc=string(desc, 0, desc.find('\n'));
++ string shortdesc=apt_package_records->Lookup(ver.FileList()).ShortDesc();
+
+ vector<fragment*> frags;
+
+diff -Nurp aptitude-0.3.5.1-orig/src/vscreen/vs_menubar.cc aptitude-0.3.5.1/src/vscreen/vs_menubar.cc
+--- aptitude-0.3.5.1-orig/src/vscreen/vs_menubar.cc 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/vs_menubar.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -309,7 +309,8 @@ int vs_menubar::width_request()
+ }
+
+ // Expand the width as needed to account for active menus.
+- for(activemenulist::iterator i=active_menus.begin(), num=0;
++ int num=0;
++ for(activemenulist::iterator i=active_menus.begin();
+ i!=active_menus.end();
+ i++, num++)
+ {
+@@ -345,7 +346,8 @@ int vs_menubar::height_request(int w)
+
+ int h=always_visible?1:0;
+
+- for(activemenulist::iterator i=active_menus.begin(), num=0;
++ int num=0;
++ for(activemenulist::iterator i=active_menus.begin();
+ i!=active_menus.end();
+ i++, num++)
+ h=max(h, 1+(*i)->height_request(w));
+diff -Nurp aptitude-0.3.5.1-orig/src/vscreen/vs_stacked.h aptitude-0.3.5.1/src/vscreen/vs_stacked.h
+--- aptitude-0.3.5.1-orig/src/vscreen/vs_stacked.h 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/vs_stacked.h 2006-10-12 15:39:30.000000000 +0200
+@@ -75,7 +75,7 @@ public:
+
+ void dispatch_mouse(short id, int x, int y, int z, mmask_t bstate);
+
+- vs_widget_ref vs_stacked::get_focus();
++ vs_widget_ref get_focus();
+
+ void show_all();
+
+diff -Nurp aptitude-0.3.5.1-orig/src/vscreen/vs_table.h aptitude-0.3.5.1/src/vscreen/vs_table.h
+--- aptitude-0.3.5.1-orig/src/vscreen/vs_table.h 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/vs_table.h 2006-10-12 15:39:30.000000000 +0200
+@@ -123,14 +123,14 @@ private:
+ */
+ void get_col_contents(std::vector<std::vector<child_info *> > col_contents);
+
+- void vs_table::alloc_ideal_widths(std::vector<int> &col_sizes);
+- void vs_table::expand_widths(std::vector<int> &col_sizes, int target_w);
+- void vs_table::shrink_widths(std::vector<int> &col_sizes, int target_w);
+- void vs_table::alloc_ideal_heights(std::vector<int> &row_sizes,
++ void alloc_ideal_widths(std::vector<int> &col_sizes);
++ void expand_widths(std::vector<int> &col_sizes, int target_w);
++ void shrink_widths(std::vector<int> &col_sizes, int target_w);
++ void alloc_ideal_heights(std::vector<int> &row_sizes,
+ const std::vector<int> &col_sizes);
+- void vs_table::expand_heights(std::vector<int> &row_sizes, int target_h);
+- void vs_table::shrink_heights(std::vector<int> &row_sizes, int target_h);
+- void vs_table::alloc_child_sizes(const std::vector<int> &col_sizes,
++ void expand_heights(std::vector<int> &row_sizes, int target_h);
++ void shrink_heights(std::vector<int> &row_sizes, int target_h);
++ void alloc_child_sizes(const std::vector<int> &col_sizes,
+ const std::vector<int> &row_sizes);
+
+
+diff -Nurp aptitude-0.3.5.1-orig/src/vscreen/vs_tree.h aptitude-0.3.5.1/src/vscreen/vs_tree.h
+--- aptitude-0.3.5.1-orig/src/vscreen/vs_tree.h 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/vs_tree.h 2006-10-12 15:39:30.000000000 +0200
+@@ -141,8 +141,8 @@ public:
+ */
+ int height_request(int w);
+
+- bool vs_tree::get_cursorvisible();
+- point vs_tree::get_cursorloc();
++ bool get_cursorvisible();
++ point get_cursorloc();
+ virtual bool focus_me() {return true;}
+ virtual void paint(const style &st);
+ virtual void dispatch_mouse(short id, int x, int y, int z, mmask_t bstate);
+diff -Nurp aptitude-0.3.5.1-orig/src/vs_progress.cc aptitude-0.3.5.1/src/vs_progress.cc
+--- aptitude-0.3.5.1-orig/src/vs_progress.cc 2006-10-11 16:06:48.000000000 +0200
++++ aptitude-0.3.5.1/src/vs_progress.cc 2006-10-12 15:39:30.000000000 +0200
+@@ -37,7 +37,8 @@ void vs_progress::paint(const style &st)
+
+ if(!Op.empty())
+ {
+- assert(Percent>=0 && Percent<=100);
++ if ( Percent > 100 )
++ Percent = 100;
+ barsize=int(Percent*width/100.0);
+
+ snprintf(percent_string, 50, ": %i%%", int(Percent));
--- /dev/null
+--- aptitude-0.3.5.1/src/generic/apt/apt.cc.orig 2015-02-15 11:14:01.579889294 +0100
++++ aptitude-0.3.5.1/src/generic/apt/apt.cc 2015-02-15 12:07:14.543088626 +0100
+@@ -196,7 +196,7 @@
+
+ if(!f)
+ {
+- _error->Errno(_("Unable to open %s for writing"), cfgloc.c_str());
++ _error->Errno("ofstream::ofstream", _("Unable to open %s for writing"), cfgloc.c_str());
+ return;
+ }
+
+@@ -206,7 +206,7 @@
+
+ if(rename((cfgloc+".new").c_str(), cfgloc.c_str())!=0)
+ {
+- _error->Errno(_("Unable to replace %s with new configuration file"), cfgloc.c_str());
++ _error->Errno("rename", _("Unable to replace %s with new configuration file"), cfgloc.c_str());
+ return;
+ }
+ }
+--- aptitude-0.3.5.1/src/generic/apt/log.cc.orig 2015-02-15 12:10:52.026412833 +0100
++++ aptitude-0.3.5.1/src/generic/apt/log.cc 2015-02-15 12:11:36.609744295 +0100
+@@ -50,7 +50,7 @@
+
+ if(!f)
+ {
+- _error->Errno(_("Unable to open %s to log actions"), log.c_str());
++ _error->Errno("open", _("Unable to open %s to log actions"), log.c_str());
+
+ return false;
+ }
+--- aptitude-0.3.5.1/src/edit_pkg_hier.cc.orig 2005-10-05 08:55:21.000000000 +0200
++++ aptitude-0.3.5.1/src/edit_pkg_hier.cc 2015-02-15 13:32:00.019541875 +0100
+@@ -283,7 +283,7 @@
+
+ if(!f)
+ {
+- _error->Errno(_("Couldn't open for writing"), file.c_str());
++ _error->Errno("fopen", _("Couldn't open for writing"), file.c_str());
+ return;
+ }
+
+++ /dev/null
---- aptitude-0.2.11.1/src/generic/config_signal.h.orig Thu Nov 22 16:20:01 2001
-+++ aptitude-0.2.11.1/src/generic/config_signal.h Sun Jan 19 14:12:11 2003
-@@ -59,7 +59,7 @@
- // http fetcher.
- Configuration *real_config, *theme_config;
-
-- typedef std::hash_map<string, SigC::Signal1<void, string> *> connhash;
-+ typedef __gnu_cxx::hash_map<string, SigC::Signal1<void, string> *> connhash;
-
- connhash conn_table;
-
---- aptitude-0.2.11.1/src/generic/pkg_hier.cc.orig Sat Aug 25 16:27:33 2001
-+++ aptitude-0.2.11.1/src/generic/pkg_hier.cc Sun Jan 19 14:16:40 2003
-@@ -12,6 +12,7 @@
- #include "../aptitude.h"
-
- using namespace std;
-+using namespace __gnu_cxx;
-
- void pkg_hier::visit_item(pkg_hier::item *item, void *parent_data,
- pkg_hier::hierarchy_realizer *realizer)
---- aptitude-0.2.11.1/src/generic/pkg_hier.h.orig Sat Aug 25 16:27:33 2001
-+++ aptitude-0.2.11.1/src/generic/pkg_hier.h Sun Jan 19 14:13:29 2003
-@@ -64,7 +64,7 @@
- struct item
- {
- std::string name;
-- std::hash_set<std::string> parents;
-+ __gnu_cxx::hash_set<std::string> parents;
-
- // HACK: Used to build the hierarchy top-down. Calls an appropriate
- // routine in the given hierarchy class. parent_data is an opaque
-@@ -140,8 +140,8 @@
- // Used so that group numbers are contiguous and unique
- int max_group_id;
-
-- typedef std::hash_map<std::string, item> pkgmap;
-- typedef std::hash_map<std::string, group> groupmap;
-+ typedef __gnu_cxx::hash_map<std::string, item> pkgmap;
-+ typedef __gnu_cxx::hash_map<std::string, group> groupmap;
-
- pkgmap pkgs;
- groupmap groups;
---- aptitude-0.2.11.1/src/generic/strhash.h.orig Fri Aug 10 03:24:36 2001
-+++ aptitude-0.2.11.1/src/generic/strhash.h Sun Jan 19 14:15:13 2003
-@@ -26,11 +26,11 @@
- #include <string>
-
- #if defined(HAVE_HASH_MAP) || defined(HAVE_EXT_HASH_MAP)
--namespace std
-+namespace __gnu_cxx
- {
-- struct hash<string>
-+ struct hash<std::string>
- {
-- inline size_t operator()(const string &s) const
-+ inline size_t operator()(const std::string &s) const
- {
- return hash<char *>()(s.c_str());
- }
---- aptitude-0.2.11.1/src/vscreen/config/colors.cc.orig Sat Mar 16 04:40:13 2002
-+++ aptitude-0.2.11.1/src/vscreen/config/colors.cc Sun Jan 19 14:25:58 2003
-@@ -40,6 +40,7 @@
- #include "../../generic/strhash.h"
-
- using namespace std;
-+using namespace __gnu_cxx;
-
- int npairs=1;
- // FIXME: is this right? I --assume-- that it is; the curses documentation
---- aptitude-0.2.11.1/src/vscreen/config/keybindings.cc.orig Sat Mar 16 04:40:13 2002
-+++ aptitude-0.2.11.1/src/vscreen/config/keybindings.cc Sun Jan 19 14:27:04 2003
-@@ -32,6 +32,7 @@
- #include <ctype.h>
-
- using namespace std;
-+using namespace __gnu_cxx;
-
- keybindings global_bindings;
-
---- aptitude-0.2.11.1/src/vscreen/config/keybindings.h.orig Sat Mar 16 04:40:13 2002
-+++ aptitude-0.2.11.1/src/vscreen/config/keybindings.h Sun Jan 19 14:26:47 2003
-@@ -46,7 +46,7 @@
-
- class keybindings
- {
-- std::hash_map<std::string, keybinding> keymap;
-+ __gnu_cxx::hash_map<std::string, keybinding> keymap;
-
- keybindings *parent;
- public:
-@@ -57,7 +57,7 @@
- keybinding get(std::string tag)
- // Returns the keybinding for the given string. Almost never needed.
- {
-- std::hash_map<std::string, keybinding>::iterator found=keymap.find(tag);
-+ __gnu_cxx::hash_map<std::string, keybinding>::iterator found=keymap.find(tag);
-
- if(found==keymap.end())
- return keybinding();
---- aptitude-0.2.11.1/src/vscreen/vs_subtree.h.orig Sat Apr 6 22:38:38 2002
-+++ aptitude-0.2.11.1/src/vscreen/vs_subtree.h Sun Jan 19 14:43:56 2003
-@@ -39,7 +39,7 @@
- protected:
-
- typedef list<childtype *> child_list;
-- typedef child_list::iterator child_iterator;
-+ typedef typename child_list::iterator child_iterator;
-
- class levelref:public vs_tree_levelref
- {
---- aptitude-0.2.11.1/src/vscreen/vs_treeitem.cc.orig Sat Mar 16 04:40:13 2002
-+++ aptitude-0.2.11.1/src/vscreen/vs_treeitem.cc Sun Jan 19 14:30:23 2003
-@@ -14,7 +14,7 @@
- }
-
- void vs_treeitem::paint(vs_tree *win, int y, bool hierarchical, string str,
-- int depth_shift=2)
-+ int depth_shift /* =2 */)
- {
- int width, height;
- int basex=hierarchical?depth_shift*get_depth():0;
---- aptitude-0.2.11.1/src/vscreen/vs_util.cc.orig Thu Nov 22 15:26:18 2001
-+++ aptitude-0.2.11.1/src/vscreen/vs_util.cc Sun Jan 19 14:30:51 2003
-@@ -171,7 +171,7 @@
- }
-
- vscreen_widget *vs_dialog_fileview(string fn,
-- Slot0Arg okslot=NULL)
-+ Slot0Arg okslot /* =NULL */)
- {
- return vs_dialog_fileview(fn, okslot,
- get_color("DefaultWidgetBackground")|A_REVERSE);
---- aptitude-0.2.11.1/src/dep_item.cc.orig Sun Mar 24 19:50:17 2002
-+++ aptitude-0.2.11.1/src/dep_item.cc Sun Jan 19 14:47:14 2003
-@@ -214,7 +214,7 @@
- set_root(setup_new_root(pkg, ver), true);
- }
-
--typedef hash_map<string, pkg_subtree *> tree_map;
-+typedef __gnu_cxx::hash_map<string, pkg_subtree *> tree_map;
-
- template<class tree_type>
- void setup_package_deps(const pkgCache::PkgIterator &pkg,
---- aptitude-0.2.11.1/src/download_screen.h.orig Sat Mar 16 04:40:11 2002
-+++ aptitude-0.2.11.1/src/download_screen.h Sun Jan 19 14:48:52 2003
-@@ -46,7 +46,7 @@
- class download_item;
-
- #if defined(HAVE_HASH_MAP) || defined(HAVE_EXT_HASH_MAP)
--namespace std {
-+namespace __gnu_cxx {
- struct hash<void *>
- {
- size_t operator()(void * __x) const { return (size_t) __x; }
-@@ -67,7 +67,7 @@
-
- class download_screen:public vs_tree, public pkgAcquireStatus
- {
-- typedef std::hash_map<void *, download_item *> downloadmap;
-+ typedef __gnu_cxx::hash_map<void *, download_item *> downloadmap;
- downloadmap active_items;
- // Makes it easy to find a currently downloading item when we get a hit
- // for it.
---- aptitude-0.2.11.1/src/edit_pkg_hier.cc.orig Fri Sep 14 23:32:49 2001
-+++ aptitude-0.2.11.1/src/edit_pkg_hier.cc Sun Jan 19 14:49:41 2003
-@@ -14,6 +14,7 @@
- #include <vscreen/vs_subtree.h>
-
- using namespace std;
-+using namespace __gnu_cxx;
-
- // Stores a group (name) and a Y/N state
- class vs_hier_editor::vs_hier_item:public SigC::Object, public vs_treeitem
---- aptitude-0.2.11.1/src/pkg_grouppolicy.cc.orig Sat Apr 6 22:42:00 2002
-+++ aptitude-0.2.11.1/src/pkg_grouppolicy.cc Sun Jan 19 14:52:08 2003
-@@ -32,6 +32,7 @@
- #include <map>
-
- using namespace std;
-+using namespace __gnu_cxx;
-
- // This special tree munges its tag to allow an integer to be prepended to it.
- // Ok, it's a dreadful hack. I admit it.
--- /dev/null
+--- aptitude-0.3.5.1/src/generic/problemresolver/test.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/problemresolver/test.cc 2015-02-15 10:23:27.816683270 +0100
+@@ -24,6 +24,7 @@
+ #include "dummy_universe.h"
+ #include "problemresolver.h"
+
++#include <cstring>
+ #include <iostream>
+ #include <fstream>
+ #include <string>
+--- aptitude-0.3.5.1/src/generic/util/temp.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/util/temp.cc 2015-02-15 10:17:56.216697183 +0100
+@@ -24,6 +24,7 @@
+ #include <aptitude.h>
+
+ #include <stdlib.h>
++#include <unistd.h>
+
+ namespace temp
+ {
+--- aptitude-0.3.5.1/src/generic/util/util.h.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/util/util.h 2015-02-15 10:17:40.113364528 +0100
+@@ -20,6 +20,7 @@
+ #ifndef UTIL_H
+ #define UTIL_H
+
++#include <cstdarg>
+ #include <string>
+ #include <utility>
+
+--- aptitude-0.3.5.1/src/generic/util/util.cc.orig 2015-02-15 11:01:03.963255256 +0100
++++ aptitude-0.3.5.1/src/generic/util/util.cc 2015-02-15 11:01:06.766588472 +0100
+@@ -23,6 +23,7 @@
+ #include <errno.h>
+ #include <pwd.h>
+ #include <stdarg.h>
++#include <stdio.h>
+ #include <string.h>
+ #include <sys/types.h>
+ #include <time.h>
+--- aptitude-0.3.5.1/src/generic/problemresolver/dummy_universe.cc.orig 2015-02-15 11:02:01.546586175 +0100
++++ aptitude-0.3.5.1/src/generic/problemresolver/dummy_universe.cc 2015-02-15 11:02:04.176586061 +0100
+@@ -19,6 +19,8 @@
+
+ #include "dummy_universe.h"
+
++#include <algorithm>
++
+ using namespace std;
+
+ dummy_package::dummy_package(const string &_name, unsigned int id)
+--- aptitude-0.3.5.1/src/generic/apt/acqprogress.cc.orig 2015-02-15 11:02:36.293251382 +0100
++++ aptitude-0.3.5.1/src/generic/apt/acqprogress.cc 2015-02-15 11:02:40.536584538 +0100
+@@ -299,7 +299,7 @@
+
+ char C = 0;
+ while (C != '\n' && C != '\r')
+- read(STDIN_FILENO,&C,1);
++ if (read(STDIN_FILENO,&C,1) <= 0) break;
+
+ manager.set_update(true);
+ k(true);
+--- aptitude-0.3.5.1/src/generic/apt/matchers.h.orig 2005-10-12 21:45:03.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/matchers.h 2015-02-15 11:43:29.419815099 +0100
+@@ -23,6 +23,7 @@
+ #ifndef MATCHERS_H
+ #define MATCHERS_H
+
++#include <memory>
+ #include <string>
+ #include <vector>
+
+--- aptitude-0.3.5.1/src/generic/apt/apt.h.orig 2005-10-08 03:34:07.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/apt.h 2015-02-15 11:50:41.116463649 +0100
+@@ -27,6 +27,7 @@
+
+ #include "aptcache.h"
+
++#include <cstring>
+ #include <utility>
+
+ class OpProgress;
+--- aptitude-0.3.5.1/src/generic/apt/aptitude_resolver_universe.cc.orig 2005-10-05 08:55:26.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/aptitude_resolver_universe.cc 2015-02-15 12:08:38.219751781 +0100
+@@ -4,6 +4,7 @@
+
+ #include <generic/problemresolver/solution.h>
+
++#include <algorithm>
+ #include <sstream>
+
+ using namespace std;
+--- aptitude-0.3.5.1/src/generic/apt/log.cc.orig 2015-02-15 11:14:01.603222618 +0100
++++ aptitude-0.3.5.1/src/generic/apt/log.cc 2015-02-15 12:10:52.026412833 +0100
+@@ -31,6 +31,7 @@
+ #include <apt-pkg/strutl.h>
+
+ #include <errno.h>
++#include <stdio.h>
+
+ using namespace std;
+
+--- aptitude-0.3.5.1/src/generic/apt/pkg_hier_dump.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/generic/apt/pkg_hier_dump.cc 2015-02-15 12:23:01.009715573 +0100
+@@ -5,6 +5,7 @@
+ #include "pkg_hier.h"
+
+ #include <stdio.h>
++#include <string.h>
+
+ #include <apt-pkg/error.h>
+
+--- aptitude-0.3.5.1/src/vscreen/curses++.h.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/curses++.h 2015-02-15 12:29:18.379699738 +0100
+@@ -22,6 +22,7 @@
+ #ifndef CURSES_PLUSPLUS_H
+ #define CURSES_PLUSPLUS_H
+
++#include <cstring>
+ #include <string>
+ #include <ncursesw/curses.h>
+
+--- aptitude-0.3.5.1/src/vscreen/fragment.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/fragment.cc 2015-02-15 12:33:23.383022788 +0100
+@@ -1170,7 +1170,7 @@
+
+ const char *start=format;
+ // find all the arguments.
+- char *nextpercent=strchr(start, '%');
++ const char *nextpercent=strchr(start, '%');
+
+ // loop 1: count the arguments.
+ while(nextpercent!=NULL)
+--- aptitude-0.3.5.1/src/vscreen/vscreen.cc.orig 2005-10-05 08:55:21.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/vscreen.cc 2015-02-15 12:34:08.646354222 +0100
+@@ -48,6 +48,7 @@
+ // For _()
+ #include "../aptitude.h"
+
++#include <limits.h>
+ #include <signal.h>
+
+ #include <assert.h>
+--- aptitude-0.3.5.1/src/vscreen/vs_radiogroup.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/vs_radiogroup.cc 2015-02-15 12:35:58.129682960 +0100
+@@ -4,6 +4,8 @@
+
+ #include "vs_togglebutton.h"
+
++#include <cstdlib>
++
+ #include <sigc++/adaptors/bind.h>
+ #include <sigc++/functors/mem_fun.h>
+
+--- aptitude-0.3.5.1/src/vscreen/transcode.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/vscreen/transcode.cc 2015-02-15 12:58:49.519625410 +0100
+@@ -22,6 +22,9 @@
+ #include <assert.h>
+ #include <errno.h>
+ #include <iconv.h>
++#include <langinfo.h>
++#include <stdlib.h>
++#include <string.h>
+
+ using namespace std;
+
+--- aptitude-0.3.5.1/src/cmdline/cmdline_action.cc.orig 2005-10-14 08:10:09.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_action.cc 2015-02-15 13:04:15.156278410 +0100
+@@ -5,6 +5,8 @@
+ #include "cmdline_action.h"
+ #include "cmdline_util.h"
+
++#include <cstdio>
++
+ #include <aptitude.h>
+
+ #include <generic/apt/apt.h>
+--- aptitude-0.3.5.1/src/cmdline/cmdline_clean.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_clean.cc 2015-02-15 13:06:30.906272716 +0100
+@@ -14,6 +14,7 @@
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/strutl.h>
+
++#include <cstdio>
+ #include <iostream>
+
+ #include <sys/stat.h>
+--- aptitude-0.3.5.1/src/cmdline/cmdline_do_action.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_do_action.cc 2015-02-15 13:07:02.206271400 +0100
+@@ -12,6 +12,8 @@
+ #include "cmdline_simulate.h"
+ #include "cmdline_util.h"
+
++#include <cstdio>
++
+ #include <generic/apt/apt.h>
+ #include <generic/apt/config_signal.h>
+ #include <generic/apt/download_install_manager.h>
+--- aptitude-0.3.5.1/src/cmdline/cmdline_forget_new.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_forget_new.cc 2015-02-15 13:12:45.162923676 +0100
+@@ -4,6 +4,8 @@
+
+ #include "cmdline_forget_new.h"
+
++#include <cstdio>
++
+ #include <aptitude.h>
+
+ #include <generic/apt/apt.h>
+--- aptitude-0.3.5.1/src/cmdline/cmdline_search.cc.orig 2005-10-12 21:27:44.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_search.cc 2015-02-15 13:14:23.319586220 +0100
+@@ -6,6 +6,8 @@
+
+ #include "cmdline_common.h"
+
++#include <algorithm>
++
+ #include <aptitude.h>
+ #include <load_sortpolicy.h>
+ #include <pkg_columnizer.h>
+--- aptitude-0.3.5.1/src/cmdline/cmdline_update.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_update.cc 2015-02-15 13:24:24.086227676 +0100
+@@ -21,6 +21,8 @@
+
+ #include <aptitude.h>
+
++#include <cstdio>
++
+ #include <generic/apt/apt.h>
+ #include <generic/apt/config_signal.h>
+ #include <generic/apt/download_update_manager.h>
+--- aptitude-0.3.5.1/src/cmdline/cmdline_upgrade.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_upgrade.cc 2015-02-15 13:25:27.122891697 +0100
+@@ -10,6 +10,8 @@
+ #include "cmdline_simulate.h"
+ #include "cmdline_util.h"
+
++#include <cstdio>
++
+ #include <aptitude.h>
+
+ #include <generic/apt/apt.h>
+--- aptitude-0.3.5.1/src/cmdline/cmdline_util.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/cmdline/cmdline_util.cc 2015-02-15 13:25:59.272890348 +0100
+@@ -7,6 +7,8 @@
+ #include "cmdline_common.h"
+ #include "cmdline_progress.h"
+
++#include <memory>
++
+ #include <aptitude.h>
+ #include <ui.h>
+ #include <vs_progress.h>
+--- aptitude-0.3.5.1/src/mine/cmine.cc.orig 2005-10-05 08:55:22.000000000 +0200
++++ aptitude-0.3.5.1/src/mine/cmine.cc 2015-02-15 13:26:48.646221609 +0100
+@@ -29,6 +29,7 @@
+
+ #include <string>
+ #include <fstream>
++#include <unistd.h>
+
+ #ifndef DONT_USE_FANCYBOXES
+ // Some systems (*cough* Solaris xterms *cough*) don't like the fancy ASCII
+--- aptitude-0.3.5.1/src/main.cc.orig 2005-10-14 22:32:54.000000000 +0200
++++ aptitude-0.3.5.1/src/main.cc 2015-02-15 13:29:04.419549244 +0100
+@@ -25,6 +25,7 @@
+
+ #include <getopt.h>
+ #include <signal.h>
++#include <unistd.h>
+
+ #include "aptitude.h"
+
+--- aptitude-0.3.5.1/src/solution_fragment.cc.orig 2005-10-05 08:55:20.000000000 +0200
++++ aptitude-0.3.5.1/src/solution_fragment.cc 2015-02-15 13:57:37.782810677 +0100
+@@ -31,6 +31,7 @@
+ #include <vscreen/fragment.h>
+ #include <vscreen/transcode.h>
+
++#include <algorithm>
+ #include <vector>
+
+ typedef generic_solution<aptitude_universe> aptitude_solution;
+++ /dev/null
---- aptitude-0.2.11.1/po/ja.po.orig Sun Jan 19 18:01:58 2003
-+++ aptitude-0.2.11.1/po/ja.po Sun Jan 19 18:13:09 2003
-@@ -2,7 +2,6 @@
- # Copyright (C) YEAR Free Software Foundation, Inc.
- # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
- #
--#, fuzzy
- msgid ""
- msgstr ""
- "Project-Id-Version: aptitude VERSION\n"
-@@ -385,10 +384,6 @@
- msgid "Packages being installed to satisfy dependencies"
- msgstr "°Í¸´Ø·¸¤òËþ¤¹¤ë¤¿¤á¤Ë¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤ë¥Ñ¥Ã¥±¡¼¥¸"
-
--#: src/pkg_ver_item.cc:431
--msgid "Available versions of "
--msgstr ""
--
- #: src/dep_item.cc:187 src/pkg_info_screen.cc:81
- #, c-format
- msgid "Packages which depend on %s"
-@@ -399,11 +394,6 @@
- msgid "Dependencies of %s"
- msgstr "%s ¤Î°Í¸´Ø·¸"
-
--#: src/pkg_info_screen.cc:75
--#, fuzzy
--msgid "Description of "
--msgstr "¾ÜºÙ"
--
- #: src/pkg_info_screen.cc:70
- msgid "Priority: "
- msgstr "Í¥ÀèÅÙ: "
-@@ -428,11 +418,6 @@
- msgid "Source Package: "
- msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸: "
-
--#: src/pkg_info_screen.cc:86
--#, c-format
--msgid "Packages which depend on %s"
--msgstr "%s ¤Ë°Í¸¤·¤Æ¤¤¤ë¥Ñ¥Ã¥±¡¼¥¸"
--
- #: src/pkg_info_screen.cc:91
- msgid "Versions"
- msgstr "¥Ð¡¼¥¸¥ç¥ó"
---- aptitude-0.2.11.1/po/da.po.orig Sun Jan 19 18:23:34 2003
-+++ aptitude-0.2.11.1/po/da.po Sun Jan 19 18:36:15 2003
-@@ -5,8 +5,9 @@
- msgstr ""
- "Project-Id-Version: aptitude VERSION\n"
- "POT-Creation-Date: 2002-04-07 09:50-0400\n"
--"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-+"PO-Revision-Date: 2002-04-07 09:50-0400\n"
- "Last-Translator: Morten Brix Pedersen <morten@wtf.dk>\n"
-+"Language-Team: Danish\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-1\n"
- "Content-Transfer-Encoding: 8bit\n"
-@@ -134,12 +135,12 @@
- #: src/generic/pkg_hier.cc:28 src/generic/pkg_hier.cc:49
- #, c-format
- msgid "Warning: group %s is involved in a cycle"
--msgstr "Advarsel: gruppe &s er involveret i en cyklus"
-+msgstr "Advarsel: gruppe %s er involveret i en cyklus"
-
- #: src/generic/pkg_hier.cc:143
- #, c-format
- msgid "Cannot open package hierarchy file %s"
--msgstr "Kan ikke åbne pakke hieraki fil"
-+msgstr "Kan ikke åbne pakke hieraki fil %s"
-
- #: src/generic/pkg_hier.cc:168
- msgid "Global block encountered after first record, ignoring"
---- aptitude-0.2.11.1/po/es.po.orig Sun Jan 19 18:23:34 2003
-+++ aptitude-0.2.11.1/po/es.po Sun Jan 19 18:38:21 2003
-@@ -380,10 +380,6 @@
- msgid "Packages being installed to satisfy dependencies"
- msgstr "Paquetes instalados para atender las dependencias"
-
--#: src/pkg_ver_item.cc:431
--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"
-@@ -394,10 +390,6 @@
- msgid "Dependencies of %s"
- msgstr "Dependencias de %s"
-
--#: src/pkg_description_treeitem.cc:66 src/pkg_description_treeitem.cc:74
--msgid "Description of "
--msgstr "Descripción de "
--
- #: src/pkg_info_screen.cc:75
- msgid "Priority: "
- msgstr "Prioridad: "
-@@ -423,11 +415,6 @@
- msgid "Source Package: "
- msgstr "Paquete origen: "
-
--#: src/pkg_info_screen.cc:86
--#, c-format
--msgid "Packages which depend on %s"
--msgstr "Paquetes que dependen de %s"
--
- #: src/pkg_info_screen.cc:91
- msgid "Versions"
- msgstr "Versiones"
-@@ -702,8 +689,5 @@
- #~ msgid "Really quit?"
- #~ msgstr "¿Realmente quiere salir?"
-
--#~ msgid "Actions to be taken"
--#~ msgstr "Acciones a emprender"
--
- #~ msgid "UPGRADE"
- #~ msgstr "ACTUALIZAR"
---- aptitude-0.2.11.1/po/fi.po.orig Sun Jan 19 18:23:34 2003
-+++ aptitude-0.2.11.1/po/fi.po Sun Jan 19 18:38:59 2003
-@@ -8,6 +8,7 @@
- "POT-Creation-Date: 2002-04-07 09:50-0400\n"
- "PO-Revision-Date: 2002-04-17 19:45+0300\n"
- "Last-Translator: Jaakko Kangasharju <ashar@iki.fi>\n"
-+"Language-Team: Finnish\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=iso-8859-15\n"
- "Content-Transfer-Encoding: 8bit\n"
---- aptitude-0.2.11.1/po/fr.po.orig Sun Jan 19 18:23:34 2003
-+++ aptitude-0.2.11.1/po/fr.po Sun Jan 19 18:39:55 2003
-@@ -11,8 +11,8 @@
- "Last-Translator: Martin Quinson <mquinson@ens-lyon.fr>, 2001\n"
- "Language-Team: Debian French Team <debian-l10n-french@lists.debian.org>\n"
- "MIME-Version: 1.0\n"
--"Content-Type: text/plain; charset=latin-1\n"
--"Content-Transfer-Encoding: 8bits\n"
-+"Content-Type: text/plain; charset=ISO-8859-1\n"
-+"Content-Transfer-Encoding: 8-bit\n"
-
- #: src/load_config.cc:28
- #, fuzzy, c-format
-@@ -617,9 +617,6 @@
- #~ msgid "Will free %sB of disk space"
- #~ msgstr "Libérera %sO d'espace disque"
-
--#~ msgid "Actions to be taken"
--#~ msgstr "Actions à réaliser"
--
- #~ msgid "\" into the drive \""
- #~ msgstr "\" dans le lecteur \""
-
---- aptitude-0.2.11.1/po/gl.po.orig Sun Jan 19 18:23:34 2003
-+++ aptitude-0.2.11.1/po/gl.po Sun Jan 19 18:41:04 2003
-@@ -618,27 +618,6 @@
- #~ msgid "Really quit (and save changes) ? "
- #~ msgstr "¿Realmente quere saír (e garda-los cambios)? "
-
--#~ msgid "Really quit?"
--#~ msgstr "¿Realmente quere saír?"
--
--#~ msgid "/help.txt"
--#~ msgstr "/help.txt"
--
--#~ msgid "Aptitude online help"
--#~ msgstr "Axuda en liña de Aptitude"
--
--#~ msgid "DL Size: "
--#~ msgstr "Tamaño de DL: "
--
--#~ msgid "Will use %sB of disk space"
--#~ msgstr "Hanse ocupar %sB de espacio"
--
--#~ msgid "Will free %sB of disk space"
--#~ msgstr "Hanse liberar %sB de espacio"
--
--#~ msgid "Actions to be taken"
--#~ msgstr "Accións a tomar"
--
- #~ msgid "\" into the drive \""
- #~ msgstr "\" na unidade \""
-
---- aptitude-0.2.11.1/po/pt_BR.po.orig Sat Mar 16 04:40:11 2002
-+++ aptitude-0.2.11.1/po/pt_BR.po Sun Jan 19 18:42:07 2003
-@@ -370,10 +370,6 @@
- msgid "Packages being installed to satisfy dependencies"
- msgstr "Pacotes sendo instalados para satisfazer dependências"
-
--#: src/pkg_ver_item.cc:431
--msgid "Available versions of "
--msgstr "Versões disponíveis de "
--
- #: src/dep_item.cc:187 src/pkg_info_screen.cc:81
- msgid "Packages which depend on %s"
- msgstr "Pacotes que dependem de %s"
-@@ -382,10 +378,6 @@
- msgid "Dependencies of %s"
- msgstr "Dependências de %s"
-
--#: src/pkg_description_treeitem.cc:66 src/pkg_description_treeitem.cc:74
--msgid "Description of "
--msgstr "Descrição de "
--
- #: src/pkg_info_screen.cc:75
- msgid "Priority: "
- msgstr "Prioridade: "
-@@ -410,10 +402,6 @@
- msgid "Source Package: "
- msgstr "Pacote Fonte: "
-
--#: src/pkg_info_screen.cc:86
--msgid "Packages which depend on %s"
--msgstr "Pacotes que dependem de %s"
--
- #: src/pkg_info_screen.cc:91
- msgid "Versions"
- msgstr "Versões"
-@@ -673,8 +661,5 @@
- #~ msgid "Really quit?"
- #~ msgstr "Deseja mesmo sair?"
-
--#~ msgid "Actions to be taken"
--#~ msgstr "Ações a ser tomadas"
--
- #~ msgid "UPGRADE"
- #~ msgstr "ATUALIZAR"
+++ /dev/null
-diff -Nur aptitude-0.2.11.1.orig/po/da.po aptitude-0.2.11.1/po/da.po
---- aptitude-0.2.11.1.orig/po/da.po Mon Apr 22 05:34:36 2002
-+++ aptitude-0.2.11.1/po/da.po Sun Jan 19 17:11:50 2003
-@@ -1884,7 +1884,7 @@
- #: src/download.cc:374
- 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 ""
-
-@@ -1970,9 +1970,9 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
--"Kunne ikke gentage system låsen! (Måske kører en anden apt eller dpkg?"
-+"Kunne ikke gentage system låsen! (Måske kører en anden apt eller rpm?"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/po/de.po aptitude-0.2.11.1/po/de.po
---- aptitude-0.2.11.1.orig/po/de.po Mon Apr 22 05:34:37 2002
-+++ aptitude-0.2.11.1/po/de.po Sun Jan 19 17:12:02 2003
-@@ -1965,12 +1965,12 @@
- #: src/download.cc:374
- 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 ""
- "WICHTIG: dieses Protokoll zeigt nur geplante Aktionen an. Aktionen, die "
- "wegen\n"
--"dpkg-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
-+"rpm-Problemen fehlschlagen sind vielleicht nicht abgeschlossen.\n"
-
- #: src/download.cc:375
- #, c-format
-@@ -2056,10 +2056,10 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
- "Konnte die System-Sperre nicht zurückerlangen! (Vielleicht läuft noch ein "
--"apt oder dpkg?)"
-+"apt oder rpm?)"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/po/es.po aptitude-0.2.11.1/po/es.po
---- aptitude-0.2.11.1.orig/po/es.po Mon Nov 26 02:04:23 2001
-+++ aptitude-0.2.11.1/po/es.po Sun Jan 19 17:12:10 2003
-@@ -511,12 +511,12 @@
- #: src/download.cc:220
- 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 sólo muestra pretensión de las acciones; las acciones "
- "fallidas\n"
--"debidas a problemas dpkg no se completarán.\n"
-+"debidas a problemas rpm no se completarán.\n"
- "\n"
-
- #: src/download.cc:221
-diff -Nur aptitude-0.2.11.1.orig/po/fi.po aptitude-0.2.11.1/po/fi.po
---- aptitude-0.2.11.1.orig/po/fi.po Mon Apr 22 05:34:37 2002
-+++ aptitude-0.2.11.1/po/fi.po Sun Jan 19 17:12:24 2003
-@@ -2135,11 +2135,11 @@
- #: src/download.cc:374
- 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 ""
- "TÄRKEÄÄ: tässä lokissa on vain aiotut toimenpiteet; jos toimenpide\n"
--"epäonnistuu dpkg:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
-+"epäonnistuu rpm:n ongelmien takia, sitä ei välttämättä suoritettu.\n"
- "\n"
-
- #: src/download.cc:375
-@@ -2224,9 +2224,9 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
--"En saanut järjestelmälukitusta! (Ehkä apt tai dpkg on ajossa muualta?)"
-+"En saanut järjestelmälukitusta! (Ehkä apt tai rpm on ajossa muualta?)"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/po/fr.po aptitude-0.2.11.1/po/fr.po
---- aptitude-0.2.11.1.orig/po/fr.po Sat Mar 16 04:40:10 2002
-+++ aptitude-0.2.11.1/po/fr.po Sun Jan 19 17:12:31 2003
-@@ -441,12 +441,12 @@
- #: src/download.cc:220
- 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 ""
- "IMPORTANT : Ces logs ne contiennent que les actions prévues ; Certaines "
- "actions peuvent\n"
--"échouer à cause d'erreurs de dpkg, et donc ne pas être réalisées.\n"
-+"échouer à cause d'erreurs de rpm, et donc ne pas être réalisées.\n"
- "\n"
-
- #: src/download.cc:221
-diff -Nur aptitude-0.2.11.1.orig/po/gl.po aptitude-0.2.11.1/po/gl.po
---- aptitude-0.2.11.1.orig/po/gl.po Sat Mar 16 04:40:10 2002
-+++ aptitude-0.2.11.1/po/gl.po Sun Jan 19 17:12:38 2003
-@@ -462,12 +462,12 @@
- #: src/download.cc:220
- 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 rexistro só fai un listado das accións que se quixeron "
- "facer;\n"
--"as accións que fallen por problemas con dpkg poden non terse completado.\n"
-+"as accións que fallen por problemas con rpm poden non terse completado.\n"
- "\n"
-
- #: src/download.cc:221
-diff -Nur aptitude-0.2.11.1.orig/po/ja.po aptitude-0.2.11.1/po/ja.po
---- aptitude-0.2.11.1.orig/po/ja.po Sat Mar 16 04:40:10 2002
-+++ aptitude-0.2.11.1/po/ja.po Sun Jan 19 17:12:43 2003
-@@ -516,7 +516,7 @@
- #: src/download.cc:220
- 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 ""
-
-diff -Nur aptitude-0.2.11.1.orig/po/pl.po aptitude-0.2.11.1/po/pl.po
---- aptitude-0.2.11.1.orig/po/pl.po Mon Apr 22 05:34:38 2002
-+++ aptitude-0.2.11.1/po/pl.po Sun Jan 19 17:13:21 2003
-@@ -2130,11 +2130,11 @@
- #: src/download.cc:374
- 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 ""
- "WA¯NE: ten dziennik zawiera planowane dzia³ania. Operacje, w czasie których\n"
--"wyst±pi³y b³êdy dpkg mog± nie byæ zakoñczone pomy¶lnie.\n"
-+"wyst±pi³y b³êdy rpm mog± nie byæ zakoñczone pomy¶lnie.\n"
- "\n"
-
- #: src/download.cc:375
-@@ -2219,9 +2219,9 @@
-
- #: src/download.cc:490
- msgid ""
--"Could not regain the system lock! (Perhaps another apt or dpkg is running?"
-+"Could not regain the system lock! (Perhaps another apt or rpm is running?"
- msgstr ""
--"Nie uda³o siê odzyskaæ blokady systemowej! Mo¿e pracuje inny apt lub dpkg?"
-+"Nie uda³o siê odzyskaæ blokady systemowej! Mo¿e pracuje inny apt lub rpm?"
-
- #: src/pkg_info_screen.cc:82
- msgid "Essential: "
-diff -Nur aptitude-0.2.11.1.orig/src/download.cc aptitude-0.2.11.1/src/download.cc
---- aptitude-0.2.11.1.orig/src/download.cc Sun Mar 24 22:21:34 2002
-+++ aptitude-0.2.11.1/src/download.cc Sun Jan 19 17:18:52 2003
-@@ -30,7 +30,7 @@
- #include <apt-pkg/init.h>
- #include <apt-pkg/clean.h>
- #include <apt-pkg/error.h>
--#include <apt-pkg/dpkgpm.h>
-+#include <apt-pkg/rpmpm.h>
- #include <apt-pkg/packagemanager.h>
- #include <apt-pkg/sourcelist.h>
- #include <apt-pkg/acquire.h>
-@@ -267,7 +267,7 @@
- }
-
- // Make a package manager, get ready to download
-- pkgDPkgPM pm(*apt_cache_file);
-+ pkgRPMPM pm(*apt_cache_file);
- if(!pm.GetArchives(&fetcher, &list, apt_package_records) || _error->PendingError())
- {
- _error->Error(_("Internal error: couldn't generate list of packages to download"));
-@@ -371,7 +371,7 @@
-
- time_t curtime=time(NULL);
- fprintf(f, "Aptitude " VERSION ": log report\n%s\n\n", ctime(&curtime));
-- 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());
-@@ -453,7 +453,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();
- ok=false;
-
-@@ -487,7 +487,7 @@
- if(!apt_cache_file->GainLock())
- // This really shouldn't happen.
- {
-- _error->Error(_("Could not regain the system lock! (Perhaps another apt or dpkg is running?"));
-+ _error->Error(_("Could not regain the system lock! (Perhaps another apt or rpm is running?"));
- ok=false;
- break;
- }
-diff -Nur aptitude-0.2.11.1.orig/src/pkg_info_screen.cc aptitude-0.2.11.1/src/pkg_info_screen.cc
---- aptitude-0.2.11.1.orig/src/pkg_info_screen.cc Sun Mar 24 19:54:44 2002
-+++ aptitude-0.2.11.1/src/pkg_info_screen.cc Sun Jan 19 17:58:47 2003
-@@ -84,7 +84,7 @@
-
- tree->add_child(new vs_staticitem(_("Priority: "),pkgCache::VerIterator(ver).PriorityType()?pkgCache::VerIterator(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(!rec.SourcePkg().empty())
--- /dev/null
+--- aptitude-0.3.5.1/src/vscreen/vs_stacked.h.orig 2015-02-15 11:14:01.606555956 +0100
++++ aptitude-0.3.5.1/src/vscreen/vs_stacked.h 2015-02-15 12:43:32.966330540 +0100
+@@ -24,8 +24,8 @@
+ sigc::connection shown_conn, hidden_conn;
+
+ child_info(const vs_widget_ref &_w,
+- SigC::Connection &_shown_conn,
+- SigC::Connection &_hidden_conn)
++ sigc::connection &_shown_conn,
++ sigc::connection &_hidden_conn)
+ :w(_w), shown_conn(_shown_conn),
+ hidden_conn(_hidden_conn)
+ {
Summary(pl.UTF-8): Frontend dla apta oparty na bibliotece ncurses
Summary(pt_BR.UTF-8): Interface curses para o apt
Name: aptitude
-Version: 0.2.11.1
+Version: 0.3.5.1
Release: 0.1
-License: GPL
+License: GPL v2+
Group: Applications/Archiving
-Source0: http://ftp.debian.org/debian/pool/main/a/aptitude/%{name}_%{version}.orig.tar.gz
-# Source0-md5: c9a1af703b6d0e6e68e5ce8ae8b87b54
-Patch0: %{name}-gcc3.patch
-Patch1: %{name}-rpm.patch
-Patch2: %{name}-acfix.patch
-Patch3: %{name}-po-fix.patch
-URL: http://www.debian.org/Packages/unstable/admin/aptitude.html
-BuildRequires: apt-devel >= 0.5.4cnc7
-BuildRequires: autoconf
+#Source0: http://ftp.debian.org/debian/pool/main/a/aptitude/%{name}_%{version}.orig.tar.gz
+# no longer available on debian.org, use some old mirror
+Source0: ftp://ftp.gnome.org/mirror/debian-misc/debian-armeb/pool/main/a/aptitude/%{name}_%{version}.orig.tar.gz
+# Source0-md5: ac47b705bcbec6f0b45732d16ecdd82b
+# http://apt-rpm.org/patches/aptitude-0.3.5.1-apt-rpm.patch
+Patch0: %{name}-apt-rpm.patch
+Patch1: %{name}-includes.patch
+Patch2: %{name}-format.patch
+Patch3: %{name}-sigc.patch
+URL: http://aptitude.alioth.debian.org/
+BuildRequires: apt-devel >= 0.5.15lorg3.94a
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: gettext-tools
-BuildRequires: libsigc++1-devel
+BuildRequires: libsigc++-devel >= 2.0
BuildRequires: libstdc++-devel
-BuildRequires: ncurses-devel
+BuildRequires: ncurses-devel >= 5
+BuildRequires: pkgconfig
+BuildRequires: popt-devel
+BuildRequires: rpm-devel >= 5
+Requires: apt >= 0.5.15lorg3.94a
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define _localstatedir /var/lib
+
%description
Aptitude is a curses-based apt frontend with a number of useful
extended features, including a mutt-like syntax for matching packages
%patch3 -p1
%build
-rm -f missing
%{__gettextize}
-%{__aclocal}
+%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
-CPPFLAGS="-Wno-deprecated -I/usr/include/ncurses"
-%configure
+CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses -I/usr/include/rpm"
+%configure \
+ --disable-werror
%{__make}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install -D %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1
-install -D %{name}.fi.1 $RPM_BUILD_ROOT%{_mandir}/fi/man1/%{name}.1
-install -D %{name}.fr.1 $RPM_BUILD_ROOT%{_mandir}/fr/man1/%{name}.1
-install -D %{name}.gl.1 $RPM_BUILD_ROOT%{_mandir}/gl/man1/%{name}.1
-install -D %{name}.pl.1 $RPM_BUILD_ROOT%{_mandir}/pl/man1/%{name}.1
+# packaged as %doc or dummy files
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/{COPYING,NEWS,README*}
+# already packaged in proper locations
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man8/aptitude.{fi,fr}.8
%find_lang %{name}
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS NEWS README TODO
-%attr(755,root,root) %{_bindir}/%{name}
+%doc AUTHORS FAQ NEWS TODO
+%attr(755,root,root) %{_bindir}/aptitude
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/[!hm]*
%{_datadir}/%{name}/help.txt
+%lang(cs) %{_datadir}/%{name}/help-cs.txt
+%lang(de) %{_datadir}/%{name}/help-de.txt
+%lang(es) %{_datadir}/%{name}/help-es.txt
+%lang(eu) %{_datadir}/%{name}/help-eu.txt
%lang(fi) %{_datadir}/%{name}/help-fi.txt
%lang(fr) %{_datadir}/%{name}/help-fr.txt
%lang(gl) %{_datadir}/%{name}/help-gl.txt
+%lang(it) %{_datadir}/%{name}/help-it.txt
+%lang(ja) %{_datadir}/%{name}/help-ja.txt
%lang(pl) %{_datadir}/%{name}/help-pl.txt
+%lang(pt_BR) %{_datadir}/%{name}/help-pt_BR.txt
+%lang(sv) %{_datadir}/%{name}/help-sv.txt
+%lang(tr) %{_datadir}/%{name}/help-tr.txt
+%lang(zh_CN) %{_datadir}/%{name}/help-zh_CN.txt
+%lang(zh_TW) %{_datadir}/%{name}/help-zh_TW.txt
%{_datadir}/%{name}/mine-help.txt
+%lang(cs) %{_datadir}/%{name}/mine-help-cs.txt
+%lang(de) %{_datadir}/%{name}/mine-help-de.txt
%lang(fi) %{_datadir}/%{name}/mine-help-fi.txt
-%{_localstatedir}/lib/%{name}
-%{_mandir}/man1/%{name}.1*
-%lang(fi) %{_mandir}/fi/man1/%{name}.1*
-%lang(fr) %{_mandir}/fr/man1/%{name}.1*
-%lang(gl) %{_mandir}/gl/man1/%{name}.1*
-%lang(pl) %{_mandir}/pl/man1/%{name}.1*
+%lang(fr) %{_datadir}/%{name}/mine-help-fr.txt
+%lang(it) %{_datadir}/%{name}/mine-help-it.txt
+%{_localstatedir}/aptitude
+%dir %{_docdir}/aptitude
+%dir %{_docdir}/aptitude/html
+%lang(cs) %{_docdir}/aptitude/html/cs
+%{_docdir}/aptitude/html/en
+%lang(fi) %{_docdir}/aptitude/html/fi
+%lang(fr) %{_docdir}/aptitude/html/fr
+%{_mandir}/man8/aptitude.8*
+%lang(cs) %{_mandir}/cs/man8/aptitude.8*
+%lang(de) %{_mandir}/de/man8/aptitude.8*
+%lang(fi) %{_mandir}/fi/man8/aptitude.8*
+%lang(fr) %{_mandir}/fr/man8/aptitude.8*
+%lang(gl) %{_mandir}/gl/man8/aptitude.8*
+%lang(it) %{_mandir}/it/man8/aptitude.8*
+%lang(pl) %{_mandir}/pl/man8/aptitude.8*
projects / packages / aptitude.git / commitdiff