[Aptitude-svn-commit] r4251 - in branches/aptitude-0.3/aptitude: . src/generic/util tests

[Daniel Burrows]

Author: dburrows
Date: Sun Sep 25 05:45:53 2005
New Revision: 4251

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/generic/util/setset.h
   branches/aptitude-0.3/aptitude/tests/Makefile.am
   branches/aptitude-0.3/aptitude/tests/interactive_set_test.cc
   branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
   branches/aptitude-0.3/aptitude/tests/test_dense_setset.cc
   branches/aptitude-0.3/aptitude/tests/test_misc.cc
   branches/aptitude-0.3/aptitude/tests/test_resolver.cc
   branches/aptitude-0.3/aptitude/tests/test_setset.cc
   branches/aptitude-0.3/aptitude/tests/test_tags.cc
   branches/aptitude-0.3/aptitude/tests/test_threads.cc
   branches/aptitude-0.3/aptitude/tests/test_wtree.cc
Log:
More include file fixes.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sun Sep 25 05:45:53 2005
@@ -1,5 +1,9 @@
 2005-09-24  Daniel Burrows  <dburrows at debian.org>
 
+	* src/generic/util/setset.h, tests/***:
+
+	  Fix more include files that I missed (oops).
+
 	* src/vscreen/vs_menubar.cc:
 
 	  Display left and right arrows at the edge of the terminal if the

Modified: branches/aptitude-0.3/aptitude/src/generic/util/setset.h
==============================================================================
--- branches/aptitude-0.3/aptitude/src/generic/util/setset.h	(original)
+++ branches/aptitude-0.3/aptitude/src/generic/util/setset.h	Sun Sep 25 05:45:53 2005
@@ -36,7 +36,7 @@
 #define SETSET_H
 
 #ifdef HAVE_CONFIG_H
-#include "../../config.h"
+#include <config.h>
 #endif
 
 #include <map>

Modified: branches/aptitude-0.3/aptitude/tests/Makefile.am
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/Makefile.am	(original)
+++ branches/aptitude-0.3/aptitude/tests/Makefile.am	Sun Sep 25 05:45:53 2005
@@ -1,7 +1,7 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-INCLUDES = -Wall @WERROR@ -I../.. -I$(srcdir)
-LDADD = ../src/generic/libgeneric.a ../src/generic/problemresolver/dummy_universe.o -lcppunit
+INCLUDES = -Wall @WERROR@ -I$(top_srcdir) -I$(top_srcdir)/src -I$(srcdir)
+LDADD = ../src/generic/apt/libgeneric-apt.a ../src/generic/util/libgeneric-util.a ../src/generic/problemresolver/dummy_universe.o -lcppunit
 
 check_PROGRAMS = test
 

Modified: branches/aptitude-0.3/aptitude/tests/interactive_set_test.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/interactive_set_test.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/interactive_set_test.cc	Sun Sep 25 05:45:53 2005
@@ -1,6 +1,6 @@
 // A simple test that allows you to interactively build sets.
 
-#include <src/generic/immset.h>
+#include <generic/util/immset.h>
 
 #include <iostream>
 

Modified: branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_apt_universe.cc	Sun Sep 25 05:45:53 2005
@@ -19,12 +19,12 @@
 //
 // A test of the aptitude universe wrapper.
 
-#include <src/generic/aptitude_resolver_universe.h>
-#include <src/generic/config_signal.h>
+#include <generic/aptitude_resolver_universe.h>
+#include <generic/config_signal.h>
 
-#include <src/generic/immset.h>
-#include <src/generic/problemresolver/solution.h>
-#include <src/generic/undo.h>
+#include <generic/immset.h>
+#include <generic/problemresolver/solution.h>
+#include <generic/undo.h>
 
 #include <cppunit/extensions/HelperMacros.h>
 

Modified: branches/aptitude-0.3/aptitude/tests/test_dense_setset.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_dense_setset.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_dense_setset.cc	Sun Sep 25 05:45:53 2005
@@ -19,7 +19,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <src/generic/dense_setset.h>
+#include <generic/util/dense_setset.h>
 
 #include <iostream>
 

Modified: branches/aptitude-0.3/aptitude/tests/test_misc.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_misc.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_misc.cc	Sun Sep 25 05:45:53 2005
@@ -19,7 +19,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <src/generic/util.h>
+#include <generic/util/util.h>
 
 class MiscTest : public CppUnit::TestFixture
 {

Modified: branches/aptitude-0.3/aptitude/tests/test_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_resolver.cc	Sun Sep 25 05:45:53 2005
@@ -19,8 +19,8 @@
 //
 // A test of the generic resolver layer.
 
-#include <src/generic/problemresolver/dummy_universe.h>
-#include <src/generic/problemresolver/problemresolver.h>
+#include <generic/problemresolver/dummy_universe.h>
+#include <generic/problemresolver/problemresolver.h>
 
 #include <cppunit/extensions/HelperMacros.h>
 

Modified: branches/aptitude-0.3/aptitude/tests/test_setset.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_setset.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_setset.cc	Sun Sep 25 05:45:53 2005
@@ -19,7 +19,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <src/generic/setset.h>
+#include <generic/util/setset.h>
 
 #include <iostream>
 

Modified: branches/aptitude-0.3/aptitude/tests/test_tags.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_tags.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_tags.cc	Sun Sep 25 05:45:53 2005
@@ -20,7 +20,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <src/generic/tags.h>
+#include <generic/apt/tags.h>
 
 #include <string.h>
 

Modified: branches/aptitude-0.3/aptitude/tests/test_threads.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_threads.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_threads.cc	Sun Sep 25 05:45:53 2005
@@ -19,8 +19,8 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <src/generic/event_queue.h>
-#include <src/generic/threads.h>
+#include <generic/util/event_queue.h>
+#include <generic/util/threads.h>
 
 #include <iostream>
 

Modified: branches/aptitude-0.3/aptitude/tests/test_wtree.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/tests/test_wtree.cc	(original)
+++ branches/aptitude-0.3/aptitude/tests/test_wtree.cc	Sun Sep 25 05:45:53 2005
@@ -19,7 +19,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-#include <src/generic/immset.h>
+#include <generic/util/immset.h>
 
 using imm::map;
 using imm::set;