Remove RPMs-README.

	* Makefile.am: Remove RPMs-README.

	* libnautilus/Makefile.am: -I$(builddir)

	* libnautilus/nautilus-undo-private.h:
	* libnautilus/nautilus-undo-transaction.h:
	Use #include <libnautilus/x.h> rather than #include "x.h".

	* NEWS: Some refinement.

6 files changed, 28 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index b4927f184..51879d915 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2001-10-11  Darin Adler  <darin@bentspoon.com>
 
+	* Makefile.am: Remove RPMs-README.
+	
+	* libnautilus/Makefile.am: -I$(builddir)
+	
+	* libnautilus/nautilus-undo-private.h:
+	* libnautilus/nautilus-undo-transaction.h:
+	Use #include <libnautilus/x.h> rather than #include "x.h".
+
+	* NEWS: Some refinement.
+
+2001-10-11  Darin Adler  <darin@bentspoon.com>
+
 	* NEWS: Add a first cut at Nautilus 1.0.5 release notes.
 	* THANKS: Updated to match change log better.
 	* configure.in: Bumped version to 1.0.5 in preparation for the
diff --git a/Makefile.am b/Makefile.am
index b5d509eff..3490e5fa0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ EXTRA_DIST=					\
 	TRADEMARK_NOTICE			\
 	COPYING.LIB				\
 	COPYING-DOCS				\
-	RPMs-README				\
 	HACKING					\
 	MAINTAINERS				\
 	nautilus.spec.in			\
diff --git a/NEWS b/NEWS
index 40acf50ba..0e9654430 100644
--- a/NEWS
+++ b/NEWS
@@ -6,16 +6,15 @@ fixes.
 Many of the changes for this release were done by hackers at Red Hat
 (Jonathan Blandford, Havoc Pennington, Alex Larsson, Owen Taylor) for
 their Nautilus release, and rolled into the main Nautilus sources,
-mostly by Alex.
-
-Some of the other changes were changes from the Mandrake version of
-Nautilus, contributed by Frederic Crozat.
+mostly by Alex. Thanks also to Alan Cox for doing a profile of system
+calls Nautilus was making and driving some simple but effective
+speedups.
 
 As a practical matter, many of the changes here that were inspired by
 changes that others made or patches they submitted may still be marked
-"(Darin)" since I did the actual check-i. Similarly, Red Hat changes
-done by others may be marked "(Alex)" since he did the rolling in even
-though others did the original code or have an imporoper guess.
+"(Darin)" since I did the actual check-i. Similarly, changes done by
+others may be marked "(Alex)" since he did the rolling in even though
+others did the original code (sometimes I tried to guess).
 
 Here's a partial list of changes since Nautilus 1.0.4:
 
@@ -36,23 +35,24 @@ Here's a partial list of changes since Nautilus 1.0.4:
 * Don't refresh all other windows when you open a new window that
   points to a particular location (Darin)
 
-- features (no big ones)
+- features (mostly small ones)
+
+* Eliminate ~/Nautilus, replacing it with "start here" (Havoc)
+* Use ".desktop" files instead of Nautilus links (Alex, Maciej, Havoc,
+  Jonathan)
 
 * Allow dragging an image to the icon in the file properties dialog
   to create a custom icon, as in the sidebar (Benedikt Roth)
 * Allow Mozilla component to open Chrome windows (Alex)
-* Use ".desktop" files instead of Nautilus links (Alex, Maciej, Havoc,
-  Jonathan)
 * Add support for JFS (Frederic)
 * Added get_info support to the stream adapter so we can work with
   more components, specifically the eog one (Fabrice Bellet)
 * Set _NET_WM_WINDOW_TYPE tag, mostly for kwin's benefit (Alex)
-* Eliminate ~/Nautilus, replacing it with "start here" (Havoc)
 * Don't manage the desktop if kdesktop is already running (Havoc)
 * Handle a lot more cases of dragging URIs to a Nautilus window
   (Jonathan)
 * Allow nested directories inside the scripts directory (David Emory
-  WWatson, Darin)
+  Watson, Darin)
 * Remove Eazel remnants (Christian Meyer, Benedikt Roth, Darin)
 * Make music view list look better by using EelList, show artist of
   selected song (Maciej)
diff --git a/libnautilus/Makefile.am b/libnautilus/Makefile.am
index 2d77a5436..1e6b40ca5 100644
--- a/libnautilus/Makefile.am
+++ b/libnautilus/Makefile.am
@@ -3,6 +3,7 @@ include $(top_srcdir)/Makefile.shared
 lib_LTLIBRARIES=libnautilus.la
 
 INCLUDES=\
+	-I$(builddir) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
 	$(NAUTILUS_DEPENDENCY_CFLAGS) \
diff --git a/libnautilus/nautilus-undo-private.h b/libnautilus/nautilus-undo-private.h
index 235c60331..079cdd93a 100644
--- a/libnautilus/nautilus-undo-private.h
+++ b/libnautilus/nautilus-undo-private.h
@@ -25,7 +25,7 @@
 #ifndef NAUTILUS_UNDO_PRIVATE_H
 #define NAUTILUS_UNDO_PRIVATE_H
 
-#include "nautilus-distributed-undo.h"
+#include <libnautilus/nautilus-distributed-undo.h>
 #include <gtk/gtkobject.h>
 
 Nautilus_Undo_Manager nautilus_undo_get_undo_manager                (GtkObject             *attached_object);
diff --git a/libnautilus/nautilus-undo-transaction.h b/libnautilus/nautilus-undo-transaction.h
index 6c8345af4..76564b3c7 100644
--- a/libnautilus/nautilus-undo-transaction.h
+++ b/libnautilus/nautilus-undo-transaction.h
@@ -27,8 +27,8 @@
 #ifndef NAUTILUS_UNDO_TRANSACTION_H
 #define NAUTILUS_UNDO_TRANSACTION_H
 
-#include "nautilus-undo.h"
-#include "nautilus-distributed-undo.h"
+#include <libnautilus/nautilus-undo.h>
+#include <libnautilus/nautilus-distributed-undo.h>
 
 #define NAUTILUS_TYPE_UNDO_TRANSACTION \
 	(nautilus_undo_transaction_get_type ())