summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-27 15:39:30 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-27 15:39:30 -0300
commit3a21155bf3fb4990ce5a731680c8729a86cbbe3b (patch)
tree266026b956f4bdb0bac57a6c41908ebdabf9bda5
parent40c0f248758bf57b97af48be2b1f65818647f519 (diff)
parent3762233c7e48b2432e1faffc15603c427d18640f (diff)
Merge remote-tracking branch 'kali/hotfix/add-to-manifest'
-rw-r--r--LICENSE75
-rw-r--r--MANIFEST.in3
2 files changed, 3 insertions, 75 deletions
diff --git a/LICENSE b/LICENSE
index bb3ae4a..bc08fe2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -617,78 +617,3 @@ reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
- If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
- <program> Copyright (C) <year> <name of author>
- This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
- You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
- The GNU General Public License does not permit incorporating your program
-into proprietary programs. If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library. If this is what you want to do, use the GNU Lesser General
-Public License instead of this License. But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
---------------------------------------------------------------------------------
-
-Leap-client also uses third party icons:
-
----
-data/images/Arrow-Up-32.png
-data/images/Arrow-Down-32.png
-
-Author: Liam McKay
-License: GNU General Public License - http://en.wikipedia.org/wiki/GNU_General_Public_License
-WebSite: http://wefunction.com/
-IconPackage: WooFunction icon pack - http://www.iconspedia.com/pack/woofunction-icons-4136/
----
-data/images/Globe.png
-
-Author: Everaldo Coelho
-License: LGPL - http://www.gnu.org/licenses/lgpl.html
-WebSite: http://www.everaldo.com/
---- \ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index 3ba80ca..c4058d1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,5 @@
+include pkg/*
include src/leap/common/testing/*.pem
include versioneer.py
+include LICENSE
+include CHANGELOG