1.1 --- a/razor.h	Fri Feb 29 11:53:15 2008 -0500
     1.2 +++ b/razor.h	Mon Mar 03 16:19:56 2008 -0500
     1.3 @@ -83,13 +83,15 @@
     1.4  	RAZOR_PACKAGE_UNAVAILABLE   = 0x04,
     1.5  	RAZOR_PACKAGE_UNSATISFIABLE = 0x08,
     1.6  	RAZOR_PACKAGE_BLOCKED       = 0x10,
     1.7 +	RAZOR_PACKAGE_CONFLICT      = 0x20,
     1.8  
     1.9  	/* Error states */
    1.10  	RAZOR_PACKAGE_INSTALL_UNAVAILABLE   = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_UNAVAILABLE,
    1.11  	RAZOR_PACKAGE_INSTALL_UNSATISFIABLE = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_UNSATISFIABLE,
    1.12 -	RAZOR_PACKAGE_INSTALL_BLOCKED = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_BLOCKED,
    1.13 +	RAZOR_PACKAGE_INSTALL_CONFLICT = RAZOR_PACKAGE_INSTALL | RAZOR_PACKAGE_CONFLICT,
    1.14  	RAZOR_PACKAGE_REMOVE_NOT_INSTALLED  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_UNAVAILABLE,
    1.15 -	RAZOR_PACKAGE_REMOVE_BLOCKED  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_BLOCKED
    1.16 +	RAZOR_PACKAGE_REMOVE_BLOCKED  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_BLOCKED,
    1.17 +	RAZOR_PACKAGE_REMOVE_CONFLICT  = RAZOR_PACKAGE_REMOVE | RAZOR_PACKAGE_CONFLICT
    1.18  };
    1.19  
    1.20  struct razor_transaction_package {
    1.21 @@ -98,6 +100,7 @@
    1.22  	enum razor_transaction_package_state state;
    1.23  
    1.24  	const char *req_package;
    1.25 +	enum razor_property_type req_type;
    1.26  	const char *req_property;
    1.27  	enum razor_version_relation req_relation;
    1.28  	const char *req_version;