directory restructure

footley · May 31, 2012 · f9ef66c · f9ef66c
1 parent 5d60e66
commit f9ef66c
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # test output
-test-files/output
+md2ebook/test-files/output
 
 # gedit backup files
 *~

diff --git a/__init__.py → md2ebook/__init__.py b/__init__.py → md2ebook/__init__.py
diff --git a/kindlegen_linux_2.6_i386_v2_4/EULA.txt → ...ok/kindlegen_linux_2.6_i386_v2_4/EULA.txt b/kindlegen_linux_2.6_i386_v2_4/EULA.txt → ...ok/kindlegen_linux_2.6_i386_v2_4/EULA.txt
diff --git a/...dleGen Legal Notices 2009-11-10 Linux.txt → ...dleGen Legal Notices 2009-11-10 Linux.txt b/...dleGen Legal Notices 2009-11-10 Linux.txt → ...dleGen Legal Notices 2009-11-10 Linux.txt
diff --git a/kindlegen_linux_2.6_i386_v2_4/kindlegen → ...k/kindlegen_linux_2.6_i386_v2_4/kindlegen b/kindlegen_linux_2.6_i386_v2_4/kindlegen → ...k/kindlegen_linux_2.6_i386_v2_4/kindlegen
diff --git a/md2ebook.py → md2ebook/md2ebook.py b/md2ebook.py → md2ebook/md2ebook.py
diff --git a/templates/html-boilerplate.html → md2ebook/templates/html-boilerplate.html b/templates/html-boilerplate.html → md2ebook/templates/html-boilerplate.html
diff --git a/test-files/multiple-chapters.md → md2ebook/test-files/multiple-chapters.md b/test-files/multiple-chapters.md → md2ebook/test-files/multiple-chapters.md
diff --git a/test-files/one-chapter.md → md2ebook/test-files/one-chapter.md b/test-files/one-chapter.md → md2ebook/test-files/one-chapter.md
diff --git a/test-files/revenge.500x800.jpg → md2ebook/test-files/revenge.500x800.jpg b/test-files/revenge.500x800.jpg → md2ebook/test-files/revenge.500x800.jpg
diff --git a/test-files/treasure-island.md → md2ebook/test-files/treasure-island.md b/test-files/treasure-island.md → md2ebook/test-files/treasure-island.md
diff --git a/setup.py b/setup.py
@@ -50,14 +50,11 @@ def parse_dependency_links(file_name):
       dependency_links=parse_dependency_links('requirements.txt'),
       scripts=['scripts/md2ebook'],
       packages=['md2ebook'],
-      package_dir={'': ''},
-      package_data={'templates': [
-                         'html-boilerplate.html', 
-                         ],
-                    'kindlegen_linux_2.6_i386_v2_4': [
-                         'EULA.txt',
-                         'kindlegen',
-                         'KindleGen Legal Notices 2009-11-10 Linux.txt',
+      package_data={'md2ebook': [
+                         'templates/html-boilerplate.html', 
+                         'kindlegen_linux_2.6_i386_v2_4/EULA.txt',
+                         'kindlegen_linux_2.6_i386_v2_4/kindlegen',
+                         'kindlegen_linux_2.6_i386_v2_4/KindleGen Legal Notices 2009-11-10 Linux.txt',
                         ],
                    },
       )