diff options
| author | Adam Hupp <adam@hupp.org> | 2013-09-27 10:02:03 -0700 |
|---|---|---|
| committer | Adam Hupp <adam@hupp.org> | 2013-09-27 10:02:03 -0700 |
| commit | 01a66f7203c358cc7e4e456ff84d775d30df9b3b (patch) | |
| tree | 5ddbfb33e2b4120e1f16da1161a5b5329dce7e0e | |
| parent | 2b2f1fba280a2a8a37228417ede3228021da5a68 (diff) | |
| parent | 7f2e9ac2295ea0d196e3d4c1c50bede3b79797b4 (diff) | |
| download | python-magic-01a66f7203c358cc7e4e456ff84d775d30df9b3b.tar.gz | |
Merge branch 'master' of github.com:ahupp/python-magic into aromanovich-master
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | stdeb.cfg | 3 |
3 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..40cc424 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +deb_dist +python_magic.egg-info diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..42e09e7 --- /dev/null +++ b/setup.cfg @@ -0,0 +1,2 @@ +[global] +command_packages=stdeb.command diff --git a/stdeb.cfg b/stdeb.cfg new file mode 100644 index 0000000..7c4aa51 --- /dev/null +++ b/stdeb.cfg @@ -0,0 +1,3 @@ +[python-magic] +Depends: libmagic1 +Conflicts: python-magic |