#
#
# delete "contrib/usher.cc"
# 
# patch "Makefile.am"
#  from [e5680f85bcb44fa81b1062c54d70b4cd1e28b6e0]
#    to [7a289c286cb568f7d14c83d24c94a7acec59673f]
# 
# patch "NEWS"
#  from [4806b4755115fc428683caeb0abbaf66307b0bea]
#    to [aec3d63acf755f5d84067d873cda431c3849df68]
#
============================================================
--- Makefile.am	e5680f85bcb44fa81b1062c54d70b4cd1e28b6e0
+++ Makefile.am	7a289c286cb568f7d14c83d24c94a7acec59673f
@@ -325,12 +325,11 @@ noinst_PROGRAMS = txt2c
 
 bin_PROGRAMS = mtn
 noinst_PROGRAMS = txt2c
-EXTRA_PROGRAMS = usher
+EXTRA_PROGRAMS = 
 
 mtn_SOURCES = $(MOST_SOURCES) monotone.cc
 nodist_mtn_SOURCES = std_hooks.c schema.c
 
-usher_SOURCES = contrib/usher.cc
 unit_tester_SOURCES = $(UNIT_TEST_SOURCES) $(UNIT_TEST_SRC_SUPPORT)
 nodist_unit_tester_SOURCES = test_hooks.c
 unit_tester_LDADD = $(UNIT_TEST_OBJ_SUPPORT)
@@ -480,7 +479,7 @@ EXTRA_DIST = $(PDF_FIGURES) $(PNG_FIGURE
 	contrib/colorize contrib/color-logs.sh contrib/color-logs.conf	\
 	contrib/get_stdio.pl contrib/ciabot_monotone_hookversion.py	\
 	contrib/Monotone.pm $(wildcard $(srcdir)/contrib/*.lua)		\
-	contrib/usher.cc $(wildcard $(srcdir)/examples/*)		\
+	$(wildcard $(srcdir)/examples/*)				\
 	win32/monotone.iss win32/modpath.iss $(wildcard			\
 	$(srcdir)/debian/*) mac/monotone-pkg-logo.gif			\
 	mac/monotone.pmproj mac/package-intro.rtf audit-includes
============================================================
--- NEWS	4806b4755115fc428683caeb0abbaf66307b0bea
+++ NEWS	aec3d63acf755f5d84067d873cda431c3849df68
@@ -8,6 +8,11 @@
           returns the head revisions of the workspace's branch if called
           over mtn automate stdio
 
+        Other
+
+        - contrib/usher.cc has been removed. Please use the
+          net.venge.monotone.contrib.usher branch instead.
+
         Internal
 
         - Update SQLite to 3.4.1.