Permalink
Browse files

Merge branch 'master' into rework

Conflicts:
	.gitignore
  • Loading branch information...
2 parents e458049 + 63a20fe commit 54f71a37fad8f5e523356bf5c9d726e70e2773b7 @rene-aguirre committed Feb 24, 2012
Showing with 9 additions and 4 deletions.
  1. +2 −0 .gitignore
  2. +2 −0 MANIFEST.in
  3. 0 README.rst → README.txt
  4. +5 −4 setup.py
View
@@ -1 +1,3 @@
*.pyc
+dist/
+*.egg-info/
View
@@ -0,0 +1,2 @@
+include *.txt
+recursive-include examples *
File renamed without changes.
View
@@ -38,9 +38,10 @@
license='BSD',
packages=find_packages(),
package_data = {
- #other files
- '':['README.txt', 'LICENSE.txt', 'TODO.txt', 'CHANGES.txt',
- 'examples/hook_button.py', 'examples/simple_send.py'],
- },
+ # for all packages
+ '' : ['*.txt', '*.rst', 'examples/*.py'],
+ },
+ include_package_data = True,
namespace_packages=['pywinusb']
)
+

0 comments on commit 54f71a3

Please sign in to comment.