--- aptitude-0.3.2/aptitude-defaults 2004-12-03 19:57:44.000000000 -0500 +++ aptitude-0.3.2-new/aptitude-defaults 2006-04-10 13:08:46.000000000 -0400 @@ -1,9 +1,9 @@ // This file defines some default values for aptitude, including themes. // -// It is sourced before /etc/apt/apt.conf and ~/.aptitude/config. This is +// It is sourced before @FINKPREFIX@/etc/apt/apt.conf and ~/.aptitude/config. This is // not meant to be a user configuration file; instead, it is an internal // data file. (which is why it is not stored in /etc) To override settings -// in this file, use /etc/apt/apt.conf. +// in this file, use @FINKPREFIX@/etc/apt/apt.conf. Aptitude::Themes { --- aptitude-0.3.2/configure 2005-05-01 14:01:08.000000000 -0400 +++ aptitude-0.3.2-new/configure 2006-04-10 13:06:05.000000000 -0400 @@ -9755,12 +9755,11 @@ #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (); int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } @@ -9809,12 +9808,11 @@ #ifdef __cplusplus "C" #endif -const char *_nl_expand_alias (); int main () { bindtextdomain ("", ""); -return (int) gettext ("") + _nl_msg_cat_cntr + *_nl_expand_alias (0) +return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } @@ -11647,7 +11645,7 @@ STATEDIR="$enableval" fi else - STATEDIR="/var/lib/aptitude" + STATEDIR="@FINKPREFIX@/var/lib/aptitude" fi; # Check whether --enable-aptitude or --disable-aptitude was given. --- aptitude-0.3.2/doc/aptitude-html.xsl 2004-12-03 19:57:22.000000000 -0500 +++ aptitude-0.3.2-new/doc/aptitude-html.xsl 2006-04-10 13:05:10.000000000 -0400 @@ -5,7 +5,7 @@ - + --- aptitude-0.3.2/doc/aptitude-man.xsl 2004-12-03 19:57:25.000000000 -0500 +++ aptitude-0.3.2-new/doc/aptitude-man.xsl 2006-04-10 13:05:10.000000000 -0400 @@ -5,7 +5,7 @@ - + \fI<>\fR --- aptitude-0.3.2/doc/aptitude-txt.xsl 2004-12-03 19:57:17.000000000 -0500 +++ aptitude-0.3.2-new/doc/aptitude-txt.xsl 2006-04-10 13:05:10.000000000 -0400 @@ -5,7 +5,7 @@ - + --- aptitude-0.3.2/doc/cs/Makefile.in 2005-05-01 14:16:23.000000000 -0400 +++ aptitude-0.3.2-new/doc/cs/Makefile.in 2006-04-10 13:05:10.000000000 -0400 @@ -105,7 +105,7 @@ LANGCODE = cs -# Put documentation in /usr/share/doc/aptitude (by default) +# Put documentation in @FINKPREFIX@/share/doc/aptitude (by default) docdir = $(datadir)/doc/$(PACKAGE) htmldir = $(docdir)/html/$(LANGCODE) @@ -360,8 +360,8 @@ 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 @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.png output-html/images/; done + for x in home next prev up; do ln -s @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.gif output-html/images/; done touch doc-html-stamp --- aptitude-0.3.2/doc/cs/aptitude.xml 2005-05-01 12:16:16.000000000 -0400 +++ aptitude-0.3.2-new/doc/cs/aptitude.xml 2006-04-10 13:05:10.000000000 -0400 @@ -1,7 +1,7 @@ aptitude"> apt'> dselect'> @@ -5739,7 +5739,7 @@ Pro konkrtn pklady rznch rozloen nahldnte do definic tmat v souboru -/usr/share/aptitude/aptitude-defaults. +@FINKPREFIX@/share/aptitude/aptitude-defaults. @@ -6303,7 +6303,7 @@ Implicitn hodnoty uloen v souboru -/usr/share/aptitude/aptitude-defaults. +@FINKPREFIX@/share/aptitude/aptitude-defaults. @@ -7040,7 +7040,7 @@ S &aptitude; se standardn dodvaj nsledujc tmata (uloen -v souboru /usr/share/aptitude/aptitude-defaults): +v souboru @FINKPREFIX@/share/aptitude/aptitude-defaults): @@ -8461,7 +8461,7 @@ apt 8 , -/usr/share /doc/aptitude/html/index.html +@FINKPREFIX@/share /doc/aptitude/html/index.html --- aptitude-0.3.2/doc/de/Makefile.in 2005-05-01 14:16:23.000000000 -0400 +++ aptitude-0.3.2-new/doc/de/Makefile.in 2006-04-10 13:05:10.000000000 -0400 @@ -111,7 +111,7 @@ README = README.$(LANGCODE) XMLSOURCES = aptitude.xml manpage.xml ../aptitude-common.xsl -# Put documentation in /usr/share/doc/aptitude (by default) +# Put documentation in @FINKPREFIX@/share/doc/aptitude (by default) docdir = $(datadir)/doc/$(PACKAGE) localemandir = $(mandir)/$(LANGCODE) htmldir = $(docdir)/html/$(LANGCODE) @@ -363,8 +363,8 @@ 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 @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.png output-html/images/; done + for x in home next prev up; do ln -s @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.gif output-html/images/; done touch doc-html-stamp --- aptitude-0.3.2/doc/de/aptitude.xml 2005-05-01 12:16:22.000000000 -0400 +++ aptitude-0.3.2-new/doc/de/aptitude.xml 2006-04-10 13:05:10.000000000 -0400 @@ -1,7 +1,7 @@ aptitude"> apt'> dselect'> --- aptitude-0.3.2/doc/de/manpage.xml 2004-12-03 19:57:25.000000000 -0500 +++ aptitude-0.3.2-new/doc/de/manpage.xml 2006-04-10 13:05:10.000000000 -0400 @@ -862,7 +862,7 @@ Siehe auch - apt-get8, apt8, /usr/share/doc/aptitude/html/index.html + apt-get8, apt8, @FINKPREFIX@/share/doc/aptitude/html/index.html --- aptitude-0.3.2/doc/en/Makefile.in 2005-05-01 14:16:23.000000000 -0400 +++ aptitude-0.3.2-new/doc/en/Makefile.in 2006-04-10 13:05:10.000000000 -0400 @@ -103,7 +103,7 @@ EXTRA_DIST = aptitude.xml manpage.xml -# Put documentation in /usr/share/doc/aptitude (by default) +# Put documentation in @FINKPREFIX@/share/doc/aptitude (by default) docdir = $(datadir)/doc/$(PACKAGE) # Automake automagically distributes README without asking.. @@ -399,8 +399,8 @@ 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 @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.png output-html/images/; done + for x in home next prev up; do ln -s @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.gif output-html/images/; done touch doc-html-stamp --- aptitude-0.3.2/doc/en/aptitude.xml 2005-05-01 14:00:45.000000000 -0400 +++ aptitude-0.3.2-new/doc/en/aptitude.xml 2006-04-10 13:05:10.000000000 -0400 @@ -1,7 +1,7 @@ aptitude"> apt'> dselect'> @@ -6044,7 +6044,7 @@ For examples of how to change the display layout, see the theme definitions in the file - /usr/share/aptitude/aptitude-defaults. + @FINKPREFIX@/share/aptitude/aptitude-defaults. @@ -6622,7 +6622,7 @@ Default values stored in - /usr/share/aptitude/aptitude-defaults. + @FINKPREFIX@/share/aptitude/aptitude-defaults. @@ -7200,7 +7200,7 @@ Aptitude::ProblemResolver::StepLimit - 100 + 5000 The maximum number of steps which should be performed by the problem resolver on each @@ -7631,7 +7631,7 @@ The following themes are shipped with &aptitude; in - /usr/share/aptitude/aptitude-defaults: + @FINKPREFIX@/share/aptitude/aptitude-defaults: --- aptitude-0.3.2/doc/en/manpage.xml 2005-05-01 13:21:46.000000000 -0400 +++ aptitude-0.3.2-new/doc/en/manpage.xml 2006-04-10 13:05:10.000000000 -0400 @@ -928,7 +928,7 @@ See Also - apt-get8, apt8, /usr/share/doc/aptitude/html/index.html + apt-get8, apt8, @FINKPREFIX@/share/doc/aptitude/html/index.html --- aptitude-0.3.2/doc/fi/Makefile.in 2005-05-01 14:16:24.000000000 -0400 +++ aptitude-0.3.2-new/doc/fi/Makefile.in 2006-04-10 13:05:10.000000000 -0400 @@ -111,7 +111,7 @@ README = README.$(LANGCODE) XMLSOURCES = aptitude.xml manpage.xml ../aptitude-common.xsl -# Put documentation in /usr/share/doc/aptitude (by default) +# Put documentation in @FINKPREFIX@/share/doc/aptitude (by default) docdir = $(datadir)/doc/$(PACKAGE) localemandir = $(mandir)/$(LANGCODE) htmldir = $(docdir)/html/$(LANGCODE) @@ -362,8 +362,8 @@ 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 @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.png output-html/images/; done + for x in home next prev up; do ln -s @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.gif output-html/images/; done touch doc-html-stamp --- aptitude-0.3.2/doc/fi/aptitude.xml 2005-05-01 12:16:23.000000000 -0400 +++ aptitude-0.3.2-new/doc/fi/aptitude.xml 2006-04-10 13:05:10.000000000 -0400 @@ -1,7 +1,7 @@ aptitude"> apt'> dselect'> --- aptitude-0.3.2/doc/fi/manpage.xml 2004-12-03 19:57:26.000000000 -0500 +++ aptitude-0.3.2-new/doc/fi/manpage.xml 2006-04-10 13:05:10.000000000 -0400 @@ -807,7 +807,7 @@ Katso myös - apt-get8, apt8, /usr/share/doc/aptitude/html/index.html + apt-get8, apt8, @FINKPREFIX@/share/doc/aptitude/html/index.html --- aptitude-0.3.2/doc/fr/Makefile.in 2005-05-01 14:16:24.000000000 -0400 +++ aptitude-0.3.2-new/doc/fr/Makefile.in 2006-04-10 13:05:10.000000000 -0400 @@ -105,7 +105,7 @@ LANGCODE = fr MANPAGE = aptitude.$(LANGCODE).8 -# Put documentation in /usr/share/doc/aptitude (by default) +# Put documentation in @FINKPREFIX@/share/doc/aptitude (by default) docdir = $(datadir)/doc/$(PACKAGE) # Automake automagically distributes README without asking.. @@ -402,8 +402,8 @@ 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 @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.png output-html/images/; done + for x in home next prev up; do ln -s @FINKPREFIX@/share/xml/xsl/docbook-xsl/images/$$x.gif output-html/images/; done touch doc-html-stamp --- aptitude-0.3.2/doc/fr/aptitude.xml 2005-05-01 12:16:21.000000000 -0400 +++ aptitude-0.3.2-new/doc/fr/aptitude.xml 2006-04-10 13:05:10.000000000 -0400 @@ -1,7 +1,7 @@ aptitude"> apt'> dselect'> @@ -5547,7 +5547,7 @@ l'affichage, consultez la dfinition du thme par dfaut dans le fichier - /usr/share/aptitude/aptitude-defaults. + @FINKPREFIX@/share/aptitude/aptitude-defaults. @@ -6108,7 +6108,7 @@ Les valeurs par dfaut conserves dans - /usr/share/aptitude/aptitude-defaults. + @FINKPREFIX@/share/aptitude/aptitude-defaults. @@ -6873,7 +6873,7 @@ Les thmes suivants sont fournis avec &aptitude; dans - /usr/share/aptitude/aptitude-defaults : + @FINKPREFIX@/share/aptitude/aptitude-defaults : --- aptitude-0.3.2/doc/fr/manpage.xml 2004-12-03 19:57:24.000000000 -0500 +++ aptitude-0.3.2-new/doc/fr/manpage.xml 2006-04-10 13:05:10.000000000 -0400 @@ -765,7 +765,7 @@ 8, apt 8, - /usr/share/doc/aptitude/html/index.html + @FINKPREFIX@/share/doc/aptitude/html/index.html --- aptitude-0.3.2/po/aptitude.pot 2005-05-01 14:08:32.000000000 -0400 +++ aptitude-0.3.2-new/po/aptitude.pot 2006-04-10 13:05:10.000000000 -0400 @@ -1587,7 +1587,7 @@ msgstr "" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" msgstr "" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 --- aptitude-0.3.2/po/ar.po 2005-05-01 14:08:33.000000000 -0400 +++ aptitude-0.3.2-new/po/ar.po 2006-04-10 13:05:10.000000000 -0400 @@ -1650,8 +1650,8 @@ msgstr "عُثر على عدّة أوصاف للمجموعة %s، تجاهل أحدها" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "تعذر فتح /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "تعذر فتح @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/bs.po 2005-05-01 14:08:33.000000000 -0400 +++ aptitude-0.3.2-new/po/bs.po 2006-04-10 13:05:10.000000000 -0400 @@ -1598,7 +1598,7 @@ msgstr "" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" msgstr "" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 --- aptitude-0.3.2/po/ca.po 2005-05-01 14:08:33.000000000 -0400 +++ aptitude-0.3.2-new/po/ca.po 2006-04-10 13:05:10.000000000 -0400 @@ -1709,8 +1709,8 @@ "ignorant" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "No s'ha pogut obrir /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "No s'ha pogut obrir @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/cs.po 2005-05-01 14:08:33.000000000 -0400 +++ aptitude-0.3.2-new/po/cs.po 2006-04-10 13:05:10.000000000 -0400 @@ -1659,8 +1659,8 @@ msgstr "Pro skupinu %s existuje více popisů, některé ignoruji" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Nemohu otevřít /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Nemohu otevřít @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/da.po 2005-05-01 14:08:33.000000000 -0400 +++ aptitude-0.3.2-new/po/da.po 2006-04-10 13:05:10.000000000 -0400 @@ -1672,8 +1672,8 @@ msgstr "Flere beskrivelser fundet for gruppe %s, ignorerer en" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Kunne ikke bne /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Kunne ikke bne @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/de.po 2005-05-01 14:08:34.000000000 -0400 +++ aptitude-0.3.2-new/po/de.po 2006-04-10 13:05:10.000000000 -0400 @@ -1709,8 +1709,8 @@ msgstr "Mehrere Beschreibungen für Gruppe %s, ignoriere eine" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Kann »/usr/share/tasksel/debian-tasks.desc« nicht öffnen." +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Kann »@FINKPREFIX@/share/tasksel/debian-tasks.desc« nicht öffnen." #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/el.po 2005-05-01 14:08:34.000000000 -0400 +++ aptitude-0.3.2-new/po/el.po 2006-04-10 13:05:10.000000000 -0400 @@ -1712,8 +1712,8 @@ msgstr "Βρέθηκαν πολλαπλές περιγραφές για την ομάδα %s, παραλείπεται μία" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Αδύνατο το άνοιγμα του /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Αδύνατο το άνοιγμα του @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/es.po 2005-05-01 14:08:34.000000000 -0400 +++ aptitude-0.3.2-new/po/es.po 2006-04-10 13:05:10.000000000 -0400 @@ -1712,8 +1712,8 @@ msgstr "Se encontraron múltiples descripciones para el grupo %s, ignorando una" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Incapaz de abrir /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Incapaz de abrir @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/eu.po 2005-05-01 14:08:34.000000000 -0400 +++ aptitude-0.3.2-new/po/eu.po 2006-04-10 13:05:10.000000000 -0400 @@ -1697,8 +1697,8 @@ msgstr "%s taldearentzat azalpen anitz aurkiturik, bat ez ikusia egiten" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Ezin da /usr/share/tasksel/debian-tasks.desc ireki" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Ezin da @FINKPREFIX@/share/tasksel/debian-tasks.desc ireki" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/fi.po 2005-05-01 14:08:34.000000000 -0400 +++ aptitude-0.3.2-new/po/fi.po 2006-04-10 13:05:10.000000000 -0400 @@ -1669,8 +1669,8 @@ msgstr "Ryhmällä %s on yli yksi kuvaus, sivuutan yhden" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "En pystynyt avaamaan tiedostoa /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "En pystynyt avaamaan tiedostoa @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/fr.po 2005-05-01 14:08:35.000000000 -0400 +++ aptitude-0.3.2-new/po/fr.po 2006-04-10 13:05:10.000000000 -0400 @@ -1722,8 +1722,8 @@ "elles est ignorée" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Impossible d'ouvrir /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Impossible d'ouvrir @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/gl.po 2005-05-01 14:08:35.000000000 -0400 +++ aptitude-0.3.2-new/po/gl.po 2006-04-10 13:05:10.000000000 -0400 @@ -1636,7 +1636,7 @@ msgstr "" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" msgstr "" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 --- aptitude-0.3.2/po/it.po 2005-05-01 14:08:35.000000000 -0400 +++ aptitude-0.3.2-new/po/it.po 2006-04-10 13:05:10.000000000 -0400 @@ -1728,8 +1728,8 @@ "È stata trovata più di una descrizione per il gruppo %s, una verrà ignorata" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Impossibile aprire /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Impossibile aprire @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/ja.po 2005-05-01 14:08:35.000000000 -0400 +++ aptitude-0.3.2-new/po/ja.po 2006-04-10 13:05:10.000000000 -0400 @@ -1682,8 +1682,8 @@ msgstr "%s のグループで複数の説明が見つかりました。無視します" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "/usr/share/tasksel/debian-tasks.desc が開けません" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "@FINKPREFIX@/share/tasksel/debian-tasks.desc が開けません" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/lt.po 2005-05-01 14:08:35.000000000 -0400 +++ aptitude-0.3.2-new/po/lt.po 2006-04-10 13:05:10.000000000 -0400 @@ -1683,8 +1683,8 @@ msgstr "Grupėje %s yra keli aprašai, vieną ignoruoju" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Negaliu atidaryti /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Negaliu atidaryti @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/nb.po 2005-05-01 14:08:35.000000000 -0400 +++ aptitude-0.3.2-new/po/nb.po 2006-04-10 13:05:10.000000000 -0400 @@ -1682,8 +1682,8 @@ msgstr "Flere beskrivelser er funnet for gruppe %s, ignorerer en" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Ikke i stand til å åpne /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Ikke i stand til å åpne @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/nl.po 2005-05-01 14:08:35.000000000 -0400 +++ aptitude-0.3.2-new/po/nl.po 2006-04-10 13:05:10.000000000 -0400 @@ -1703,8 +1703,8 @@ msgstr "Meerdere beschrijvingen gevonden voor groep %s, één wordt genegeerd" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Onmogelijk om /usr/share/tasksel/debian-task.desc te openen" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Onmogelijk om @FINKPREFIX@/share/tasksel/debian-task.desc te openen" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/nn.po 2005-05-01 14:08:36.000000000 -0400 +++ aptitude-0.3.2-new/po/nn.po 2006-04-10 13:05:10.000000000 -0400 @@ -1679,8 +1679,8 @@ msgstr "Fleire skildringar er funne for gruppe %s, ignorerar ei" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Ikkje i stand til å opna /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Ikkje i stand til å opna @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/pl.po 2005-05-01 14:08:36.000000000 -0400 +++ aptitude-0.3.2-new/po/pl.po 2006-04-10 13:05:10.000000000 -0400 @@ -1674,8 +1674,8 @@ msgstr "Znaleziony powtrzony opis dla grupy %s. Jeden zostanie pominity." #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Nie mona otworzy /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Nie mona otworzy @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/pt.po 2005-05-01 14:08:36.000000000 -0400 +++ aptitude-0.3.2-new/po/pt.po 2006-04-10 13:05:11.000000000 -0400 @@ -1708,8 +1708,8 @@ msgstr "Múltiplas descrições encontradas para o grupo %s, ignorando uma" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Não foi possível abrir /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Não foi possível abrir @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/pt_BR.po 2005-05-01 14:08:37.000000000 -0400 +++ aptitude-0.3.2-new/po/pt_BR.po 2006-04-10 13:05:11.000000000 -0400 @@ -1703,8 +1703,8 @@ msgstr "Múltiplas descrições encontradas para o grupo %s, ignorando uma" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Não foi possível abrir /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Não foi possível abrir @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/ro.po 2005-05-01 14:08:37.000000000 -0400 +++ aptitude-0.3.2-new/po/ro.po 2006-04-10 13:05:11.000000000 -0400 @@ -1701,8 +1701,8 @@ msgstr "Multiple descrieri găsite pentru grupul %s, una ignorarată" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Nu pot să deschid /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Nu pot să deschid @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/ru.po 2005-05-01 14:08:37.000000000 -0400 +++ aptitude-0.3.2-new/po/ru.po 2006-04-10 13:05:11.000000000 -0400 @@ -1689,8 +1689,8 @@ msgstr "Найдено несколько описаний для группы %s, одно игнорируется" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Не удаётся открыть /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Не удаётся открыть @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/sk.po 2005-05-01 14:08:37.000000000 -0400 +++ aptitude-0.3.2-new/po/sk.po 2006-04-10 13:05:11.000000000 -0400 @@ -1661,8 +1661,8 @@ msgstr "Na skupinu %s existuje viac popisov, niektoré ignorujem" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Nemôžem otvoriť /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Nemôžem otvoriť @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/tl.po 2005-05-01 14:08:37.000000000 -0400 +++ aptitude-0.3.2-new/po/tl.po 2006-04-10 13:05:11.000000000 -0400 @@ -1704,8 +1704,8 @@ msgstr "Maraming deskripsyon ang nakita para sa grupo %s, hayaan ang isa" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Hindi mabuksan ang /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Hindi mabuksan ang @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/tr.po 2005-05-01 14:08:37.000000000 -0400 +++ aptitude-0.3.2-new/po/tr.po 2006-04-10 13:05:11.000000000 -0400 @@ -1673,8 +1673,8 @@ msgstr "%s için birden fazla tanım bulundu, biri gözardı ediliyor" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "/usr/share/tasksel/debian-tasks.desc açılamıyor" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "@FINKPREFIX@/share/tasksel/debian-tasks.desc açılamıyor" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/vi.po 2005-05-01 14:08:38.000000000 -0400 +++ aptitude-0.3.2-new/po/vi.po 2006-04-10 13:05:11.000000000 -0400 @@ -1693,8 +1693,8 @@ msgstr "Gặp nhiều mô tả cho nhóm %s nên bỏ qua một điều." #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "Không thể mở tập tin /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "Không thể mở tập tin @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/zh_CN.po 2005-05-01 14:08:38.000000000 -0400 +++ aptitude-0.3.2-new/po/zh_CN.po 2006-04-10 13:05:11.000000000 -0400 @@ -1649,8 +1649,8 @@ msgstr "发现组 %s 的多个描述，忽略其中一个" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "无法打开 /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "无法打开 @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/po/zh_TW.po 2005-05-01 14:08:38.000000000 -0400 +++ aptitude-0.3.2-new/po/zh_TW.po 2006-04-10 13:05:11.000000000 -0400 @@ -1651,8 +1651,8 @@ msgstr "發現組 %s 的多個描述，忽略其中一個" #: src/generic/tasks.cc:295 -msgid "Unable to open /usr/share/tasksel/debian-tasks.desc" -msgstr "無法開啟 /usr/share/tasksel/debian-tasks.desc" +msgid "Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc" +msgstr "無法開啟 @FINKPREFIX@/share/tasksel/debian-tasks.desc" #: src/generic/tasks.cc:302 src/generic/tasks.cc:344 src/generic/tasks.cc:346 msgid "Reading task descriptions" --- aptitude-0.3.2/src/apt_options.cc 2005-04-26 22:49:51.000000000 -0400 +++ aptitude-0.3.2-new/src/apt_options.cc 2006-04-10 13:06:55.000000000 -0400 @@ -172,7 +172,7 @@ true), option_item(N_("File to log actions into"), PACKAGE "::Log", - "/var/log/aptitude"), + "@FINKPREFIX@/var/log/aptitude"), option_item() }; --- aptitude-0.3.2/src/cmdline/cmdline_resolver.cc 2005-05-01 10:48:24.000000000 -0400 +++ aptitude-0.3.2-new/src/cmdline/cmdline_resolver.cc 2006-04-10 13:05:11.000000000 -0400 @@ -282,8 +282,8 @@ // NoMoreExceptions flows to the outer catch. break; case 'N': - done=true; - break; + cout << _("Abandoning all efforts to resolve these dependencies.") << endl; + return false; default: cout << _("Invalid response; please enter 'y' or 'n'.") << endl; } --- aptitude-0.3.2/src/download.cc 2005-04-27 22:41:48.000000000 -0400 +++ aptitude-0.3.2-new/src/download.cc 2006-04-10 13:07:00.000000000 -0400 @@ -419,7 +419,7 @@ vector logs; - string main_log=aptcfg->Find(PACKAGE "::Log", "/var/log/" PACKAGE); + string main_log=aptcfg->Find(PACKAGE "::Log", "@FINKPREFIX@/var/log/" PACKAGE); if(!main_log.empty()) logs.push_back(main_log); --- aptitude-0.3.2/src/download_item.cc 2005-05-01 12:24:33.000000000 -0400 +++ aptitude-0.3.2-new/src/download_item.cc 2006-04-10 13:05:11.000000000 -0400 @@ -41,8 +41,6 @@ return get_color("DownloadHit"); case pkgAcquire::Item::StatError: return get_color("Error"); - case pkgAcquire::Item::StatAuthError: - return get_color("Error"); default: assert(0); } @@ -106,9 +104,6 @@ case pkgAcquire::Item::StatError: output+=item.Owner->ErrorText; break; - case pkgAcquire::Item::StatAuthError: - output+=item.Owner->ErrorText; - break; } win->mvaddnstr(y, 0, output.c_str(), width); --- aptitude-0.3.2/src/generic/Makefile.in 2005-05-01 14:16:19.000000000 -0400 +++ aptitude-0.3.2-new/src/generic/Makefile.in 2006-04-10 13:05:11.000000000 -0400 @@ -135,7 +135,7 @@ pkg_hier_dump_OBJECTS = pkg_hier_dump.o pkg_hier_dump_DEPENDENCIES = libgeneric.a -pkg_hier_dump_LDFLAGS = +pkg_hier_dump_LDFLAGS = @INTLLIBS@ CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX) --- aptitude-0.3.2/src/generic/apt.cc 2005-05-01 12:22:02.000000000 -0400 +++ aptitude-0.3.2-new/src/generic/apt.cc 2006-04-10 13:05:11.000000000 -0400 @@ -479,7 +479,7 @@ { pkgIndexFile *index; - if(apt_source_list->FindIndex(i.File(), index) && !index->IsTrusted()) + if(apt_source_list->FindIndex(i.File(), index)) return false; } --- aptitude-0.3.2/src/generic/aptcache.cc 2005-05-01 11:44:05.000000000 -0400 +++ aptitude-0.3.2-new/src/generic/aptcache.cc 2006-04-10 13:05:11.000000000 -0400 @@ -1467,7 +1467,7 @@ { try { - solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 100)))); + solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000)))); selected_solution=0; out_of_time=false; selected_solution_changed(); @@ -1488,7 +1488,7 @@ { // otherwise weirdness is happening. assert(!out_of_time); - solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 100)))); + solutions.push_back(new aptitude_resolver::solution(resolver->find_next_solution(aptcfg->FindI(PACKAGE "::ProblemResolver::StepLimit", 5000)))); ++selected_solution; selected_solution_changed(); return *solutions.back(); @@ -1533,7 +1533,7 @@ resolver->dump_scores(out); - out << "EXPECT ( " << aptcfg->FindI(PACKAGE "::Resolver::StepLimit", 100) << " ANY )" << endl; + out << "EXPECT ( " << aptcfg->FindI(PACKAGE "::Resolver::StepLimit", 5000) << " ANY )" << endl; } //////////////////// END PROBLEM RESOLVER INTERFACE //////////////////// --- aptitude-0.3.2/src/generic/aptitude_resolver.h 2005-04-30 14:42:56.000000000 -0400 +++ aptitude-0.3.2-new/src/generic/aptitude_resolver.h 2006-04-10 13:05:11.000000000 -0400 @@ -216,8 +216,10 @@ } class revdep_iterator; + class dep_iterator; revdep_iterator revdeps_begin() const; + dep_iterator deps_begin() const; }; inline aptitude_resolver_version aptitude_resolver_package::current_version() const @@ -518,11 +520,145 @@ } }; +/** Iterates over the distinct dependencies of a version. These + * include its direct/indirect dependencies (separated into OR + * groups) and its direct/indirect conflicts (one apiece). + */ +class aptitude_resolver_version::dep_iterator +{ + pkgDepCache *cache; + pkgCache::DepIterator dep; + pkgCache::PrvIterator prv; + /** If \b true, then dep is a Conflicts and we are iterating over + * the packages providing its target. + */ + bool prv_open; + + void normalize() + { + if(prv_open) + { + assert(!dep.end()); + assert(dep->Type == pkgCache::Dep::Conflicts); + + while(!prv.end() && prv.OwnerPkg()==dep.ParentPkg()) + ++prv; + + if(prv.end()) + { + prv_open=false; + ++dep; + } + else + return; + } + + assert(!prv_open); + + + // Skip non-critical and self dependencies. Need to do this here + // as well as below in case dep already points to such a + // dependency. + while(!dep.end() && + (dep.ParentPkg() == dep.TargetPkg() || + !dep.IsCritical())) + ++dep; + + // If we ran out of deps, we're done! + } + +public: + dep_iterator(pkgDepCache *_cache) + :cache(_cache), + prv(*_cache, 0, (pkgCache::Package *) 0), + prv_open(false) + { + } + + + dep_iterator(const pkgCache::DepIterator &start, + pkgDepCache *_cache) + :cache(_cache), + dep(start), + prv(*_cache, 0, (pkgCache::Package *) 0), + prv_open(false) + { + normalize(); + } + + dep_iterator &operator=(const dep_iterator &other) + { + cache=other.cache; + dep=other.dep; + prv=other.prv; + prv_open=other.prv_open; + + return *this; + } + + aptitude_resolver_dep operator*() const + { + return aptitude_resolver_dep(dep, prv, cache); + } + + bool end() const + { + return dep.end(); + } + + dep_iterator &operator++() + { + assert(!dep.end()); + + // If the Provides list is nonempty, advance it. + if(!prv.end()) + ++prv; + // If we weren't trying to iterate over a Provides list *and* the + // current dep is a non-versioned Conflicts, start such an + // iteration. + else if(!prv_open && dep->Type == pkgCache::Dep::Conflicts && + !dep.TargetVer()) + { + prv_open=true; + prv=dep.TargetPkg().ProvidesList(); + } + // Otherwise push on to the next top-level dep. + else + { + if(!dep.end() && dep->Type == pkgCache::Dep::Conflicts) + ++dep; + else + { + // If it's not a conflict, skip a whole OR group. + while(!dep.end() && (dep->CompareOp & pkgCache::Dep::Or)) + ++dep; + + // Now we're on the last element of the OR group, push + // forward. + if(!dep.end()) + ++dep; + } + } + + normalize(); + + return *this; + } +}; + inline aptitude_resolver_version::revdep_iterator aptitude_resolver_version::revdeps_begin() const { return revdep_iterator(ver, cache); } +inline aptitude_resolver_version::dep_iterator aptitude_resolver_version::deps_begin() const +{ + if(ver.end()) + return dep_iterator(cache); + else + return dep_iterator(ver.DependsList(), cache); +} + /** This class uses a technique similar to rev_dep_lst. It assumes * that the dependency is critical (noncritical deps are weeded out * by the universe's broken_dep_iterator and hidden from the @@ -834,10 +970,10 @@ pkgCache::VerIterator direct_ver=S.version_of(aptitude_resolver_package(const_cast(start).TargetPkg(), cache)).get_ver(); - if(!(!direct_ver.end() && - _system->VS->CheckDep(direct_ver.VerStr(), - start->CompareOp, - start.TargetVer()))) + if(!direct_ver.end() && + _system->VS->CheckDep(direct_ver.VerStr(), + start->CompareOp, + start.TargetVer())) return true; else return false; @@ -926,57 +1062,21 @@ { pkgDepCache *cache; - class pkgCache::PkgIterator pkg; - class pkgCache::VerIterator ver; - class pkgCache::DepIterator dep; - class pkgCache::PrvIterator prv; - bool prv_open; + pkgCache::PkgIterator pkg; + pkgCache::VerIterator ver; + aptitude_resolver_version::dep_iterator dep; // Advance to the next valid dep (inclusive of dep). void normalize() { - // If prv_open, we are iterating over the Provides of something - // upon which a package depends. This is a good situation - // *unless* we ran out of Provides or we have an indirect - // self-conflict. - if(prv_open) - { - assert(!dep.end()); - assert(dep->Type == pkgCache::Dep::Conflicts); - - while(!prv.end() && prv.OwnerPkg()==dep.ParentPkg()) - ++prv; - - if(prv.end()) - { - prv_open=false; - ++dep; - } - else - return; - } - - assert(!prv_open); - - // Skip any dependencies that shouldn't show up in the output. - // Need to do this here as well as below in case dep already - // points to such a dependency. - while(!dep.end() && - (dep.ParentPkg() == dep.TargetPkg() || - !dep.IsCritical())) - ++dep; - - // Now, if we ran our of deps, try to find another one. while(dep.end() && !pkg.end()) { while(dep.end() && !ver.end()) { - // Since dep is an end iterator, advance at least - // to the next version. ++ver; - if(!ver.end()) - dep=ver.DependsList(); + dep=aptitude_resolver_version::dep_iterator(ver.DependsList(), + cache); } if(dep.end()) @@ -986,80 +1086,41 @@ { ver=pkg.VersionList(); if(!ver.end()) - dep=ver.DependsList(); + dep=aptitude_resolver_version::dep_iterator(ver.DependsList(), + cache); } } - - // Avoid direct self-deps and non-critical - // deps. (self-conflicts in particular, but a non-conflict - // self-dep is pointless) - while(!dep.end() && - (dep.ParentPkg() == dep.TargetPkg() || - !dep.IsCritical())) - ++dep; } } public: -#if 0 - dep_iterator() - :cache(0) - { - } -#endif - // Start from the given package (typically Head() or End()). dep_iterator(const pkgCache::PkgIterator &_pkg, pkgDepCache *_cache) :cache(_cache), - pkg(_pkg), prv(*_cache, 0, (pkgCache::Package *) 0), - prv_open(false) + pkg(_pkg), + ver(_pkg.VersionList()), + dep(_cache) { if(!pkg.end()) ver=pkg.VersionList(); if(!ver.end()) - dep=ver.DependsList(); + dep=aptitude_resolver_version::dep_iterator(ver.DependsList(), + _cache); normalize(); } aptitude_universe::dep operator*() const { - return aptitude_universe::dep(dep, prv, cache); + return *dep; } dep_iterator &operator++() { assert(!dep.end()); - // If the Provides list is open, advance it. - if(!prv.end()) - ++prv; - // otherwise, if we aren't trying to iterate over a Provides - // list and the current dep is a Conflicts, start such an - // iteration. - else if(!prv_open && dep->Type == pkgCache::Dep::Conflicts) - { - prv_open=true; - prv=dep.TargetPkg().ProvidesList(); - } - // Otherwise just advance blindly. - else - { - if(!dep.end() && dep->Type == pkgCache::Dep::Conflicts) - ++dep; - else - { - // Advance to the end of the OR... - while(!dep.end() && (dep->CompareOp & pkgCache::Dep::Or)) - ++dep; - - // ...and beyond! - if(!dep.end()) - ++dep; - } - } + ++dep; - // Look for a valid dep. normalize(); return *this; --- aptitude-0.3.2/src/generic/config_signal.cc 2005-01-09 03:45:31.000000000 -0500 +++ aptitude-0.3.2-new/src/generic/config_signal.cc 2006-04-10 13:05:11.000000000 -0400 @@ -122,5 +122,5 @@ void signalling_config::Dump(ostream &out) { - user_config->Dump(out); + user_config->Dump(); } --- aptitude-0.3.2/src/generic/problemresolver/problemresolver.h 2005-05-01 10:54:11.000000000 -0400 +++ aptitude-0.3.2-new/src/generic/problemresolver/problemresolver.h 2006-04-10 13:05:11.000000000 -0400 @@ -754,6 +754,13 @@ !rd.end(); ++rd) if((*rd).broken_under(tmpsol)) new_broken.insert(*rd); + + // Remember: the dependencies of the *new versions being + // installed* might also be broken! + for(typename version::dep_iterator di=v.deps_begin(); + !di.end(); ++di) + if((*di).broken_under(tmpsol)) + new_broken.insert(*di); } const std::set &old_broken=s.get_broken(); --- aptitude-0.3.2/src/generic/problemresolver/test.cc 2005-05-01 11:53:14.000000000 -0400 +++ aptitude-0.3.2-new/src/generic/problemresolver/test.cc 2006-04-10 13:05:11.000000000 -0400 @@ -177,6 +177,7 @@ const dummy_package *package; vector revdeps; + vector deps; /** The numerical ID of this version. */ int ID; @@ -184,6 +185,7 @@ dummy_version(const dummy_version &other); public: typedef vector::const_iterator revdep_iterator; + typedef vector::const_iterator dep_iterator; dummy_version(string _name, const dummy_package *_package, unsigned int id) @@ -214,10 +216,18 @@ revdeps.push_back(dep); } + void add_dep(dummy_dep *dep) + { + deps.push_back(dep); + } + const dummy_package &get_package() const {return *package;} revdep_iterator revdeps_begin() const {return revdeps.begin();} revdep_iterator revdeps_end() const {return revdeps.end();} + + dep_iterator deps_begin() const {return deps.begin();} + dep_iterator deps_end() const {return deps.end();} }; dummy_package::dummy_package(string _name, unsigned int id) @@ -245,7 +255,7 @@ */ class dummy_dep { - const dummy_version *source; + dummy_version *source; vector target_set; dummy_dep(const dummy_dep &other); @@ -254,7 +264,7 @@ public: typedef vector::const_iterator solver_iterator; - dummy_dep(const dummy_version *_source, + dummy_dep(dummy_version *_source, const vector &_target_set, unsigned int _ID) :source(_source), target_set(_target_set), ID(_ID) @@ -276,7 +286,7 @@ return ID revdep_iterator; + typedef wrap_ptr_iter dep_iterator; version():real_version(0) {} version(const dummy_version *_real_version) @@ -413,6 +424,12 @@ return wrap_ptr_iter(real_version->revdeps_begin(), real_version->revdeps_end()); } + + wrap_ptr_iter deps_begin() const + { + return wrap_ptr_iter(real_version->deps_begin(), + real_version->deps_end()); + } }; @@ -651,6 +668,8 @@ dummy_dep *newdep=deps.back(); + newdep->get_source().add_dep(newdep); + for(dummy_dep::solver_iterator i=newdep->solvers_begin(); i!=newdep->solvers_end(); ++i) (*i)->add_revdep(newdep); --- aptitude-0.3.2/src/generic/tasks.cc 2004-12-03 21:15:25.000000000 -0500 +++ aptitude-0.3.2-new/src/generic/tasks.cc 2006-04-10 13:05:11.000000000 -0400 @@ -282,7 +282,7 @@ FileFd task_file; // Load the task descriptions: - task_file.Open("/usr/share/tasksel/debian-tasks.desc", FileFd::ReadOnly); + task_file.Open("@FINKPREFIX@/share/tasksel/debian-tasks.desc", FileFd::ReadOnly); if(!task_file.IsOpen()) { @@ -292,7 +292,7 @@ // tasksel installed) if(errno!=ENOENT) _error->Errno("load_tasks", - _("Unable to open /usr/share/tasksel/debian-tasks.desc")); + _("Unable to open @FINKPREFIX@/share/tasksel/debian-tasks.desc")); return; } --- aptitude-0.3.2/src/solution_fragment.cc 2005-04-26 20:18:52.000000000 -0400 +++ aptitude-0.3.2-new/src/solution_fragment.cc 2006-04-10 13:05:11.000000000 -0400 @@ -67,16 +67,15 @@ { // Bin packages according to what will happen to them. vector remove_packages; - vector keep_packages; + vector keep_packages; vector install_packages; vector downgrade_packages; vector upgrade_packages; sort(remove_packages.begin(), remove_packages.end(), pkg_name_lt()); - sort(keep_packages.begin(), keep_packages.end(), - ver_name_lt()); + pkg_name_lt()); sort(install_packages.begin(), install_packages.end(), ver_name_lt()); sort(downgrade_packages.begin(), downgrade_packages.end(), @@ -93,11 +92,16 @@ pkgCache::VerIterator newver=i->second.ver.get_ver(); if(curver.end()) - install_packages.push_back(newver); + { + if(newver.end()) + keep_packages.push_back(pkg); + else + install_packages.push_back(newver); + } else if(newver.end()) remove_packages.push_back(pkg); else if(newver == curver) - keep_packages.push_back(curver); + keep_packages.push_back(pkg); else { int cmp=_system->VS->CmpVersion(curver.VerStr(), @@ -146,12 +150,19 @@ if(!keep_packages.empty()) { fragments.push_back(fragf(_("%BKeep%b the following packages at their current version:%n"))); - for(vector::const_iterator i=keep_packages.begin(); + for(vector::const_iterator i=keep_packages.begin(); i!=keep_packages.end(); ++i) - fragments.push_back(fragf(" %s [%s (%F)]%n", - i->ParentPkg().Name(), - i->VerStr(), - archives_fragment(*i))); + { + if(i->CurrentVer().end()) + fragments.push_back(fragf(" %s [%s]%n", + i->Name(), + _("Not Installed"))); + else + fragments.push_back(fragf(" %s [%s (%F)]%n", + i->Name(), + i->CurrentVer().VerStr(), + archives_fragment(i->CurrentVer()))); + } fragments.push_back(newline_fragment()); } --- aptitude-0.3.2/src/vscreen/Makefile.in 2005-05-01 14:16:21.000000000 -0400 +++ aptitude-0.3.2-new/src/vscreen/Makefile.in 2006-04-10 13:05:11.000000000 -0400 @@ -140,7 +140,7 @@ testvscreen_OBJECTS = testvscreen.o testvscreen_DEPENDENCIES = libvscreen.a config/libconf.a -testvscreen_LDFLAGS = +testvscreen_LDFLAGS = @INTLLIBS@ CXXFLAGS = @CXXFLAGS@ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) CXXLD = $(CXX)