[Monotone-commits-diffs] net.venge.monotone.source-tree-cleanup: 0dab54e527942870c7d76bd6ddc53c530dfdfb0f

[code]

revision:            0dab54e527942870c7d76bd6ddc53c530dfdfb0f
date:                2011-02-02T09:25:43
author:              Richard Levitte <address@hidden>
branch:              net.venge.monotone.source-tree-cleanup
changelog:
merge of '366ef5a5be156784430ea534efb2f9faa38112ee'
     and '699e9457a09f90a638bdd1a7a64a8577cac73c0d'

manifest:
format_version "1"

new_manifest [608408f76e7f7365850e1601bddec0ec2f2cf9fd]

old_revision [366ef5a5be156784430ea534efb2f9faa38112ee]

patch ".mtn-ignore"
 from [85ac39ba51773c60b2dc00fba683fe414bad7218]
   to [8866a2912c258bc9d6697c16d25d75fb3be971fc]

patch "notes/release-checklist.txt"
 from [35f3d24d6b4d0c1fe4d933764e4196135edf6925]
   to [92f7dfb621c422ab7264d92ab6d1608af1ce4668]

old_revision [699e9457a09f90a638bdd1a7a64a8577cac73c0d]

patch "Makefile.am"
 from [0d68bedcf529b69eaca6ad3a4e541745360b9992]
   to [af1aabfe3ffc1186b10ec4133f99ba761a26d406]

patch "doc/Makefile.am"
 from [483363d12102131a57aaa47213bb616a293fae1f]
   to [a99a7cc6a26dcc476f80b65c64b4cdaeea006c70]
============================================================
--- .mtn-ignore	85ac39ba51773c60b2dc00fba683fe414bad7218
+++ .mtn-ignore	8866a2912c258bc9d6697c16d25d75fb3be971fc
@@ -8,10 +8,13 @@
 ^config\.(guess|h(\.in)?|log|rpath|status|sub)$
 ^configure$
 ^depcomp$
+^doc/Makefile\.in$
+^doc/mdate-sh$
 ^doc/monotone\.info$
 ^doc/monotone\.info-1$
 ^doc/monotone\.info-2$
 ^doc/stamp-vti$
+^doc/texinfo\.tex$
 ^doc/version\.texi$
 ^html
 ^install-sh$
============================================================
--- notes/release-checklist.txt	35f3d24d6b4d0c1fe4d933764e4196135edf6925
+++ notes/release-checklist.txt	92f7dfb621c422ab7264d92ab6d1608af1ce4668
@@ -13,6 +13,15 @@
 1) Make sure that the buildbot looks reasonably green.  Let's not
    release stuff that's known to be broken on any major platforms, eh?
 
+   Also check that the following Makefile targets work:
+
+    Unix and Win32: all check 
+
+    Unix : doc/monotone.pdf doc/monotone.ps distcheck dist distclean
+
+    Win32: win32_installer
+
+
 2) Write user-readable release notes at the top of the NEWS file,
    roughly following the format of existing entries.  Make sure to
    mention any incompatibilities at the top, and generally it's a good
============================================================
--- Makefile.am	0d68bedcf529b69eaca6ad3a4e541745360b9992
+++ Makefile.am	af1aabfe3ffc1186b10ec4133f99ba761a26d406
@@ -591,22 +591,21 @@ DISTCLEANFILES = src/mt-stdint.h src/xge
 	test/tester.status test/unit.status test/func.status
 
 # we generate some source files to copy data into the executable
-# note that the only things that should go in BUILT_SOURCES are things
+# note that the only things that should go in BUILT_SRCS are things
 # that need to be generated early on 'make all'; this is _not_ true of
 # generated source files, but it is true for the PCH if used.
 
 # package_revision.txt and package_full_revision_dist.txt are shipped
 # in the distribution, so don't delete them here
-CLEAN_SOURCES = src/std_hooks.cc unit/src/testlib.cc src/schema.cc \
+CLEAN_SRCS = src/std_hooks.cc unit/src/testlib.cc src/schema.cc \
 	src/package_revision.cc src/package_full_revision.cc \
 	src/package_revision_raw.txt \
 	src/package_full_revision.txt src/package_full_revision_raw.txt \
 	mtn.1
 
-BUILT_SOURCES = $(PCH_FILE) $(PCH_BUILD)
+BUILT_SRCS = $(PCH_FILE) $(PCH_BUILD)
 
-CLEANFILES = $(bin_SCRIPTS) $(BUILT_SOURCES) $(CLEAN_SOURCES) \
-	     $(EPS_FIGURES) $(CLEAN_POFILES)
+CLEANFILES = $(bin_SCRIPTS) $(BUILT_SRCS) $(CLEAN_SRCS) $(CLEAN_POFILES)
 
 # automake provides no nice way to build a helper program to execute
 # on the build machine, so we need our own rule.  almost all the
============================================================
--- doc/Makefile.am	483363d12102131a57aaa47213bb616a293fae1f
+++ doc/Makefile.am	a99a7cc6a26dcc476f80b65c64b4cdaeea006c70
@@ -39,11 +39,15 @@ HTML_EXTRA_copied = $(addprefix $(abs_bu
 PNG_IMAGES_copied = $(addprefix $(abs_builddir)/,$(PNG_IMAGES))
 HTML_EXTRA_copied = $(addprefix $(abs_builddir)/,$(HTML_EXTRA))
 
-TEXI_FRAGMENTS = monotonevars.texi pcrepattern.texi pcresyntax.texi
+TEXI_VARS = monotonevars.texi
+TEXI_FRAGMENTS = pcrepattern.texi pcresyntax.texi
 
+CLEANFILES = $(EPS_FIGURES) $(PDF_FIGURES_copied) $(PNG_FIGURES_copied) \
+	$(PNG_IMAGES_copied) $(HTML_EXTRA_copied) $(TEXI_VARS)
+
 info_TEXINFOS = monotone.texi
 
-monotone_TEXINFOS = ../src/std_hooks.lua $(TEXI_FRAGMENTS)
+monotone_TEXINFOS = ../src/std_hooks.lua $(TEXI_VARS) $(TEXI_FRAGMENTS)
 
 EXTRA_DIST = \
 	$(PDF_FIGURES) $(PNG_FIGURES) $(TEXI_FRAGMENTS)			\