[Aptitude-svn-commit] r4247 - in branches/aptitude-0.3/aptitude: .
src src/cmdline src/generic/apt src/generic/problemresolver
src/generic/util src/mine src/vscreen src/vscreen/config
Daniel Burrows
dburrows at costa.debian.org
Sat Sep 24 22:10:25 UTC 2005
Author: dburrows
Date: Sat Sep 24 22:10:17 2005
New Revision: 4247
Modified:
branches/aptitude-0.3/aptitude/ChangeLog
branches/aptitude-0.3/aptitude/src/Makefile.am
branches/aptitude-0.3/aptitude/src/apt_config_widgets.cc
branches/aptitude-0.3/aptitude/src/apt_info_tree.cc
branches/aptitude-0.3/aptitude/src/apt_options.cc
branches/aptitude-0.3/aptitude/src/apt_undo_tree.cc
branches/aptitude-0.3/aptitude/src/broken_indicator.cc
branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_clean.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_dump_resolver.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_forget_new.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show_broken.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_simulate.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc
branches/aptitude-0.3/aptitude/src/cmdline/cmdline_util.cc
branches/aptitude-0.3/aptitude/src/dep_item.cc
branches/aptitude-0.3/aptitude/src/desc_parse.cc
branches/aptitude-0.3/aptitude/src/download.cc
branches/aptitude-0.3/aptitude/src/download_list.cc
branches/aptitude-0.3/aptitude/src/download_screen.cc
branches/aptitude-0.3/aptitude/src/download_thread.h
branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc
branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h
branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc
branches/aptitude-0.3/aptitude/src/generic/apt/apt.cc
branches/aptitude-0.3/aptitude/src/generic/apt/apt_undo_group.h
branches/aptitude-0.3/aptitude/src/generic/apt/aptcache.cc
branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver.h
branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver_universe.cc
branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.cc
branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.h
branches/aptitude-0.3/aptitude/src/generic/apt/config_signal.h
branches/aptitude-0.3/aptitude/src/generic/apt/matchers.cc
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_acqfile.cc
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_changelog.cc
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.cc
branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.h
branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.cc
branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.h
branches/aptitude-0.3/aptitude/src/generic/apt/tags.cc
branches/aptitude-0.3/aptitude/src/generic/apt/tasks.cc
branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/problemresolver/dummy_universe.h
branches/aptitude-0.3/aptitude/src/generic/problemresolver/exceptions.h
branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
branches/aptitude-0.3/aptitude/src/generic/problemresolver/resolver_undo.h
branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am
branches/aptitude-0.3/aptitude/src/generic/util/dense_setset.h
branches/aptitude-0.3/aptitude/src/generic/util/strhash.h
branches/aptitude-0.3/aptitude/src/generic/util/threads.cc
branches/aptitude-0.3/aptitude/src/load_config.cc
branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc
branches/aptitude-0.3/aptitude/src/load_pkgview.cc
branches/aptitude-0.3/aptitude/src/main.cc
branches/aptitude-0.3/aptitude/src/menu_tree.cc
branches/aptitude-0.3/aptitude/src/mine/Makefile.am
branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc
branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc
branches/aptitude-0.3/aptitude/src/pkg_info_screen.cc
branches/aptitude-0.3/aptitude/src/pkg_item.cc
branches/aptitude-0.3/aptitude/src/pkg_node.cc
branches/aptitude-0.3/aptitude/src/pkg_node.h
branches/aptitude-0.3/aptitude/src/pkg_subtree.cc
branches/aptitude-0.3/aptitude/src/pkg_tree.cc
branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
branches/aptitude-0.3/aptitude/src/pkg_view.cc
branches/aptitude-0.3/aptitude/src/reason_fragment.cc
branches/aptitude-0.3/aptitude/src/reason_fragment.h
branches/aptitude-0.3/aptitude/src/solution_dialog.cc
branches/aptitude-0.3/aptitude/src/solution_fragment.cc
branches/aptitude-0.3/aptitude/src/solution_fragment.h
branches/aptitude-0.3/aptitude/src/solution_item.cc
branches/aptitude-0.3/aptitude/src/solution_item.h
branches/aptitude-0.3/aptitude/src/solution_screen.cc
branches/aptitude-0.3/aptitude/src/trust.cc
branches/aptitude-0.3/aptitude/src/ui.cc
branches/aptitude-0.3/aptitude/src/view_changelog.cc
branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am
branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am
branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc
branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.cc
branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.h
branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc
branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h
branches/aptitude-0.3/aptitude/src/vscreen/config/style.h
branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc
Log:
Fix up include file paths; correct some weird/wrong -I directives
in the process.
Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog (original)
+++ branches/aptitude-0.3/aptitude/ChangeLog Sat Sep 24 22:10:17 2005
@@ -1,5 +1,10 @@
2005-09-24 Daniel Burrows <dburrows at debian.org>
+ * src/***:
+
+ Fix all the include file problems and other stuff arising from
+ the reorganization.
+
* po/POTFILES.in:
Update POTFILES.in.
Modified: branches/aptitude-0.3/aptitude/src/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/Makefile.am Sat Sep 24 22:10:17 2005
@@ -3,7 +3,7 @@
SUBDIRS=generic vscreen cmdline mine
localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl
+INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
bin_PROGRAMS=aptitude
Modified: branches/aptitude-0.3/aptitude/src/apt_config_widgets.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/apt_config_widgets.cc (original)
+++ branches/aptitude-0.3/aptitude/src/apt_config_widgets.cc Sat Sep 24 22:10:17 2005
@@ -18,8 +18,9 @@
// Boston, MA 02111-1307, USA.
#include "apt_config_widgets.h"
-#include <generic/apt.h>
-#include <generic/config_signal.h>
+
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include <vscreen/config/colors.h>
#include <vscreen/fragment.h>
Modified: branches/aptitude-0.3/aptitude/src/apt_info_tree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/apt_info_tree.cc (original)
+++ branches/aptitude-0.3/aptitude/src/apt_info_tree.cc Sat Sep 24 22:10:17 2005
@@ -19,7 +19,7 @@
#include "apt_info_tree.h"
-#include "generic/apt.h"
+#include <generic/apt/apt.h>
#include <sigc++/functors/mem_fun.h>
Modified: branches/aptitude-0.3/aptitude/src/apt_options.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/apt_options.cc (original)
+++ branches/aptitude-0.3/aptitude/src/apt_options.cc Sat Sep 24 22:10:17 2005
@@ -18,8 +18,8 @@
#include <vscreen/config/keybindings.h>
#include <vscreen/config/colors.h>
-#include <generic/apt.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include <sigc++/adaptors/bind.h>
#include <sigc++/functors/mem_fun.h>
Modified: branches/aptitude-0.3/aptitude/src/apt_undo_tree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/apt_undo_tree.cc (original)
+++ branches/aptitude-0.3/aptitude/src/apt_undo_tree.cc Sat Sep 24 22:10:17 2005
@@ -21,8 +21,9 @@
#include "ui.h"
-#include <generic/apt.h>
-#include <generic/undo.h>
+#include <generic/apt/apt.h>
+
+#include <generic/util/undo.h>
apt_undo_tree::apt_undo_tree()
{
Modified: branches/aptitude-0.3/aptitude/src/broken_indicator.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/broken_indicator.cc (original)
+++ branches/aptitude-0.3/aptitude/src/broken_indicator.cc Sat Sep 24 22:10:17 2005
@@ -21,14 +21,16 @@
#include <aptitude.h>
-#include <generic/apt.h>
-#include <generic/aptcache.h>
-#include <generic/aptitude_resolver_universe.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/aptcache.h>
+#include <generic/apt/aptitude_resolver_universe.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/resolver_manager.h>
+
#include <generic/problemresolver/exceptions.h>
#include <generic/problemresolver/solution.h>
-#include <generic/resolver_manager.h>
-#include <generic/util.h>
+
+#include <generic/util/util.h>
#include <vscreen/config/colors.h>
#include <vscreen/config/keybindings.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/Makefile.am Sat Sep 24 22:10:17 2005
@@ -1,4 +1,4 @@
-INCLUDES=-I..
+INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
noinst_LIBRARIES=libcmdline.a
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_action.cc Sat Sep 24 22:10:17 2005
@@ -7,10 +7,10 @@
#include <aptitude.h>
-#include <generic/apt.h>
-#include <generic/config_signal.h>
-#include <generic/matchers.h>
-#include <generic/tasks.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/matchers.h>
+#include <generic/apt/tasks.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_changelog.cc Sat Sep 24 22:10:17 2005
@@ -11,8 +11,8 @@
#include <aptitude.h>
#include <download_manager.h>
-#include <generic/apt.h>
-#include <generic/pkg_changelog.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/pkg_changelog.h>
#include <apt-pkg/error.h>
#include <apt-pkg/metaindex.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_clean.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_clean.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_clean.cc Sat Sep 24 22:10:17 2005
@@ -6,8 +6,8 @@
#include <aptitude.h>
-#include <generic/apt.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include <apt-pkg/acquire.h>
#include <apt-pkg/clean.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_do_action.cc Sat Sep 24 22:10:17 2005
@@ -15,8 +15,8 @@
#include "../download_manager.h"
-#include <generic/apt.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include <aptitude.h>
#include <download.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc Sat Sep 24 22:10:17 2005
@@ -11,8 +11,8 @@
#include <aptitude.h>
#include <download_manager.h>
-#include <generic/apt.h>
-#include <generic/pkg_acqfile.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/pkg_acqfile.h>
#include <apt-pkg/acquire.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_dump_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_dump_resolver.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_dump_resolver.cc Sat Sep 24 22:10:17 2005
@@ -21,7 +21,7 @@
#include "cmdline_dump_resolver.h"
-#include <generic/aptitude_resolver_universe.h>
+#include <generic/apt/aptitude_resolver_universe.h>
#include <generic/problemresolver/dump_universe.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_forget_new.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_forget_new.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_forget_new.cc Sat Sep 24 22:10:17 2005
@@ -6,7 +6,7 @@
#include <aptitude.h>
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc Sat Sep 24 22:10:17 2005
@@ -2,7 +2,7 @@
#include <sys/ioctl.h>
-#include <generic/acqprogress.h>
+#include <generic/apt/acqprogress.h>
#include <sigc++/adaptors/bind.h>
#include <sigc++/functors/mem_fun.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc Sat Sep 24 22:10:17 2005
@@ -13,9 +13,9 @@
#include <download_manager.h>
#include <ui.h>
-#include <generic/apt.h>
-#include <generic/infer_reason.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/infer_reason.h>
#include <vscreen/fragment.h>
#include <vscreen/vscreen.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc Sat Sep 24 22:10:17 2005
@@ -30,13 +30,15 @@
#include <aptitude.h>
#include <solution_fragment.h>
-#include <generic/aptcache.h>
-#include <generic/aptitude_resolver_universe.h>
-#include <generic/config_signal.h>
+#include <generic/apt/aptcache.h>
+#include <generic/apt/aptitude_resolver_universe.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/resolver_manager.h>
+
#include <generic/problemresolver/exceptions.h>
#include <generic/problemresolver/solution.h>
-#include <generic/resolver_manager.h>
-#include <generic/util.h>
+
+#include <generic/util/util.h>
#include <vscreen/fragment.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc Sat Sep 24 22:10:17 2005
@@ -12,8 +12,8 @@
#include <pkg_item.h>
#include <pkg_sortpolicy.h>
-#include <generic/apt.h>
-#include <generic/matchers.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/matchers.h>
#include <vscreen/config/column_definition.h>
#include <vscreen/transcode.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc Sat Sep 24 22:10:17 2005
@@ -9,8 +9,8 @@
#include "cmdline_common.h"
-#include <generic/apt.h>
-#include <generic/matchers.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/matchers.h>
#include <vscreen/fragment.h>
#include <vscreen/transcode.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show_broken.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show_broken.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show_broken.cc Sat Sep 24 22:10:17 2005
@@ -8,7 +8,7 @@
#include <aptitude.h>
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <apt-pkg/pkgcache.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_simulate.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_simulate.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_simulate.cc Sat Sep 24 22:10:17 2005
@@ -9,7 +9,7 @@
#include <aptitude.h>
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <apt-pkg/algorithms.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_update.cc Sat Sep 24 22:10:17 2005
@@ -9,7 +9,7 @@
#include <aptitude.h>
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <apt-pkg/error.h>
#include <apt-pkg/progress.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_upgrade.cc Sat Sep 24 22:10:17 2005
@@ -15,7 +15,7 @@
#include <aptitude.h>
#include <download.h>
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <apt-pkg/depcache.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_util.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_util.cc (original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_util.cc Sat Sep 24 22:10:17 2005
@@ -10,7 +10,7 @@
#include <ui.h>
#include <vs_progress.h>
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <vscreen/vscreen.h>
Modified: branches/aptitude-0.3/aptitude/src/dep_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/dep_item.cc (original)
+++ branches/aptitude-0.3/aptitude/src/dep_item.cc Sat Sep 24 22:10:17 2005
@@ -27,8 +27,8 @@
#include "pkg_subtree.h"
#include "pkg_ver_item.h"
-#include "generic/apt.h"
-#include "generic/config_signal.h"
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include <apt-pkg/version.h>
Modified: branches/aptitude-0.3/aptitude/src/desc_parse.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/desc_parse.cc (original)
+++ branches/aptitude-0.3/aptitude/src/desc_parse.cc Sat Sep 24 22:10:17 2005
@@ -24,7 +24,7 @@
#include "aptitude.h"
#include "ui.h"
-#include "generic/tags.h"
+#include <generic/apt/tags.h>
#include <vscreen/fragment.h>
#include <vscreen/transcode.h>
Modified: branches/aptitude-0.3/aptitude/src/download.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download.cc (original)
+++ branches/aptitude-0.3/aptitude/src/download.cc Sat Sep 24 22:10:17 2005
@@ -24,8 +24,8 @@
#include <cmdline/cmdline_progress.h>
-#include <generic/apt.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include "download_manager.h"
Modified: branches/aptitude-0.3/aptitude/src/download_list.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_list.cc (original)
+++ branches/aptitude-0.3/aptitude/src/download_list.cc Sat Sep 24 22:10:17 2005
@@ -7,9 +7,10 @@
#include "download_manager.h"
#include "ui.h"
-#include <generic/apt.h>
-#include <generic/config_signal.h>
-#include <generic/util.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
+
+#include <generic/util/util.h>
#include <apt-pkg/acquire-worker.h>
#include <apt-pkg/acquire-item.h>
Modified: branches/aptitude-0.3/aptitude/src/download_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_screen.cc (original)
+++ branches/aptitude-0.3/aptitude/src/download_screen.cc Sat Sep 24 22:10:17 2005
@@ -37,7 +37,8 @@
#include <sigc++/adaptors/bind.h>
#include <sigc++/functors/ptr_fun.h>
-#include <generic/mut_fun.h>
+
+#include <generic/util/mut_fun.h>
static void set_and_exit(bool &target, bool val)
{
Modified: branches/aptitude-0.3/aptitude/src/download_thread.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/download_thread.h (original)
+++ branches/aptitude-0.3/aptitude/src/download_thread.h Sat Sep 24 22:10:17 2005
@@ -23,7 +23,7 @@
#include <apt-pkg/acquire.h>
#include <apt-pkg/error.h>
-#include <generic/threads.h>
+#include <generic/util/threads.h>
#include <sigc++/slot.h>
Modified: branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc (original)
+++ branches/aptitude-0.3/aptitude/src/edit_pkg_hier.cc Sat Sep 24 22:10:17 2005
@@ -28,7 +28,7 @@
#include <sigc++/functors/mem_fun.h>
#include <sigc++/trackable.h>
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <vscreen/config/keybindings.h>
#include <vscreen/vs_subtree.h>
Modified: branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h (original)
+++ branches/aptitude-0.3/aptitude/src/edit_pkg_hier.h Sat Sep 24 22:10:17 2005
@@ -28,7 +28,7 @@
#ifndef EDIT_PKG_HIER
#define EDIT_PKG_HIER
-#include <generic/pkg_hier.h>
+#include <generic/apt/pkg_hier.h>
#include <apt-pkg/pkgcache.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/Makefile.am Sat Sep 24 22:10:17 2005
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir)/intl
+INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = @LIBINTL@
@@ -38,7 +38,6 @@
pkg_changelog.cc \
pkg_changelog.h \
pkg_hier.cc \
- pkg_hier_dump.cc \
pkg_hier.h \
resolver_manager.cc \
resolver_manager.h \
@@ -47,3 +46,6 @@
tags.h \
tasks.cc \
tasks.h
+
+pkg_hier_dump_SOURCES = pkg_hier_dump.cc
+pkg_hier_dump_LDADD = libgeneric-apt.a
\ No newline at end of file
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/acqprogress.cc Sat Sep 24 22:10:17 2005
@@ -9,8 +9,10 @@
/*}}}*/
// Include files /*{{{*/
#include "acqprogress.h"
-#include "../aptitude.h"
-#include "../download_manager.h"
+
+
+#include <aptitude.h>
+#include <download_manager.h>
#include <apt-pkg/acquire-item.h>
#include <apt-pkg/acquire-worker.h>
#include <apt-pkg/strutl.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/apt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/apt.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/apt.cc Sat Sep 24 22:10:17 2005
@@ -20,7 +20,8 @@
// Handles basic apt bookkeeping.
#include "apt.h"
-#include "../aptitude.h"
+
+#include <aptitude.h>
#include "config_signal.h"
@@ -29,7 +30,8 @@
#include "rev_dep_iterator.h"
#include "tags.h"
#include "tasks.h"
-#include "undo.h"
+
+#include <generic/util/undo.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/depcache.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/apt_undo_group.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/apt_undo_group.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/apt_undo_group.h Sat Sep 24 22:10:17 2005
@@ -5,7 +5,7 @@
#ifndef APT_UNDO_GROUP_H
#define APT_UNDO_GROUP_H
-#include "undo.h"
+#include <generic/util/undo.h>
/** An undo group that will call begin_action_group() and
* end_action_group() on the apt cache. The apt cache is accessed
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/aptcache.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/aptcache.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/aptcache.cc Sat Sep 24 22:10:17 2005
@@ -17,16 +17,17 @@
// the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
// Boston, MA 02111-1307, USA.
-#include "../aptitude.h"
+#include "aptcache.h"
+
+#include <aptitude.h>
#include "apt.h"
-#include "aptcache.h"
#include "aptitude_resolver_universe.h"
#include "aptitudepolicy.h"
#include "config_signal.h"
#include "matchers.h"
-#include "problemresolver/solution.h"
-#include "undo.h"
+#include <generic/problemresolver/solution.h>
+#include <generic/util/undo.h>
#include <apt-pkg/error.h>
#include <apt-pkg/sourcelist.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver.h Sat Sep 24 22:10:17 2005
@@ -39,7 +39,7 @@
#include "aptitude_resolver_universe.h"
-#include "problemresolver/problemresolver.h"
+#include <generic/problemresolver/problemresolver.h>
class aptitude_resolver:public generic_problem_resolver<aptitude_universe>
{
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver_universe.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/aptitude_resolver_universe.cc Sat Sep 24 22:10:17 2005
@@ -2,7 +2,7 @@
#include "aptitude_resolver_universe.h"
-#include <problemresolver/solution.h>
+#include <generic/problemresolver/solution.h>
#include <sstream>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.cc Sat Sep 24 22:10:17 2005
@@ -6,10 +6,11 @@
// important", "important for new installs", or "never important".
#include "aptitudepolicy.h"
-#include "../aptitude.h"
+
+#include <aptitude.h>
#ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
#endif
#include "apt.h"
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/aptitudepolicy.h Sat Sep 24 22:10:17 2005
@@ -9,7 +9,7 @@
#define APTITUDEPOLICY_H
#ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
#endif
#include <apt-pkg/policy.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/config_signal.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/config_signal.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/config_signal.h Sat Sep 24 22:10:17 2005
@@ -43,7 +43,7 @@
#include <iosfwd>
#ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
#endif
#ifdef HAVE_HASH_MAP
@@ -60,7 +60,7 @@
#include <vector>
-#include "strhash.h"
+#include <generic/util/strhash.h>
class signalling_config:public sigc::trackable
{
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/matchers.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/matchers.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/matchers.cc Sat Sep 24 22:10:17 2005
@@ -31,12 +31,14 @@
// | <string>
#include "matchers.h"
+
#include "apt.h"
#include "tags.h"
#include "tasks.h"
-#include "util.h"
-#include "../aptitude.h"
+#include <aptitude.h>
+
+#include <generic/util/util.h>
#include <set>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/pkg_acqfile.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/pkg_acqfile.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/pkg_acqfile.cc Sat Sep 24 22:10:17 2005
@@ -21,9 +21,11 @@
#include "pkg_acqfile.h"
-#include "../../config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
-#include "../aptitude.h"
+#include <aptitude.h>
#include <stdio.h>
#include <errno.h>
@@ -38,8 +40,6 @@
#include <apt-pkg/sourcelist.h>
#include <apt-pkg/strutl.h>
-// Let's all sing a song about apt-pkg's brokenness..
-
pkgAcqFileSane::pkgAcqFileSane(pkgAcquire *Owner, string URI,
string Description, string ShortDesc,
string filename):
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/pkg_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/pkg_changelog.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/pkg_changelog.cc Sat Sep 24 22:10:17 2005
@@ -20,8 +20,8 @@
#include "pkg_changelog.h"
#include "pkg_acqfile.h"
-#include "../../config.h"
-#include "../aptitude.h"
+#include <aptitude.h>
+#include <config.h>
#include "apt.h"
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.cc Sat Sep 24 22:10:17 2005
@@ -4,13 +4,13 @@
#include "pkg_hier.h"
+#include <aptitude.h>
+
#include "apt.h"
#include <apt-pkg/error.h>
#include <apt-pkg/tagfile.h>
-#include "../aptitude.h"
-
using namespace std;
using namespace HASH_NAMESPACE;
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/pkg_hier.h Sat Sep 24 22:10:17 2005
@@ -23,7 +23,7 @@
#define PKG_HIER_H
#ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
#endif
#ifdef HAVE_HASH_MAP
@@ -49,7 +49,7 @@
#endif
#endif
-#include "strhash.h"
+#include <generic/util/strhash.h>
#include <string>
#include <vector>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.cc Sat Sep 24 22:10:17 2005
@@ -23,8 +23,9 @@
#include "aptitude_resolver.h"
#include "aptitude_resolver_universe.h"
#include "config_signal.h"
-#include "problemresolver/problemresolver.h"
-#include "undo.h"
+
+#include <generic/problemresolver/problemresolver.h>
+#include <generic/util/undo.h>
#include <sigc++/functors/mem_fun.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/resolver_manager.h Sat Sep 24 22:10:17 2005
@@ -27,8 +27,8 @@
#ifndef RESOLVER_MANAGER_H
#define RESOLVER_MANAGER_H
-#include "exception.h"
-#include "threads.h"
+#include <generic/util/exception.h>
+#include <generic/util/threads.h>
#include <apt-pkg/pkgcache.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/tags.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/tags.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/tags.cc Sat Sep 24 22:10:17 2005
@@ -19,7 +19,7 @@
#include "tags.h"
-#include "../aptitude.h"
+#include <aptitude.h>
#include "apt.h"
#include "config_signal.h"
Modified: branches/aptitude-0.3/aptitude/src/generic/apt/tasks.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/apt/tasks.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/apt/tasks.cc Sat Sep 24 22:10:17 2005
@@ -5,7 +5,7 @@
#include "tasks.h"
#include "apt.h"
-#include "../aptitude.h"
+#include <aptitude.h>
#include <apt-pkg/error.h>
#include <apt-pkg/pkgrecords.h>
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/Makefile.am Sat Sep 24 22:10:17 2005
@@ -1,4 +1,4 @@
-INCLUDES = -Wall @WERROR@ -I../../ -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
+INCLUDES = -Wall @WERROR@ -I../../ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
EXTRA_DIST=model.tex test1.txt test3.txt test4.txt
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/dummy_universe.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/dummy_universe.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/dummy_universe.h Sat Sep 24 22:10:17 2005
@@ -29,7 +29,7 @@
#include <string>
#include <vector>
-#include "../exception.h"
+#include <generic/util/exception.h>
// An error type that's thrown when a name lookup fails.
class NoSuchNameError:public Exception
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/exceptions.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/exceptions.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/exceptions.h Sat Sep 24 22:10:17 2005
@@ -20,7 +20,7 @@
#ifndef EXCEPTIONS_H
#define EXCEPTIONS_H
-#include "../exception.h"
+#include <generic/util/exception.h>
/** Generic errors in the problem resolver. */
class ProblemResolverError : public Exception {
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/problemresolver.h Sat Sep 24 22:10:17 2005
@@ -54,8 +54,8 @@
#include "solution.h"
#include "resolver_undo.h"
-#include "../dense_setset.h"
-#include "../threads.h"
+#include <generic/util/dense_setset.h>
+#include <generic/util/threads.h>
/** A dummy iterator that's always an "end" iterator. */
template<class V>
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/resolver_undo.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/resolver_undo.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/resolver_undo.h Sat Sep 24 22:10:17 2005
@@ -23,7 +23,7 @@
#ifndef RESOLVER_UNDO_H
#define RESOLVER_UNDO_H
-#include "../undo.h"
+#include <generic/util/undo.h>
template<typename PackageUniverse>
class generic_problem_resolver;
Modified: branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/problemresolver/solution.h Sat Sep 24 22:10:17 2005
@@ -23,7 +23,7 @@
#define SOLUTION_H
#include <iostream>
-#include <src/generic/immset.h>
+#include <generic/util/immset.h>
/** Represents the current score weights for a resolver. Used to
* calculate scores at the time a solution is instantiated.
Modified: branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/Makefile.am Sat Sep 24 22:10:17 2005
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir)/intl
+INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
noinst_LIBRARIES = libgeneric-util.a
Modified: branches/aptitude-0.3/aptitude/src/generic/util/dense_setset.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/dense_setset.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/dense_setset.h Sat Sep 24 22:10:17 2005
@@ -40,7 +40,7 @@
#define DENSE_SETSET_H
#ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
#endif
#include <set>
Modified: branches/aptitude-0.3/aptitude/src/generic/util/strhash.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/strhash.h (original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/strhash.h Sat Sep 24 22:10:17 2005
@@ -8,7 +8,7 @@
#define STRHASH_H
#ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
#endif
#ifdef HAVE_HASH_MAP
Modified: branches/aptitude-0.3/aptitude/src/generic/util/threads.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/threads.cc (original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/threads.cc Sat Sep 24 22:10:17 2005
@@ -21,7 +21,7 @@
#include "util.h"
-#include "../aptitude.h"
+#include <aptitude.h>
#include <errno.h>
Modified: branches/aptitude-0.3/aptitude/src/load_config.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/load_config.cc (original)
+++ branches/aptitude-0.3/aptitude/src/load_config.cc Sat Sep 24 22:10:17 2005
@@ -10,8 +10,8 @@
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
-#include <generic/apt.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include <vscreen/transcode.h>
Modified: branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc (original)
+++ branches/aptitude-0.3/aptitude/src/load_grouppolicy.cc Sat Sep 24 22:10:17 2005
@@ -24,9 +24,10 @@
#include "load_grouppolicy.h"
-#include <generic/matchers.h>
-#include <generic/pkg_hier.h>
-#include <generic/util.h>
+#include <generic/apt/matchers.h>
+#include <generic/apt/pkg_hier.h>
+
+#include <generic/util/util.h>
#include "aptitude.h"
@@ -34,8 +35,9 @@
#include "pkg_ver_item.h"
#include "dep_item.h"
-#include <generic/apt.h>
-#include <generic/strhash.h>
+#include <generic/apt/apt.h>
+
+#include <generic/util/strhash.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/load_pkgview.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/load_pkgview.cc (original)
+++ branches/aptitude-0.3/aptitude/src/load_pkgview.cc Sat Sep 24 22:10:17 2005
@@ -8,8 +8,8 @@
#include "pkg_columnizer.h"
#include "ui.h"
-#include <generic/config_signal.h>
-#include <generic/apt.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/apt.h>
#include <vscreen/transcode.h>
#include <vscreen/vs_table.h>
Modified: branches/aptitude-0.3/aptitude/src/main.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/main.cc (original)
+++ branches/aptitude-0.3/aptitude/src/main.cc Sat Sep 24 22:10:17 2005
@@ -30,10 +30,10 @@
#include "../config.h"
-#include <generic/apt.h>
-// for NoMoreSolutions/NoMoreTime:
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
+
#include <generic/problemresolver/exceptions.h>
-#include <generic/config_signal.h>
#include <vscreen/config/keybindings.h>
#include <vscreen/transcode.h>
Modified: branches/aptitude-0.3/aptitude/src/menu_tree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/menu_tree.cc (original)
+++ branches/aptitude-0.3/aptitude/src/menu_tree.cc Sat Sep 24 22:10:17 2005
@@ -28,11 +28,12 @@
#include "ui.h"
#include "view_changelog.h"
-#include <generic/apt.h>
-#include <generic/apt_undo_group.h>
-#include <generic/config_signal.h>
-#include <generic/matchers.h>
-#include <generic/undo.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/apt_undo_group.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/matchers.h>
+
+#include <generic/util/undo.h>
#include <sigc++/adaptors/bind.h>
Modified: branches/aptitude-0.3/aptitude/src/mine/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/mine/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/mine/Makefile.am Sat Sep 24 22:10:17 2005
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES=Makefile.in
localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I.. -I. -I$(top_srcdir)/lib -I../../../intl
+INCLUDES = -Wall @WERROR@ -I$(top_srcdir) -I$(top_srcdir)/src -I$(top_srcdir)/intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = @LIBINTL@
SWEEPERHELPTXTS = mine-help.txt mine-help-??.txt
Modified: branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_columnizer.cc Sat Sep 24 22:10:17 2005
@@ -23,9 +23,9 @@
#include "pkg_columnizer.h"
-#include <generic/apt.h>
-#include <generic/config_signal.h>
-#include <generic/tasks.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/tasks.h>
#include <apt-pkg/error.h>
#include <apt-pkg/pkgrecords.h>
Modified: branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_grouppolicy.cc Sat Sep 24 22:10:17 2005
@@ -27,12 +27,13 @@
#include <vscreen/transcode.h>
-#include "generic/apt.h"
-#include "generic/matchers.h"
-#include "generic/pkg_hier.h"
-#include "generic/tags.h"
-#include "generic/tasks.h"
-#include "generic/util.h"
+#include <generic/apt/apt.h>
+#include <generic/apt/matchers.h>
+#include <generic/apt/pkg_hier.h>
+#include <generic/apt/tags.h>
+#include <generic/apt/tasks.h>
+
+#include <generic/util/util.h>
#include <map>
#include <set>
Modified: branches/aptitude-0.3/aptitude/src/pkg_info_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_info_screen.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_info_screen.cc Sat Sep 24 22:10:17 2005
@@ -35,7 +35,7 @@
#include "pkg_ver_item.h"
#include "trust.h"
-#include "generic/apt.h"
+#include <generic/apt/apt.h>
#include <apt-pkg/pkgrecords.h>
#include <apt-pkg/strutl.h>
Modified: branches/aptitude-0.3/aptitude/src/pkg_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_item.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_item.cc Sat Sep 24 22:10:17 2005
@@ -35,10 +35,10 @@
#include "view_changelog.h"
#include "vs_progress.h"
-#include <generic/apt.h>
-#include <generic/apt_undo_group.h>
-#include <generic/config_signal.h>
-#include <generic/matchers.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/apt_undo_group.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/matchers.h>
#include <apt-pkg/configuration.h>
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/pkg_node.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_node.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_node.cc Sat Sep 24 22:10:17 2005
@@ -25,10 +25,11 @@
#include "ui.h"
-#include <generic/apt.h>
-#include <generic/apt_undo_group.h>
-#include <generic/config_signal.h>
-#include <generic/undo.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/apt_undo_group.h>
+#include <generic/apt/config_signal.h>
+
+#include <generic/util/undo.h>
#include <vscreen/vs_tree.h>
Modified: branches/aptitude-0.3/aptitude/src/pkg_node.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_node.h (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_node.h Sat Sep 24 22:10:17 2005
@@ -26,7 +26,6 @@
#include "menu_redirect.h"
#include <vscreen/vs_treeitem.h>
-#include <generic/undo.h>
class undo_group;
class keybindings;
Modified: branches/aptitude-0.3/aptitude/src/pkg_subtree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_subtree.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_subtree.cc Sat Sep 24 22:10:17 2005
@@ -21,7 +21,7 @@
#include "pkg_subtree.h"
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <vscreen/vs_tree.h>
Modified: branches/aptitude-0.3/aptitude/src/pkg_tree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_tree.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_tree.cc Sat Sep 24 22:10:17 2005
@@ -37,9 +37,9 @@
#include <vscreen/transcode.h>
#include <vscreen/vs_treeitem.h>
-#include <generic/apt.h>
-#include <generic/config_signal.h>
-#include <generic/matchers.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/matchers.h>
#include <apt-pkg/progress.h>
#include <apt-pkg/configuration.h>
Modified: branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_ver_item.cc Sat Sep 24 22:10:17 2005
@@ -31,9 +31,9 @@
#include "view_changelog.h"
#include "vs_progress.h"
-#include "generic/apt.h"
-#include "generic/apt_undo_group.h"
-#include "generic/config_signal.h"
+#include <generic/apt/apt.h>
+#include <generic/apt/apt_undo_group.h>
+#include <generic/apt/config_signal.h>
#include "vscreen/vs_multiplex.h"
Modified: branches/aptitude-0.3/aptitude/src/pkg_view.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/pkg_view.cc (original)
+++ branches/aptitude-0.3/aptitude/src/pkg_view.cc Sat Sep 24 22:10:17 2005
@@ -39,8 +39,8 @@
#include <vscreen/config/keybindings.h>
#include <vscreen/transcode.h>
-#include <generic/apt.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/config_signal.h>
#include <apt-pkg/error.h>
#include <apt-pkg/pkgrecords.h>
Modified: branches/aptitude-0.3/aptitude/src/reason_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/reason_fragment.cc (original)
+++ branches/aptitude-0.3/aptitude/src/reason_fragment.cc Sat Sep 24 22:10:17 2005
@@ -9,8 +9,8 @@
#include "pkg_ver_item.h"
#include "ui.h"
-#include <generic/apt.h>
-#include <generic/infer_reason.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/infer_reason.h>
#include <vscreen/config/colors.h>
#include <vscreen/fragment.h>
Modified: branches/aptitude-0.3/aptitude/src/reason_fragment.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/reason_fragment.h (original)
+++ branches/aptitude-0.3/aptitude/src/reason_fragment.h Sat Sep 24 22:10:17 2005
@@ -8,7 +8,8 @@
#define REASON_FRAGMENT_H
#include <apt-pkg/pkgcache.h>
-#include <generic/infer_reason.h>
+
+#include <generic/apt/infer_reason.h>
class fragment;
Modified: branches/aptitude-0.3/aptitude/src/solution_dialog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_dialog.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_dialog.cc Sat Sep 24 22:10:17 2005
@@ -34,11 +34,12 @@
#include <vscreen/vs_text_layout.h>
#include <vscreen/vscreen.h>
-#include <generic/apt.h>
-#include <generic/aptitude_resolver_universe.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/aptitude_resolver_universe.h>
+#include <generic/apt/resolver_manager.h>
+
#include <generic/problemresolver/exceptions.h>
#include <generic/problemresolver/solution.h>
-#include <generic/resolver_manager.h>
#include <sigc++/bind.h>
Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.cc Sat Sep 24 22:10:17 2005
@@ -22,9 +22,11 @@
#include <aptitude.h>
-#include <generic/aptitude_resolver_universe.h>
+#include <generic/apt/aptitude_resolver_universe.h>
+
#include <generic/problemresolver/solution.h>
-#include <generic/util.h>
+
+#include <generic/util/util.h>
#include <vscreen/fragment.h>
#include <vscreen/transcode.h>
Modified: branches/aptitude-0.3/aptitude/src/solution_fragment.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_fragment.h (original)
+++ branches/aptitude-0.3/aptitude/src/solution_fragment.h Sat Sep 24 22:10:17 2005
@@ -29,7 +29,7 @@
#include <generic/problemresolver/solution.h>
// So passing aptitude_solution::action to a function is legal
-#include <generic/aptitude_resolver_universe.h>
+#include <generic/apt/aptitude_resolver_universe.h>
class fragment;
class aptitude_universe;
Modified: branches/aptitude-0.3/aptitude/src/solution_item.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_item.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_item.cc Sat Sep 24 22:10:17 2005
@@ -28,8 +28,9 @@
#include <apt-pkg/pkgrecords.h>
-#include <generic/resolver_manager.h>
-#include <generic/util.h>
+#include <generic/apt/resolver_manager.h>
+
+#include <generic/util/util.h>
#include <vscreen/config/keybindings.h>
#include <vscreen/fragment.h>
Modified: branches/aptitude-0.3/aptitude/src/solution_item.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_item.h (original)
+++ branches/aptitude-0.3/aptitude/src/solution_item.h Sat Sep 24 22:10:17 2005
@@ -26,7 +26,8 @@
#include <sigc++/slot.h>
-#include <generic/aptitude_resolver_universe.h>
+#include <generic/apt/aptitude_resolver_universe.h>
+
#include <generic/problemresolver/solution.h>
#include <vscreen/vs_treeitem.h>
Modified: branches/aptitude-0.3/aptitude/src/solution_screen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/solution_screen.cc (original)
+++ branches/aptitude-0.3/aptitude/src/solution_screen.cc Sat Sep 24 22:10:17 2005
@@ -25,10 +25,12 @@
#include "solution_fragment.h"
#include "solution_item.h"
-#include <generic/aptitude_resolver_universe.h>
+#include <generic/apt/aptitude_resolver_universe.h>
+#include <generic/apt/resolver_manager.h>
+
#include <generic/problemresolver/solution.h>
-#include <generic/resolver_manager.h>
-#include <generic/util.h>
+
+#include <generic/util/util.h>
#include <sigc++/adaptors/bind.h>
Modified: branches/aptitude-0.3/aptitude/src/trust.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/trust.cc (original)
+++ branches/aptitude-0.3/aptitude/src/trust.cc Sat Sep 24 22:10:17 2005
@@ -3,7 +3,7 @@
#include "aptitude.h"
#include "trust.h"
-#include <generic/apt.h>
+#include <generic/apt/apt.h>
#include <vscreen/fragment.h>
#include <vscreen/config/colors.h>
Modified: branches/aptitude-0.3/aptitude/src/ui.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/ui.cc (original)
+++ branches/aptitude-0.3/aptitude/src/ui.cc Sat Sep 24 22:10:17 2005
@@ -76,14 +76,16 @@
#include <mine/cmine.h>
-#include <generic/apt.h>
-#include <generic/apt_undo_group.h>
-#include <generic/aptitude_resolver_universe.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/apt_undo_group.h>
+#include <generic/apt/aptitude_resolver_universe.h>
+#include <generic/apt/config_signal.h>
+#include <generic/apt/resolver_manager.h>
+
#include <generic/problemresolver/exceptions.h>
#include <generic/problemresolver/solution.h>
-#include <generic/resolver_manager.h>
-#include <generic/util.h>
+
+#include <generic/util/util.h>
#include "dep_item.h"
#include "download.h"
Modified: branches/aptitude-0.3/aptitude/src/view_changelog.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/view_changelog.cc (original)
+++ branches/aptitude-0.3/aptitude/src/view_changelog.cc Sat Sep 24 22:10:17 2005
@@ -29,9 +29,9 @@
#include "menu_redirect.h"
#include "ui.h"
-#include <generic/apt.h>
-#include <generic/pkg_changelog.h>
-#include <generic/config_signal.h>
+#include <generic/apt/apt.h>
+#include <generic/apt/pkg_changelog.h>
+#include <generic/apt/config_signal.h>
#include <sigc++/functors/mem_fun.h>
Modified: branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/Makefile.am Sat Sep 24 22:10:17 2005
@@ -5,7 +5,7 @@
EXTRA_DIST=README.layout
localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../../intl
+INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I../../intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = @LIBINTL@
Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/Makefile.am Sat Sep 24 22:10:17 2005
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES=Makefile.in
localedir = $(datadir)/locale
-INCLUDES = -Wall @WERROR@ -I../../.. -I$(srcdir) -I$(top_srcdir)/lib -I../../../intl
+INCLUDES = -Wall @WERROR@ -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/src -I../../../intl
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
LDADD = @LIBINTL@
Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/colors.cc Sat Sep 24 22:10:17 2005
@@ -19,7 +19,7 @@
#include "colors.h"
-#include "../curses++.h"
+#include <vscreen/curses++.h>
static bool colors_avail=false;
Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.cc (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.cc Sat Sep 24 22:10:17 2005
@@ -23,7 +23,7 @@
#include <apt-pkg/strutl.h>
// For _()
-#include "../../aptitude.h"
+#include <aptitude.h>
using namespace std;
Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.h (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/column_definition.h Sat Sep 24 22:10:17 2005
@@ -43,7 +43,7 @@
#include <assert.h>
-#include "../columnify.h"
+#include <vscreen/columnify.h>
/** Defined the default settings for a particular column type. */
struct column_type_defaults
Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.cc Sat Sep 24 22:10:17 2005
@@ -22,11 +22,11 @@
#include "keybindings.h"
#ifdef HAVE_CONFIG_H
-#include "../../../config.h"
+#include <config.h>
#endif
// For _()
-#include "../../aptitude.h"
+#include <aptitude.h>
#ifdef HAVE_LIBAPT_PKG
#include <apt-pkg/error.h>
Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/keybindings.h Sat Sep 24 22:10:17 2005
@@ -24,7 +24,7 @@
#include <list>
#ifdef HAVE_CONFIG_H
-#include "../../../config.h"
+#include <config.h>
#endif
#ifdef HAVE_HASH_MAP
@@ -39,8 +39,8 @@
#endif
#endif
-#include "../../generic/strhash.h"
-#include "../curses++.h"
+#include <generic/util/strhash.h>
+#include <vscreen/curses++.h>
/** Represents a keystroke as seen by curses. Since the function keys
* can overlap Unicode codepoints, we need to include a value that
Modified: branches/aptitude-0.3/aptitude/src/vscreen/config/style.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/config/style.h (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/config/style.h Sat Sep 24 22:10:17 2005
@@ -22,7 +22,7 @@
#include <ncursesw/curses.h>
-#include "../curses++.h" // For wchtype.
+#include <vscreen/curses++.h>
#include <string>
Modified: branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc (original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vscreen.cc Sat Sep 24 22:10:17 2005
@@ -42,8 +42,8 @@
#include "config/keybindings.h"
#include "config/style.h"
-#include <generic/event_queue.h>
-#include <generic/threads.h>
+#include <generic/util/event_queue.h>
+#include <generic/util/threads.h>
// For _()
#include "../aptitude.h"
More information about the Aptitude-svn-commit
mailing list