12 files changed, 24 insertions, 24 deletions
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 241188ab..942e5a68 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -16,7 +16,7 @@ pacman_SOURCES = \
 	add.c \
 	conf.h conf.c \
 	deptest.c \
-	log.h log.c \
+	output.h output.c \
 	package.h package.c \
 	pacman.h pacman.c \
 	query.c \
diff --git a/src/pacman/add.c b/src/pacman/add.c
index 3d0622cc..ae32596d 100644
--- a/src/pacman/add.c
+++ b/src/pacman/add.c
@@ -30,7 +30,7 @@
 
 /* pacman */
 #include "pacman.h"
-#include "log.h"
+#include "output.h"
 #include "callback.h"
 #include "conf.h"
 #include "util.h"
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index d86c7d9c..abb47049 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -36,7 +36,7 @@
 /* pacman */
 #include "callback.h"
 #include "util.h"
-#include "log.h"
+#include "output.h"
 #include "conf.h"
 
 /* TODO this should not have to be defined twice- trans.c & log.c */
diff --git a/src/pacman/deptest.c b/src/pacman/deptest.c
index 2877ef3d..409cc25b 100644
--- a/src/pacman/deptest.c
+++ b/src/pacman/deptest.c
@@ -32,7 +32,7 @@
 #include "pacman.h"
 #include "util.h"
 #include "conf.h"
-#include "log.h"
+#include "output.h"
 
 extern config_t *config;
 
diff --git a/src/pacman/log.c b/src/pacman/output.c
index 5a4fbf2e..23b03373 100644
--- a/src/pacman/log.c
+++ b/src/pacman/output.c
@@ -1,8 +1,8 @@
 /*
- *  log.c
- * 
- *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
- * 
+ *  output.c
+ *
+ *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
 
@@ -30,7 +30,7 @@
 #include <alpm.h>
 
 /* pacman */
-#include "log.h"
+#include "output.h"
 #include "conf.h"
 #include "util.h"
 
diff --git a/src/pacman/log.h b/src/pacman/output.h
index f9aea4de..c116502a 100644
--- a/src/pacman/log.h
+++ b/src/pacman/output.h
@@ -1,8 +1,8 @@
 /*
- *  log.h
- * 
- *  Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org>
- * 
+ *  output.h
+ *
+ *  Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org>
+ *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
@@ -15,11 +15,11 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  */
-#ifndef _PM_LOG_H
-#define _PM_LOG_H
+#ifndef _PM_OUTPUT_H
+#define _PM_OUTPUT_H
 
 #include <stdio.h>
 
@@ -46,6 +46,6 @@ void pm_fprintf(FILE *file, unsigned short line, char *fmt, ...);
 
 int yesno(char *fmt, ...);
 
-#endif /* _PM_LOG_H */
+#endif /* _PM_OUTPUT_H */
 
 /* vim: set ts=2 sw=2 noet: */
diff --git a/src/pacman/package.c b/src/pacman/package.c
index c1617f4d..9e95a0f3 100644
--- a/src/pacman/package.c
+++ b/src/pacman/package.c
@@ -32,7 +32,7 @@
 
 /* pacman */
 #include "package.h"
-#include "log.h"
+#include "output.h"
 #include "util.h"
 
 /* Display the content of an installed package
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 1be43ee8..d240263d 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -43,7 +43,7 @@
 /* pacman */
 #include "pacman.h"
 #include "util.h"
-#include "log.h"
+#include "output.h"
 #include "callback.h"
 #include "conf.h"
 #include "package.h"
diff --git a/src/pacman/query.c b/src/pacman/query.c
index caf1db28..bfe51af3 100644
--- a/src/pacman/query.c
+++ b/src/pacman/query.c
@@ -35,7 +35,7 @@
 /* pacman */
 #include "pacman.h"
 #include "package.h"
-#include "log.h"
+#include "output.h"
 #include "conf.h"
 #include "util.h"
 
diff --git a/src/pacman/remove.c b/src/pacman/remove.c
index d3c0648c..bb1ea0d1 100644
--- a/src/pacman/remove.c
+++ b/src/pacman/remove.c
@@ -31,7 +31,7 @@
 /* pacman */
 #include "pacman.h"
 #include "util.h"
-#include "log.h"
+#include "output.h"
 #include "callback.h"
 #include "conf.h"
 
diff --git a/src/pacman/sync.c b/src/pacman/sync.c
index b963eb84..730aadde 100644
--- a/src/pacman/sync.c
+++ b/src/pacman/sync.c
@@ -37,7 +37,7 @@
 /* pacman */
 #include "pacman.h"
 #include "util.h"
-#include "log.h"
+#include "output.h"
 #include "package.h"
 #include "callback.h"
 #include "conf.h"
diff --git a/src/pacman/util.c b/src/pacman/util.c
index 376582a7..94274da5 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -40,7 +40,7 @@
 /* pacman */
 #include "util.h"
 #include "conf.h"
-#include "log.h"
+#include "output.h"
 
 extern config_t *config;