[PATCH] distutils: Create MANIFEST.in instead of MANIFEST in Makefile

[Stephen Thorne]

# HG changeset patch
# User Stephen Thorne <stephen at thorne.id.au>
# Date 1307578251 -36000
# Node ID 602be2cf9cf820d90a6c74b1bc13749ea4c8d8e4
# Parent  e597ef52a7c21ffe862339225bd915438f2dddcc
distutils: Create MANIFEST.in instead of MANIFEST in Makefile

When running 'python setup.py sdist' many files were omitted from the resulting
tarball that are required for a complete build, including the .h file for the
inotify extension due to a python2.7+ distutils bug. This would cause 'make dist'
to fail to build a correct dist on python2.7

By building a MANIFEST.in that is the same as the old MANIFEST with 'include'
at the start of each line will cause a correct MANIFEST to be built and used
by distutils.

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,923 @@
+include .hgignore
+include .hgsigs
+include .hgtags
+include CONTRIBUTORS
+include COPYING
+include MANIFEST.in
+include Makefile
+include README
+include contrib/bash_completion
+include contrib/buildrpm
+include contrib/check-code.py
+include contrib/convert-repo
+include contrib/debugshell.py
+include contrib/dumprevlog
+include contrib/hg-ssh
+include contrib/hgfixes/__init__.py
+include contrib/hgfixes/fix_bytes.py
+include contrib/hgfixes/fix_bytesmod.py
+include contrib/hgfixes/fix_leftover_imports.py
+include contrib/hgk
+include contrib/hgsh/Makefile
+include contrib/hgsh/hgsh.c
+include contrib/hgweb.fcgi
+include contrib/hgweb.wsgi
+include contrib/logo-droplets.svg
+include contrib/macosx/Readme.html
+include contrib/macosx/Welcome.html
+include contrib/macosx/macosx-build.txt
+include contrib/memory.py
+include contrib/mercurial.el
+include contrib/mercurial.spec
+include contrib/mergetools.hgrc
+include contrib/mq.el
+include contrib/perf.py
+include contrib/pylintrc
+include contrib/python-hook-examples.py
+include contrib/sample.hgrc
+include contrib/setup3k.py
+include contrib/shrink-revlog.py
+include contrib/simplemerge
+include contrib/tcsh_completion
+include contrib/tcsh_completion_build.sh
+include contrib/tmplrewrite.py
+include contrib/undumprevlog
+include contrib/vim/HGAnnotate.vim
+include contrib/vim/hg-menu.vim
+include contrib/vim/hgcommand.vim
+include contrib/vim/hgtest.vim
+include contrib/vim/patchreview.txt
+include contrib/vim/patchreview.vim
+include contrib/win32/ReadMe.html
+include contrib/win32/buildlocal.bat
+include contrib/win32/hg.bat
+include contrib/win32/hgwebdir_wsgi.py
+include contrib/win32/mercurial.ico
+include contrib/win32/mercurial.ini
+include contrib/win32/mercurial.iss
+include contrib/win32/postinstall.txt
+include contrib/win32/win32-build.txt
+include contrib/wix/COPYING.rtf
+include contrib/wix/README.txt
+include contrib/wix/contrib.wxs
+include contrib/wix/defines.wxi
+include contrib/wix/dist.wxs
+include contrib/wix/doc.wxs
+include contrib/wix/guids.wxi
+include contrib/wix/help.wxs
+include contrib/wix/hg.cmd
+include contrib/wix/i18n.wxs
+include contrib/wix/locale.wxs
+include contrib/wix/mercurial.wxs
+include contrib/wix/templates.wxs
+include contrib/xml.rnc
+include contrib/zsh_completion
+include doc/Makefile
+include doc/README
+include doc/common.txt
+include doc/gendoc.py
+include doc/hg.1.txt
+include doc/hgignore.5.txt
+include doc/hgmanpage.py
+include doc/hgrc.5.txt
+include doc/runrst
+include doc/style.css
+include hg
+include hgeditor
+include hgext/__init__.py
+include hgext/acl.py
+include hgext/bugzilla.py
+include hgext/children.py
+include hgext/churn.py
+include hgext/color.py
+include hgext/convert/__init__.py
+include hgext/convert/bzr.py
+include hgext/convert/common.py
+include hgext/convert/convcmd.py
+include hgext/convert/cvs.py
+include hgext/convert/cvsps.py
+include hgext/convert/darcs.py
+include hgext/convert/filemap.py
+include hgext/convert/git.py
+include hgext/convert/gnuarch.py
+include hgext/convert/hg.py
+include hgext/convert/monotone.py
+include hgext/convert/p4.py
+include hgext/convert/subversion.py
+include hgext/convert/transport.py
+include hgext/eol.py
+include hgext/extdiff.py
+include hgext/fetch.py
+include hgext/gpg.py
+include hgext/graphlog.py
+include hgext/hgcia.py
+include hgext/hgk.py
+include hgext/highlight/__init__.py
+include hgext/highlight/highlight.py
+include hgext/inotify/__init__.py
+include hgext/inotify/client.py
+include hgext/inotify/common.py
+include hgext/inotify/linux/__init__.py
+include hgext/inotify/linux/_inotify.c
+include hgext/inotify/linux/watcher.py
+include hgext/inotify/linuxserver.py
+include hgext/inotify/server.py
+include hgext/interhg.py
+include hgext/keyword.py
+include hgext/mq.py
+include hgext/notify.py
+include hgext/pager.py
+include hgext/patchbomb.py
+include hgext/progress.py
+include hgext/purge.py
+include hgext/rebase.py
+include hgext/record.py
+include hgext/relink.py
+include hgext/schemes.py
+include hgext/share.py
+include hgext/transplant.py
+include hgext/win32mbcs.py
+include hgext/win32text.py
+include hgext/zeroconf/Zeroconf.py
+include hgext/zeroconf/__init__.py
+include hgweb.cgi
+include i18n/da.po
+include i18n/de.po
+include i18n/el.po
+include i18n/fr.po
+include i18n/hggettext
+include i18n/it.po
+include i18n/ja.po
+include i18n/polib.LICENSE
+include i18n/polib.py
+include i18n/posplit
+include i18n/pt_BR.po
+include i18n/ro.po
+include i18n/ru.po
+include i18n/sv.po
+include i18n/zh_CN.po
+include i18n/zh_TW.po
+include mercurial/__init__.py
+include mercurial/ancestor.py
+include mercurial/archival.py
+include mercurial/base85.c
+include mercurial/bdiff.c
+include mercurial/bookmarks.py
+include mercurial/bundlerepo.py
+include mercurial/byterange.py
+include mercurial/changegroup.py
+include mercurial/changelog.py
+include mercurial/cmdutil.py
+include mercurial/commands.py
+include mercurial/config.py
+include mercurial/context.py
+include mercurial/copies.py
+include mercurial/dagparser.py
+include mercurial/dagutil.py
+include mercurial/demandimport.py
+include mercurial/diffhelpers.c
+include mercurial/dirstate.py
+include mercurial/discovery.py
+include mercurial/dispatch.py
+include mercurial/encoding.py
+include mercurial/error.py
+include mercurial/extensions.py
+include mercurial/fancyopts.py
+include mercurial/filelog.py
+include mercurial/filemerge.py
+include mercurial/fileset.py
+include mercurial/graphmod.py
+include mercurial/hbisect.py
+include mercurial/help.py
+include mercurial/help/config.txt
+include mercurial/help/dates.txt
+include mercurial/help/diffs.txt
+include mercurial/help/environment.txt
+include mercurial/help/extensions.txt
+include mercurial/help/glossary.txt
+include mercurial/help/hgignore.txt
+include mercurial/help/hgweb.txt
+include mercurial/help/merge-tools.txt
+include mercurial/help/multirevs.txt
+include mercurial/help/patterns.txt
+include mercurial/help/revisions.txt
+include mercurial/help/revsets.txt
+include mercurial/help/subrepos.txt
+include mercurial/help/templates.txt
+include mercurial/help/urls.txt
+include mercurial/hg.py
+include mercurial/hgweb/__init__.py
+include mercurial/hgweb/common.py
+include mercurial/hgweb/hgweb_mod.py
+include mercurial/hgweb/hgwebdir_mod.py
+include mercurial/hgweb/protocol.py
+include mercurial/hgweb/request.py
+include mercurial/hgweb/server.py
+include mercurial/hgweb/webcommands.py
+include mercurial/hgweb/webutil.py
+include mercurial/hgweb/wsgicgi.py
+include mercurial/hook.py
+include mercurial/httpclient/__init__.py
+include mercurial/httpclient/socketutil.py
+include mercurial/httpclient/tests/__init__.py
+include mercurial/httpclient/tests/simple_http_test.py
+include mercurial/httpclient/tests/test_bogus_responses.py
+include mercurial/httpclient/tests/test_chunked_transfer.py
+include mercurial/httpclient/tests/test_proxy_support.py
+include mercurial/httpclient/tests/test_ssl.py
+include mercurial/httpclient/tests/util.py
+include mercurial/httpconnection.py
+include mercurial/httprepo.py
+include mercurial/i18n.py
+include mercurial/ignore.py
+include mercurial/keepalive.py
+include mercurial/localrepo.py
+include mercurial/lock.py
+include mercurial/lsprof.py
+include mercurial/lsprofcalltree.py
+include mercurial/mail.py
+include mercurial/manifest.py
+include mercurial/match.py
+include mercurial/mdiff.py
+include mercurial/merge.py
+include mercurial/minirst.py
+include mercurial/mpatch.c
+include mercurial/node.py
+include mercurial/osutil.c
+include mercurial/parser.py
+include mercurial/parsers.c
+include mercurial/patch.py
+include mercurial/posix.py
+include mercurial/pure/base85.py
+include mercurial/pure/bdiff.py
+include mercurial/pure/diffhelpers.py
+include mercurial/pure/mpatch.py
+include mercurial/pure/osutil.py
+include mercurial/pure/parsers.py
+include mercurial/pushkey.py
+include mercurial/py3kcompat.py
+include mercurial/repair.py
+include mercurial/repo.py
+include mercurial/revlog.py
+include mercurial/revset.py
+include mercurial/scmutil.py
+include mercurial/setdiscovery.py
+include mercurial/similar.py
+include mercurial/simplemerge.py
+include mercurial/sshrepo.py
+include mercurial/sshserver.py
+include mercurial/sslutil.py
+include mercurial/statichttprepo.py
+include mercurial/store.py
+include mercurial/strutil.py
+include mercurial/subrepo.py
+include mercurial/tags.py
+include mercurial/templatefilters.py
+include mercurial/templatekw.py
+include mercurial/templater.py
+include mercurial/templates/atom/bookmarkentry.tmpl
+include mercurial/templates/atom/bookmarks.tmpl
+include mercurial/templates/atom/changelog.tmpl
+include mercurial/templates/atom/changelogentry.tmpl
+include mercurial/templates/atom/error.tmpl
+include mercurial/templates/atom/filelog.tmpl
+include mercurial/templates/atom/header.tmpl
+include mercurial/templates/atom/map
+include mercurial/templates/atom/tagentry.tmpl
+include mercurial/templates/atom/tags.tmpl
+include mercurial/templates/coal/header.tmpl
+include mercurial/templates/coal/map
+include mercurial/templates/gitweb/bookmarks.tmpl
+include mercurial/templates/gitweb/branches.tmpl
+include mercurial/templates/gitweb/changelog.tmpl
+include mercurial/templates/gitweb/changelogentry.tmpl
+include mercurial/templates/gitweb/changeset.tmpl
+include mercurial/templates/gitweb/error.tmpl
+include mercurial/templates/gitweb/fileannotate.tmpl
+include mercurial/templates/gitweb/filediff.tmpl
+include mercurial/templates/gitweb/filelog.tmpl
+include mercurial/templates/gitweb/filerevision.tmpl
+include mercurial/templates/gitweb/footer.tmpl
+include mercurial/templates/gitweb/graph.tmpl
+include mercurial/templates/gitweb/header.tmpl
+include mercurial/templates/gitweb/help.tmpl
+include mercurial/templates/gitweb/helptopics.tmpl
+include mercurial/templates/gitweb/index.tmpl
+include mercurial/templates/gitweb/manifest.tmpl
+include mercurial/templates/gitweb/map
+include mercurial/templates/gitweb/notfound.tmpl
+include mercurial/templates/gitweb/search.tmpl
+include mercurial/templates/gitweb/shortlog.tmpl
+include mercurial/templates/gitweb/summary.tmpl
+include mercurial/templates/gitweb/tags.tmpl
+include mercurial/templates/map-cmdline.changelog
+include mercurial/templates/map-cmdline.compact
+include mercurial/templates/map-cmdline.default
+include mercurial/templates/map-cmdline.xml
+include mercurial/templates/monoblue/bookmarks.tmpl
+include mercurial/templates/monoblue/branches.tmpl
+include mercurial/templates/monoblue/changelog.tmpl
+include mercurial/templates/monoblue/changelogentry.tmpl
+include mercurial/templates/monoblue/changeset.tmpl
+include mercurial/templates/monoblue/error.tmpl
+include mercurial/templates/monoblue/fileannotate.tmpl
+include mercurial/templates/monoblue/filediff.tmpl
+include mercurial/templates/monoblue/filelog.tmpl
+include mercurial/templates/monoblue/filerevision.tmpl
+include mercurial/templates/monoblue/footer.tmpl
+include mercurial/templates/monoblue/graph.tmpl
+include mercurial/templates/monoblue/header.tmpl
+include mercurial/templates/monoblue/help.tmpl
+include mercurial/templates/monoblue/helptopics.tmpl
+include mercurial/templates/monoblue/index.tmpl
+include mercurial/templates/monoblue/manifest.tmpl
+include mercurial/templates/monoblue/map
+include mercurial/templates/monoblue/notfound.tmpl
+include mercurial/templates/monoblue/search.tmpl
+include mercurial/templates/monoblue/shortlog.tmpl
+include mercurial/templates/monoblue/summary.tmpl
+include mercurial/templates/monoblue/tags.tmpl
+include mercurial/templates/paper/bookmarks.tmpl
+include mercurial/templates/paper/branches.tmpl
+include mercurial/templates/paper/changeset.tmpl
+include mercurial/templates/paper/error.tmpl
+include mercurial/templates/paper/fileannotate.tmpl
+include mercurial/templates/paper/filediff.tmpl
+include mercurial/templates/paper/filelog.tmpl
+include mercurial/templates/paper/filelogentry.tmpl
+include mercurial/templates/paper/filerevision.tmpl
+include mercurial/templates/paper/footer.tmpl
+include mercurial/templates/paper/graph.tmpl
+include mercurial/templates/paper/header.tmpl
+include mercurial/templates/paper/help.tmpl
+include mercurial/templates/paper/helptopics.tmpl
+include mercurial/templates/paper/index.tmpl
+include mercurial/templates/paper/manifest.tmpl
+include mercurial/templates/paper/map
+include mercurial/templates/paper/notfound.tmpl
+include mercurial/templates/paper/search.tmpl
+include mercurial/templates/paper/shortlog.tmpl
+include mercurial/templates/paper/shortlogentry.tmpl
+include mercurial/templates/paper/tags.tmpl
+include mercurial/templates/raw/changeset.tmpl
+include mercurial/templates/raw/error.tmpl
+include mercurial/templates/raw/fileannotate.tmpl
+include mercurial/templates/raw/filediff.tmpl
+include mercurial/templates/raw/index.tmpl
+include mercurial/templates/raw/manifest.tmpl
+include mercurial/templates/raw/map
+include mercurial/templates/raw/notfound.tmpl
+include mercurial/templates/rss/bookmarkentry.tmpl
+include mercurial/templates/rss/bookmarks.tmpl
+include mercurial/templates/rss/changelog.tmpl
+include mercurial/templates/rss/changelogentry.tmpl
+include mercurial/templates/rss/error.tmpl
+include mercurial/templates/rss/filelog.tmpl
+include mercurial/templates/rss/filelogentry.tmpl
+include mercurial/templates/rss/header.tmpl
+include mercurial/templates/rss/map
+include mercurial/templates/rss/tagentry.tmpl
+include mercurial/templates/rss/tags.tmpl
+include mercurial/templates/spartan/branches.tmpl
+include mercurial/templates/spartan/changelog.tmpl
+include mercurial/templates/spartan/changelogentry.tmpl
+include mercurial/templates/spartan/changeset.tmpl
+include mercurial/templates/spartan/error.tmpl
+include mercurial/templates/spartan/fileannotate.tmpl
+include mercurial/templates/spartan/filediff.tmpl
+include mercurial/templates/spartan/filelog.tmpl
+include mercurial/templates/spartan/filelogentry.tmpl
+include mercurial/templates/spartan/filerevision.tmpl
+include mercurial/templates/spartan/footer.tmpl
+include mercurial/templates/spartan/graph.tmpl
+include mercurial/templates/spartan/header.tmpl
+include mercurial/templates/spartan/index.tmpl
+include mercurial/templates/spartan/manifest.tmpl
+include mercurial/templates/spartan/map
+include mercurial/templates/spartan/notfound.tmpl
+include mercurial/templates/spartan/search.tmpl
+include mercurial/templates/spartan/shortlog.tmpl
+include mercurial/templates/spartan/shortlogentry.tmpl
+include mercurial/templates/spartan/tags.tmpl
+include mercurial/templates/static/background.png
+include mercurial/templates/static/coal-file.png
+include mercurial/templates/static/coal-folder.png
+include mercurial/templates/static/excanvas.js
+include mercurial/templates/static/hgicon.png
+include mercurial/templates/static/hglogo.png
+include mercurial/templates/static/mercurial.js
+include mercurial/templates/static/style-coal.css
+include mercurial/templates/static/style-gitweb.css
+include mercurial/templates/static/style-monoblue.css
+include mercurial/templates/static/style-paper.css
+include mercurial/templates/static/style.css
+include mercurial/templates/template-vars.txt
+include mercurial/transaction.py
+include mercurial/treediscovery.py
+include mercurial/ui.py
+include mercurial/url.py
+include mercurial/util.h
+include mercurial/util.py
+include mercurial/verify.py
+include mercurial/win32.py
+include mercurial/windows.py
+include mercurial/wireproto.py
+include setup.py
+include tests/README
+include tests/autodiff.py
+include tests/binfile.bin
+include tests/blacklists/README
+include tests/blacklists/inotify-failures
+include tests/bundles/darcs1.hg
+include tests/bundles/legacy-encoding.hg
+include tests/bundles/rebase.hg
+include tests/bundles/rebase.sh
+include tests/bundles/remote.hg
+include tests/bundles/remote.sh
+include tests/bundles/tampered.hg
+include tests/bundles/test-keyword.hg
+include tests/bundles/test-manifest.hg
+include tests/bundles/test-merge-symlinks.hg
+include tests/bundles/test-no-symlinks.hg
+include tests/bzr-definitions
+include tests/cgienv
+include tests/dummyssh
+include tests/filtercr.py
+include tests/filterpyflakes.py
+include tests/get-with-headers.py
+include tests/gpg/pubring.gpg
+include tests/gpg/random_seed
+include tests/gpg/secring.gpg
+include tests/gpg/trustdb.gpg
+include tests/hghave
+include tests/killdaemons.py
+include tests/md5sum.py
+include tests/notcapable
+include tests/printenv.py
+include tests/readlink.py
+include tests/revlog-formatv0.py
+include tests/run-tests.py
+include tests/sitecustomize.py
+include tests/svn-safe-append.py
+include tests/svn/branches.svndump
+include tests/svn/encoding.svndump
+include tests/svn/move.svndump
+include tests/svn/replace.svndump
+include tests/svn/startrev.svndump
+include tests/svn/svndump-branches.sh
+include tests/svn/svndump-encoding.sh
+include tests/svn/svndump-move.sh
+include tests/svn/svndump-replace.sh
+include tests/svn/svndump-startrev.sh
+include tests/svn/svndump-tags.sh
+include tests/svn/tags.svndump
+include tests/test-1102.t
+include tests/test-1993.t
+include tests/test-586.t
+include tests/test-abort-checkin.t
+include tests/test-acl.t
+include tests/test-add.t
+include tests/test-addremove-similar.t
+include tests/test-addremove.t
+include tests/test-alias.t
+include tests/test-annotate.t
+include tests/test-archive-symlinks.t
+include tests/test-archive.t
+include tests/test-atomictempfile.py
+include tests/test-atomictempfile.py.out
+include tests/test-audit-path.t
+include tests/test-backout.t
+include tests/test-backwards-remove.t
+include tests/test-bad-extension.t
+include tests/test-bad-pull.t
+include tests/test-basic.t
+include tests/test-bdiff.py
+include tests/test-bdiff.py.out
+include tests/test-bheads.t
+include tests/test-bisect.t
+include tests/test-bisect2.t
+include tests/test-bookmarks-current.t
+include tests/test-bookmarks-pushpull.t
+include tests/test-bookmarks-rebase.t
+include tests/test-bookmarks-strip.t
+include tests/test-bookmarks.t
+include tests/test-branch-option.t
+include tests/test-branch-tag-confict.t
+include tests/test-branches.t
+include tests/test-bundle-r.t
+include tests/test-bundle-type.t
+include tests/test-bundle-vs-outgoing.t
+include tests/test-bundle.t
+include tests/test-casecollision.t
+include tests/test-casefolding.t
+include tests/test-cat.t
+include tests/test-changelog-exec.t
+include tests/test-check-code-hg.py
+include tests/test-check-code.t
+include tests/test-check-pyflakes.t
+include tests/test-children.t
+include tests/test-churn.t
+include tests/test-clone-cgi.t
+include tests/test-clone-failure.t
+include tests/test-clone-pull-corruption.t
+include tests/test-clone-r.t
+include tests/test-clone-update-order.t
+include tests/test-clone.t
+include tests/test-command-template.t
+include tests/test-commit-copy.t
+include tests/test-commit-multiple.t
+include tests/test-commit-unresolved.t
+include tests/test-commit.t
+include tests/test-committer.t
+include tests/test-config-case.t
+include tests/test-conflict.t
+include tests/test-confused-revert.t
+include tests/test-context.py
+include tests/test-context.py.out
+include tests/test-contrib.t
+include tests/test-convert-authormap.t
+include tests/test-convert-baz
+include tests/test-convert-baz.out
+include tests/test-convert-bzr-114.t
+include tests/test-convert-bzr-directories.t
+include tests/test-convert-bzr-ghosts.t
+include tests/test-convert-bzr-merges.t
+include tests/test-convert-bzr-treeroot.t
+include tests/test-convert-bzr.t
+include tests/test-convert-clonebranches.t
+include tests/test-convert-cvs-branch.t
+include tests/test-convert-cvs-detectmerge.t
+include tests/test-convert-cvs-synthetic.t
+include tests/test-convert-cvs.t
+include tests/test-convert-cvsnt-mergepoints.rlog
+include tests/test-convert-cvsnt-mergepoints.t
+include tests/test-convert-darcs.t
+include tests/test-convert-datesort.t
+include tests/test-convert-filemap.t
+include tests/test-convert-git.t
+include tests/test-convert-hg-sink.t
+include tests/test-convert-hg-source.t
+include tests/test-convert-hg-startrev.t
+include tests/test-convert-hg-svn.t
+include tests/test-convert-mtn-rename-directory.out
+include tests/test-convert-mtn.t
+include tests/test-convert-p4
+include tests/test-convert-p4-filetypes
+include tests/test-convert-p4-filetypes.out
+include tests/test-convert-p4.out
+include tests/test-convert-splicemap.t
+include tests/test-convert-svn-branches.t
+include tests/test-convert-svn-encoding.t
+include tests/test-convert-svn-move.t
+include tests/test-convert-svn-sink.t
+include tests/test-convert-svn-source.t
+include tests/test-convert-svn-startrev.t
+include tests/test-convert-svn-tags.t
+include tests/test-convert-tagsbranch-topology.t
+include tests/test-convert-tla.t
+include tests/test-convert.t
+include tests/test-copy-move-merge.t
+include tests/test-copy.t
+include tests/test-copy2.t
+include tests/test-custom-filters.t
+include tests/test-debugbuilddag.t
+include tests/test-debugbundle.t
+include tests/test-debugcomplete.t
+include tests/test-debugindexdot.t
+include tests/test-debugrename.t
+include tests/test-default-push.t
+include tests/test-demandimport.py
+include tests/test-demandimport.py.out
+include tests/test-diff-binary-file.t
+include tests/test-diff-change.t
+include tests/test-diff-color.t
+include tests/test-diff-copy-depth.t
+include tests/test-diff-hashes.t
+include tests/test-diff-ignore-whitespace.t
+include tests/test-diff-issue2761.t
+include tests/test-diff-newlines.t
+include tests/test-diff-reverse.t
+include tests/test-diff-subdir.t
+include tests/test-diff-unified.t
+include tests/test-diff-upgrade.t
+include tests/test-diffdir.t
+include tests/test-diffstat.t
+include tests/test-dirstate-race.t
+include tests/test-dirstate.t
+include tests/test-dispatch.py
+include tests/test-dispatch.py.out
+include tests/test-dispatch.t
+include tests/test-doctest.py
+include tests/test-double-merge.t
+include tests/test-duplicateoptions.py
+include tests/test-empty-dir.t
+include tests/test-empty-file.t
+include tests/test-empty-group.t
+include tests/test-empty.t
+include tests/test-encode.t
+include tests/test-encoding-align.t
+include tests/test-encoding.t
+include tests/test-eol-add.t
+include tests/test-eol-clone.t
+include tests/test-eol-hook.t
+include tests/test-eol-patch.t
+include tests/test-eol-tag.t
+include tests/test-eol-update.t
+include tests/test-eol.t
+include tests/test-eolfilename.t
+include tests/test-excessive-merge.t
+include tests/test-execute-bit.t
+include tests/test-export.t
+include tests/test-extdiff.t
+include tests/test-extension.t
+include tests/test-extra-filelog-entry.t
+include tests/test-fetch.t
+include tests/test-filebranch.t
+include tests/test-filelog
+include tests/test-filelog.out
+include tests/test-flags.t
+include tests/test-fncache.t
+include tests/test-gendoc.t
+include tests/test-getbundle.t
+include tests/test-git-export.t
+include tests/test-git-import.t
+include tests/test-globalopts.t
+include tests/test-glog.t
+include tests/test-gpg.t
+include tests/test-grep.t
+include tests/test-hardlinks.t
+include tests/test-help.t
+include tests/test-hg-parseurl.py
+include tests/test-hg-parseurl.py.out
+include tests/test-hgcia.t
+include tests/test-hghave.t
+include tests/test-hgignore.t
+include tests/test-hgk.t
+include tests/test-hgrc.t
+include tests/test-hgweb-auth.py
+include tests/test-hgweb-auth.py.out
+include tests/test-hgweb-commands.t
+include tests/test-hgweb-descend-empties.t
+include tests/test-hgweb-diffs.t
+include tests/test-hgweb-empty.t
+include tests/test-hgweb-filelog.t
+include tests/test-hgweb-no-path-info.t
+include tests/test-hgweb-no-request-uri.t
+include tests/test-hgweb-non-interactive.t
+include tests/test-hgweb-raw.t
+include tests/test-hgweb-removed.t
+include tests/test-hgweb.t
+include tests/test-hgwebdir-paths.py
+include tests/test-hgwebdir.t
+include tests/test-hgwebdirsym.t
+include tests/test-highlight.t
+include tests/test-hook.t
+include tests/test-http-branchmap.t
+include tests/test-http-clone-r.t
+include tests/test-http-proxy.t
+include tests/test-http.t
+include tests/test-https.t
+include tests/test-hup.t
+include tests/test-hybridencode.py
+include tests/test-hybridencode.py.out
+include tests/test-i18n.t
+include tests/test-identify.t
+include tests/test-impexp-branch.t
+include tests/test-import-context.t
+include tests/test-import-eol.t
+include tests/test-import-unknown.t
+include tests/test-import.t
+include tests/test-incoming-outgoing.t
+include tests/test-inherit-mode.t
+include tests/test-init.t
+include tests/test-inotify-debuginotify.t
+include tests/test-inotify-dirty-dirstate.t
+include tests/test-inotify-issue1208.t
+include tests/test-inotify-issue1371.t
+include tests/test-inotify-issue1542.t
+include tests/test-inotify-issue1556.t
+include tests/test-inotify-lookup.t
+include tests/test-inotify.t
+include tests/test-install.t
+include tests/test-interhg.t
+include tests/test-issue1089.t
+include tests/test-issue1175.t
+include tests/test-issue1306.t
+include tests/test-issue1438.t
+include tests/test-issue1502.t
+include tests/test-issue1877.t
+include tests/test-issue2137.t
+include tests/test-issue522.t
+include tests/test-issue612.t
+include tests/test-issue619.t
+include tests/test-issue660.t
+include tests/test-issue672.t
+include tests/test-issue842.t
+include tests/test-journal-exists.t
+include tests/test-keyword.t
+include tests/test-known.t
+include tests/test-locate.t
+include tests/test-lock-badness.t
+include tests/test-log.t
+include tests/test-mactext.t
+include tests/test-manifest-merging.t
+include tests/test-manifest.t
+include tests/test-merge-closedheads.t
+include tests/test-merge-commit.t
+include tests/test-merge-default.t
+include tests/test-merge-force.t
+include tests/test-merge-internal-tools-pattern.t
+include tests/test-merge-local.t
+include tests/test-merge-prompt.t
+include tests/test-merge-remove.t
+include tests/test-merge-revert.t
+include tests/test-merge-revert2.t
+include tests/test-merge-subrepos.t
+include tests/test-merge-symlinks.t
+include tests/test-merge-tools.t
+include tests/test-merge-types.t
+include tests/test-merge1.t
+include tests/test-merge10.t
+include tests/test-merge2.t
+include tests/test-merge4.t
+include tests/test-merge5.t
+include tests/test-merge6.t
+include tests/test-merge7.t
+include tests/test-merge8.t
+include tests/test-merge9.t
+include tests/test-minirst.py
+include tests/test-minirst.py.out
+include tests/test-mq-caches.t
+include tests/test-mq-eol.t
+include tests/test-mq-git.t
+include tests/test-mq-guards.t
+include tests/test-mq-header-date.t
+include tests/test-mq-header-from.t
+include tests/test-mq-merge.t
+include tests/test-mq-missingfiles.t
+include tests/test-mq-pull-from-bundle.t
+include tests/test-mq-qclone-http.t
+include tests/test-mq-qdelete.t
+include tests/test-mq-qdiff.t
+include tests/test-mq-qfold.t
+include tests/test-mq-qgoto.t
+include tests/test-mq-qimport-fail-cleanup.t
+include tests/test-mq-qimport.t
+include tests/test-mq-qnew.t
+include tests/test-mq-qpush-exact.t
+include tests/test-mq-qpush-fail.t
+include tests/test-mq-qqueue.t
+include tests/test-mq-qrefresh-interactive.t
+include tests/test-mq-qrefresh-replace-log-message.t
+include tests/test-mq-qrefresh.t
+include tests/test-mq-qrename.t
+include tests/test-mq-qsave.t
+include tests/test-mq-safety.t
+include tests/test-mq-strip.t
+include tests/test-mq-subrepo-svn.t
+include tests/test-mq-subrepo.t
+include tests/test-mq-symlinks.t
+include tests/test-mq.t
+include tests/test-mv-cp-st-diff.t
+include tests/test-nested-repo.t
+include tests/test-newbranch.t
+include tests/test-newcgi.t
+include tests/test-newercgi.t
+include tests/test-no-symlinks.t
+include tests/test-notify-changegroup.t
+include tests/test-notify.t
+include tests/test-oldcgi.t
+include tests/test-parents.t
+include tests/test-parse-date.t
+include tests/test-parseindex.t
+include tests/test-parseindex2.py
+include tests/test-parseindex2.py.out
+include tests/test-patch-offset.t
+include tests/test-patch.t
+include tests/test-patchbomb.t
+include tests/test-paths.t
+include tests/test-pending.t
+include tests/test-permissions.t
+include tests/test-profile.t
+include tests/test-progress.t
+include tests/test-pull-branch.t
+include tests/test-pull-http.t
+include tests/test-pull-permission.t
+include tests/test-pull-pull-corruption.t
+include tests/test-pull-pull-corruption2.t
+include tests/test-pull-r.t
+include tests/test-pull-update.t
+include tests/test-pull.t
+include tests/test-purge.t
+include tests/test-push-cgi.t
+include tests/test-push-hook-lock.t
+include tests/test-push-http.t
+include tests/test-push-r.t
+include tests/test-push-validation.t
+include tests/test-push-warn.t
+include tests/test-qrecord.t
+include tests/test-rebase-abort.t
+include tests/test-rebase-cache.t
+include tests/test-rebase-check-restore.t
+include tests/test-rebase-collapse.t
+include tests/test-rebase-conflicts.t
+include tests/test-rebase-detach.t
+include tests/test-rebase-interruptions.t
+include tests/test-rebase-issue-noparam-single-rev.t
+include tests/test-rebase-mq-skip.t
+include tests/test-rebase-mq.t
+include tests/test-rebase-named-branches.t
+include tests/test-rebase-newancestor.t
+include tests/test-rebase-parameters.t
+include tests/test-rebase-pull.t
+include tests/test-rebase-rename.t
+include tests/test-rebase-scenario-global.t
+include tests/test-rebuildstate.t
+include tests/test-record.t
+include tests/test-relink.t
+include tests/test-remove-new.t
+include tests/test-remove.t
+include tests/test-rename-after-merge.t
+include tests/test-rename-dir-merge.t
+include tests/test-rename-merge1.t
+include tests/test-rename-merge2.t
+include tests/test-rename.t
+include tests/test-repair-strip.t
+include tests/test-requires.t
+include tests/test-resolve.t
+include tests/test-revert-flags.t
+include tests/test-revert-unknown.t
+include tests/test-revert.t
+include tests/test-revlog-ancestry.py
+include tests/test-revlog-ancestry.py.out
+include tests/test-revlog-group-emptyiter.t
+include tests/test-revlog-packentry.t
+include tests/test-revset-dirstate-parents.t
+include tests/test-revset-outgoing.t
+include tests/test-revset.t
+include tests/test-rollback.t
+include tests/test-run-tests.t
+include tests/test-schemes.t
+include tests/test-serve.t
+include tests/test-setdiscovery.t
+include tests/test-share.t
+include tests/test-simple-update.t
+include tests/test-simplemerge.py
+include tests/test-simplemerge.py.out
+include tests/test-ssh-clone-r.t
+include tests/test-ssh.t
+include tests/test-static-http.t
+include tests/test-status-color.t
+include tests/test-status-inprocess.py
+include tests/test-status-inprocess.py.out
+include tests/test-status.t
+include tests/test-strict.t
+include tests/test-strip-cross.t
+include tests/test-subrepo-deep-nested-change.t
+include tests/test-subrepo-git.t
+include tests/test-subrepo-missing.t
+include tests/test-subrepo-paths.t
+include tests/test-subrepo-recursion.t
+include tests/test-subrepo-relative-path.t
+include tests/test-subrepo-svn.t
+include tests/test-subrepo.t
+include tests/test-symlink-os-yes-fs-no.py
+include tests/test-symlink-os-yes-fs-no.py.out
+include tests/test-symlinks.t
+include tests/test-tag.t
+include tests/test-tags.t
+include tests/test-template-engine.t
+include tests/test-transplant.t
+include tests/test-treediscovery-legacy.t
+include tests/test-treediscovery.t
+include tests/test-trusted.py
+include tests/test-trusted.py.out
+include tests/test-ui-color.py
+include tests/test-ui-color.py.out
+include tests/test-ui-config.py
+include tests/test-ui-config.py.out
+include tests/test-ui-verbosity.py
+include tests/test-ui-verbosity.py.out
+include tests/test-unbundlehash.t
+include tests/test-unrelated-pull.t
+include tests/test-up-local-change.t
+include tests/test-update-branches.t
+include tests/test-update-issue1456.t
+include tests/test-update-renames.t
+include tests/test-update-reverse.t
+include tests/test-url-rev.t
+include tests/test-url.py
+include tests/test-username-newline.t
+include tests/test-verify.t
+include tests/test-walk.t
+include tests/test-walkrepo.py
+include tests/test-win32text.t
+include tests/test-wireproto.t
+include tests/tinyproxy.py
+include mercurial/__version__.py
+include doc/hg.1
+include doc/hgignore.5
+include doc/hgrc.5
+include doc/hg.1.html
+include doc/hgignore.5.html
+include doc/hgrc.5.html
diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -46,7 +46,7 @@ clean:
 	-$(PYTHON) setup.py clean --all # ignore errors from this command
 	find . \( -name '*.py[cdo]' -o -name '*.so' \) -exec rm -f '{}' ';'
 	rm -f $(addprefix mercurial/,$(notdir $(wildcard mercurial/pure/*.py)))
-	rm -f MANIFEST tests/*.err
+	rm -f MANIFEST MANIFEST.in tests/*.err
 	rm -rf build mercurial/locale
 	$(MAKE) -C doc clean
 
@@ -69,14 +69,14 @@ install-home-doc: doc
 MANIFEST-doc:
 	$(MAKE) -C doc MANIFEST
 
-MANIFEST: MANIFEST-doc
-	hg manifest > MANIFEST
-	echo mercurial/__version__.py >> MANIFEST
-	cat doc/MANIFEST >> MANIFEST
+MANIFEST.in: MANIFEST-doc
+	hg manifest | sed -e 's/^/include /' > MANIFEST.in
+	echo include mercurial/__version__.py >> MANIFEST.in
+	sed -e 's/^/include /' < doc/MANIFEST >> MANIFEST.in
 
 dist:	tests dist-notests
 
-dist-notests:	doc MANIFEST
+dist-notests:	doc MANIFEST.in
 	TAR_OPTIONS="--owner=root --group=root --mode=u+w,go-w,a+rX-s" $(PYTHON) setup.py -q sdist
 
 check: tests