diff -r 057933050c42 -r 338a577cdfd2 librazor/razor.c
--- a/librazor/razor.c	Fri Jun 20 15:10:34 2008 -0400
+++ b/librazor/razor.c	Fri Jun 20 21:38:29 2008 -0400
@@ -33,8 +33,8 @@
 #include <ctype.h>
 #include <fnmatch.h>
 
+#include "razor-internal.h"
 #include "razor.h"
-#include "razor-internal.h"
 
 void *
 zalloc(size_t size)
@@ -423,7 +423,7 @@
 
 void
 razor_set_diff(struct razor_set *set, struct razor_set *upstream,
-	       razor_package_callback_t callback, void *data)
+	       razor_diff_callback_t callback, void *data)
 {
  	struct razor_package_iterator *pi1, *pi2;
  	struct razor_package *p1, *p2;
@@ -446,9 +446,11 @@
 		}
 
 		if (p2 == NULL || res < 0)
-			callback(name1, version1, NULL, arch1, data);
+			callback(RAZOR_DIFF_ACTION_REMOVE,
+				 p1, name1, version1, arch1, data);
 		else if (p1 == NULL || res > 0)
-			callback(name2, NULL, version2, arch2, data);
+			callback(RAZOR_DIFF_ACTION_ADD,
+				 p2, name2, version2, arch2, data);
 
 		if (p1 != NULL && res <= 0)
 			razor_package_iterator_next(pi1, &p1,