Inline bzr-fast-export license.

3 files changed, 21 insertions, 30 deletions

diff --git a/exporter.py b/exporter.py
index 0a6db67..755833f 100644
--- a/exporter.py
+++ b/exporter.py
@@ -16,8 +16,27 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# Original Copyright (c) 2008 Adeodato Simó
-# Original License: MIT (See exporters/bzr-fast-export.LICENSE)
+# Based on bzr-fast-export
+# Copyright (c) 2008 Adeodato Simó
+#
+# 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.
 #
 # vim: fileencoding=utf-8
 
diff --git a/exporters/bzr-fast-export.LICENSE b/exporters/bzr-fast-export.LICENSE
deleted file mode 100644
index 26e5cc9..0000000
--- a/exporters/bzr-fast-export.LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-bzr-fast-export is Copyright (c) 2008 Adeodato Simó, and licensed under
-the terms of the MIT license:
-
-  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.
diff --git a/exporters/bzr-fast-export.README b/exporters/bzr-fast-export.README
deleted file mode 100644
index 93b0b38..0000000
--- a/exporters/bzr-fast-export.README
+++ /dev/null
@@ -1,7 +0,0 @@
-bzr-fast-export is no longer provided as a separate script.
-Instead a fast-export command is now available. For help, run ...
-
-  bzr help fast-export
-
-Ian C.
-18-Feb-2009