From a31f4571c2666bf23554032cdc8d804eca122f58 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 31 Mar 2014 21:29:51 -0400
Subject: [PATCH] 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.
---
 {sampleconfigs => examples}/config.py        | 0
 {sampleconfigs => examples}/makebs.config.py | 0
 fdroidserver/init.py                         | 2 +-
 setup.py                                     | 8 ++++----
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename {sampleconfigs => examples}/config.py (100%)
 rename {sampleconfigs => examples}/makebs.config.py (100%)

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 4a02e9a4..666cfaef 100644
--- 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 7bbec283..90962a4e 100644
--- 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',
-- 
2.30.2