simplifications but i'm not sure it works

- change license to mit
- no more .in files, and .py always has __version__
- code is vaguely better, but not by much...

Makefile

@@ -17,20 +17,17 @@ include dist.mk
 include man2txt.mk
 
 all: bin doc
-bin: setup.py $(PROJECT)
+bin: $(PROJECT)
 doc: doc/$(PROJECT).1 doc/$(PROJECT).1.html doc/$(PROJECT).txt
 clean: clean-bin clean-doc
 .PHONY: all bin doc clean
 
 $(PROJECT): $(PROJECT).py $(VERSION_DEP)
-	$(SED) -e "s/^# @VERSION@/__version__ = '$(VERSION)'/" \
+	$(SED) -e "s/^__version__ = .*/__version__ = '$(VERSION)'/" \
 	$(PROJECT).py > $(PROJECT)
 	@chmod +x $(PROJECT)
-setup.py: setup.py.in
-	$(SED) -e "s/^# @VERSION@/      version='$(VERSION)',/" setup.py.in \
-	> setup.py
 clean-bin:
-	$(RM) $(PROJECT) setup.py
+	$(RM) $(PROJECT)
 install-bin:
 	@echo 'make install-doc to install documentation.'
 	@echo 'To install the script, see README.markdown.'

README.md

@@ -0,0 +1,34 @@
+mkvtomp4
+========
+Gavin Beatty <[email protected]>
+
+<http://code.google.com/p/mkvtomp4/>
+
+mkvtomp4: Uses mpeg4ip or GPAC's MP4Box, mkvtoolnix and ffmpeg to convert
+troublesome mkv files to mp4.
+The conversion does not re-encode the video and only re-encodes the audio if
+it doesn't use AAC codec (one can override this behaviour using
+`--audio-codec`).
+They will be playable on the Sony PS3.
+
+Check the manual in `doc/mkvtomp4.1.txt`.
+
+
+Dependencies
+------------
+
+Tools:
+* mkvtoolnix
+* mpeg4ip or GPAC's MP4Box
+* ffmpeg
+
+On Linux, use your package manager to install.
+On Mac OS X, use MacPorts to install.
+On Windows, go to the tools' individual websites and find windows binaries.
+
+Everything else is written using only fully cross-platform python, except:
+
+* pipes module. This means we depend on POSIX /bin/sh for the time being.
+
+If you want to help eliminate this dependency, help solve issue 0001.
+

doc/mkvtomp4.1.txt

@@ -114,9 +114,24 @@ Please report all bugs and wishes to <[email protected]>
 
 COPYING
 -------
-mkvtomp4 Copyright \(C) 2010 Gavin Beatty, <[email protected]>
-
-Free use of this software is granted under the terms of the GNU General Public
-License version 3, or at your option, any later version. (GPLv3+)
+mkvtomp4 Copyright \(c) 2012 Gavin Beatty, <[email protected]>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.