Fix upgrade macro
    
    the macro gconf_schema_upgrade was running --makefile-uninstall-rule
    on the new schema instead of the old one.  This could lead to a build
    up of cruft in the default gconf source.