Merge remote-tracking branch 'upstream/stable' into beta

Gallopsled · Sep 19, 2016 · dacdd39 · dacdd39
2 parents 254958b + c0f02d4
commit dacdd39
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1 +1,7 @@
-include *.txt
+graft examples
+graft extra
+include *.md *.txt *.sh *.yml MANIFEST.in
+recursive-include docs   *.rst *.png Makefile *.py *.txt
+recursive-include pwnlib *.py *.asm *.rst *.md *.txt *.sh
+recursive-include pwn    *.py *.asm *.rst *.md *.txt *.sh
+recursive-exclude *.pyc
diff --git a/setup.py b/setup.py
@@ -77,8 +77,7 @@
     packages             = find_packages(),
     version              = '3.1.0beta2',
     data_files           = [('',
-                             ['LICENSE-pwntools.txt',
-                             ]),
+                             glob.glob('*.md') + glob.glob('*.txt')),
                             ],
     package_data         = {
         'pwnlib': [