fix example files install in setup.py

This also makes the file layout in git basically the same as the installed
file layout, using an examples/ dir.  I'm not sure if config.buildserver.py
is an example conf file, or a conf file that is actually in use, so I did
not move it.

diff --git a/sampleconfigs/config.py b/examples/config.py
similarity index 100%
rename from sampleconfigs/config.py
rename to examples/config.py

diff --git a/sampleconfigs/makebs.config.py b/examples/makebs.config.py
similarity index 100%
rename from sampleconfigs/makebs.config.py
rename to examples/makebs.config.py

diff --git a/fdroidserver/init.py b/fdroidserver/init.py
index 4a02e9a4196919d76b351357d2b60ae331acf522..666cfaef592f8571ee14f34d20f1457005fb9cbd 100644 (file)
--- a/fdroidserver/init.py
+++ b/fdroidserver/init.py
@@ -109,7 +109,7 @@ def main():
         # 'metadata' and 'tmp' are created in fdroid
         os.mkdir('repo')
         shutil.copy(os.path.join(examplesdir, 'fdroid-icon.png'), fdroiddir)
-        shutil.copyfile(os.path.join(examplesdir, 'sampleconfigs', 'config.py'), 'config.py')
+        shutil.copyfile(os.path.join(examplesdir, 'config.py'), 'config.py')
         os.chmod('config.py', 0o0600)
     else:
         logging.info('Looks like this is already an F-Droid repo, cowardly refusing to overwrite it...')

diff --git a/setup.py b/setup.py
index 7bbec283b2a6b7128f02cd69975256cb2bdecdac..90962a4e201488ee68ae55e39ee1834abe1024c9 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -13,10 +13,10 @@ setup(name='FDroidServer',
       scripts=['fdroid', 'fd-commit'],
       data_files=[
         ('share/doc/fdroidserver/examples',
-         [ 'config.buildserver.py',
-             'sampleconfigs/config.sample.py',
-             'sampleconfigs/makebs.config.sample.py',
-          'fdroid-icon.png']),
+         [ 'buildserver/config.buildserver.py',
+           'examples/config.py',
+           'examples/makebs.config.py',
+           'fdroid-icon.png']),
         ],
       install_requires=[
         'python-magic',