aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gkeys-gen/MANIFEST.in2
-rwxr-xr-xgkeys-gen/bin/gkey-gen (renamed from bin/gkey-gen)0
-rw-r--r--gkeys-gen/gkeygen/__init__.py (renamed from gkeygen/__init__.py)0
-rw-r--r--gkeys-gen/gkeygen/actions.py (renamed from gkeygen/actions.py)0
-rw-r--r--gkeys-gen/gkeygen/cli.py (renamed from gkeygen/cli.py)0
-rwxr-xr-xgkeys-gen/setup.py (renamed from gkeygen_setup.py)4
-rw-r--r--gkeys-ldap/MANIFEST.in2
-rwxr-xr-xgkeys-ldap/bin/gkeys-ldap (renamed from bin/gkey-ldap)0
-rwxr-xr-xgkeys-ldap/bin/update-seeds.sh (renamed from bin/update-seeds.sh)0
-rw-r--r--gkeys-ldap/etc/update-seeds.conf (renamed from etc/update-seeds.conf)0
-rw-r--r--gkeys-ldap/gkeyldap/__init__.py (renamed from gkeyldap/__init__.py)0
-rw-r--r--gkeys-ldap/gkeyldap/actions.py (renamed from gkeyldap/actions.py)0
-rw-r--r--gkeys-ldap/gkeyldap/cli.py (renamed from gkeyldap/cli.py)0
-rw-r--r--gkeys-ldap/gkeyldap/config.py (renamed from gkeyldap/config.py)0
-rw-r--r--gkeys-ldap/gkeyldap/connect.py (renamed from gkeyldap/connect.py)0
-rw-r--r--gkeys-ldap/gkeyldap/search.py (renamed from gkeyldap/search.py)0
-rwxr-xr-xgkeys-ldap/setup.py (renamed from gkeyldap_setup.py)0
-rw-r--r--gkeys/MANIFEST.in2
-rwxr-xr-xgkeys/bin/gkeys (renamed from bin/gkeys)0
-rw-r--r--gkeys/etc/gkeys.conf.sample (renamed from etc/gkeys.conf.sample)0
-rw-r--r--gkeys/gkeys/__init__.py (renamed from gkeys/__init__.py)0
-rw-r--r--gkeys/gkeys/actions.py (renamed from gkeys/actions.py)0
-rw-r--r--gkeys/gkeys/base.py (renamed from gkeys/base.py)0
-rw-r--r--gkeys/gkeys/checks.py (renamed from gkeys/checks.py)0
-rw-r--r--gkeys/gkeys/cli.py (renamed from gkeys/cli.py)0
-rw-r--r--gkeys/gkeys/config.py (renamed from gkeys/config.py)0
-rw-r--r--gkeys/gkeys/fileops.py (renamed from gkeys/fileops.py)0
-rw-r--r--gkeys/gkeys/lib.py (renamed from gkeys/lib.py)0
-rw-r--r--gkeys/gkeys/log.py (renamed from gkeys/log.py)0
-rw-r--r--gkeys/gkeys/seed.py (renamed from gkeys/seed.py)0
-rw-r--r--gkeys/gkeys/seedhandler.py (renamed from gkeys/seedhandler.py)0
-rw-r--r--gkeys/gkeys/utils.py (renamed from gkeys/utils.py)0
-rwxr-xr-xgkeys/setup.py (renamed from gkeys_setup.py)0
-rw-r--r--testpath8
34 files changed, 12 insertions, 6 deletions
diff --git a/gkeys-gen/MANIFEST.in b/gkeys-gen/MANIFEST.in
new file mode 100644
index 0000000..c1a7121
--- /dev/null
+++ b/gkeys-gen/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE
+include README.md
diff --git a/bin/gkey-gen b/gkeys-gen/bin/gkey-gen
index e322f11..e322f11 100755
--- a/bin/gkey-gen
+++ b/gkeys-gen/bin/gkey-gen
diff --git a/gkeygen/__init__.py b/gkeys-gen/gkeygen/__init__.py
index 7e8b64e..7e8b64e 100644
--- a/gkeygen/__init__.py
+++ b/gkeys-gen/gkeygen/__init__.py
diff --git a/gkeygen/actions.py b/gkeys-gen/gkeygen/actions.py
index 22b3089..22b3089 100644
--- a/gkeygen/actions.py
+++ b/gkeys-gen/gkeygen/actions.py
diff --git a/gkeygen/cli.py b/gkeys-gen/gkeygen/cli.py
index e05ea1e..e05ea1e 100644
--- a/gkeygen/cli.py
+++ b/gkeys-gen/gkeygen/cli.py
diff --git a/gkeygen_setup.py b/gkeys-gen/setup.py
index 4101d85..e2ac6b3 100755
--- a/gkeygen_setup.py
+++ b/gkeys-gen/setup.py
@@ -28,8 +28,8 @@ setup(
maintainer_email='gkeys@gentoo.org',
url="https://wiki.gentoo.org/wiki/Project:Gentoo-keys",
download_url='',
- packages=['gkeyldap'],
- scripts=['bin/gkey-ldap'],
+ packages=['gkeygen'],
+ scripts=['bin/gkey-gen'],
license=__license__,
long_description=open('README.md').read(),
keywords='gpg',
diff --git a/gkeys-ldap/MANIFEST.in b/gkeys-ldap/MANIFEST.in
new file mode 100644
index 0000000..c1a7121
--- /dev/null
+++ b/gkeys-ldap/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE
+include README.md
diff --git a/bin/gkey-ldap b/gkeys-ldap/bin/gkeys-ldap
index 3d23ac1..3d23ac1 100755
--- a/bin/gkey-ldap
+++ b/gkeys-ldap/bin/gkeys-ldap
diff --git a/bin/update-seeds.sh b/gkeys-ldap/bin/update-seeds.sh
index 94852a1..94852a1 100755
--- a/bin/update-seeds.sh
+++ b/gkeys-ldap/bin/update-seeds.sh
diff --git a/etc/update-seeds.conf b/gkeys-ldap/etc/update-seeds.conf
index 71fda58..71fda58 100644
--- a/etc/update-seeds.conf
+++ b/gkeys-ldap/etc/update-seeds.conf
diff --git a/gkeyldap/__init__.py b/gkeys-ldap/gkeyldap/__init__.py
index 9789d69..9789d69 100644
--- a/gkeyldap/__init__.py
+++ b/gkeys-ldap/gkeyldap/__init__.py
diff --git a/gkeyldap/actions.py b/gkeys-ldap/gkeyldap/actions.py
index cea4648..cea4648 100644
--- a/gkeyldap/actions.py
+++ b/gkeys-ldap/gkeyldap/actions.py
diff --git a/gkeyldap/cli.py b/gkeys-ldap/gkeyldap/cli.py
index 15f4dbd..15f4dbd 100644
--- a/gkeyldap/cli.py
+++ b/gkeys-ldap/gkeyldap/cli.py
diff --git a/gkeyldap/config.py b/gkeys-ldap/gkeyldap/config.py
index 6e22a5c..6e22a5c 100644
--- a/gkeyldap/config.py
+++ b/gkeys-ldap/gkeyldap/config.py
diff --git a/gkeyldap/connect.py b/gkeys-ldap/gkeyldap/connect.py
index 74e393c..74e393c 100644
--- a/gkeyldap/connect.py
+++ b/gkeys-ldap/gkeyldap/connect.py
diff --git a/gkeyldap/search.py b/gkeys-ldap/gkeyldap/search.py
index 81a9048..81a9048 100644
--- a/gkeyldap/search.py
+++ b/gkeys-ldap/gkeyldap/search.py
diff --git a/gkeyldap_setup.py b/gkeys-ldap/setup.py
index d4f7d5c..d4f7d5c 100755
--- a/gkeyldap_setup.py
+++ b/gkeys-ldap/setup.py
diff --git a/gkeys/MANIFEST.in b/gkeys/MANIFEST.in
new file mode 100644
index 0000000..c1a7121
--- /dev/null
+++ b/gkeys/MANIFEST.in
@@ -0,0 +1,2 @@
+include LICENSE
+include README.md
diff --git a/bin/gkeys b/gkeys/bin/gkeys
index 7f72255..7f72255 100755
--- a/bin/gkeys
+++ b/gkeys/bin/gkeys
diff --git a/etc/gkeys.conf.sample b/gkeys/etc/gkeys.conf.sample
index 4c6b2d0..4c6b2d0 100644
--- a/etc/gkeys.conf.sample
+++ b/gkeys/etc/gkeys.conf.sample
diff --git a/gkeys/__init__.py b/gkeys/gkeys/__init__.py
index 7e8b64e..7e8b64e 100644
--- a/gkeys/__init__.py
+++ b/gkeys/gkeys/__init__.py
diff --git a/gkeys/actions.py b/gkeys/gkeys/actions.py
index a224372..a224372 100644
--- a/gkeys/actions.py
+++ b/gkeys/gkeys/actions.py
diff --git a/gkeys/base.py b/gkeys/gkeys/base.py
index 95142f9..95142f9 100644
--- a/gkeys/base.py
+++ b/gkeys/gkeys/base.py
diff --git a/gkeys/checks.py b/gkeys/gkeys/checks.py
index db3d59f..db3d59f 100644
--- a/gkeys/checks.py
+++ b/gkeys/gkeys/checks.py
diff --git a/gkeys/cli.py b/gkeys/gkeys/cli.py
index 32d2ec4..32d2ec4 100644
--- a/gkeys/cli.py
+++ b/gkeys/gkeys/cli.py
diff --git a/gkeys/config.py b/gkeys/gkeys/config.py
index 775ea1f..775ea1f 100644
--- a/gkeys/config.py
+++ b/gkeys/gkeys/config.py
diff --git a/gkeys/fileops.py b/gkeys/gkeys/fileops.py
index 7cb244f..7cb244f 100644
--- a/gkeys/fileops.py
+++ b/gkeys/gkeys/fileops.py
diff --git a/gkeys/lib.py b/gkeys/gkeys/lib.py
index 50ed63e..50ed63e 100644
--- a/gkeys/lib.py
+++ b/gkeys/gkeys/lib.py
diff --git a/gkeys/log.py b/gkeys/gkeys/log.py
index a16767e..a16767e 100644
--- a/gkeys/log.py
+++ b/gkeys/gkeys/log.py
diff --git a/gkeys/seed.py b/gkeys/gkeys/seed.py
index f0cb019..f0cb019 100644
--- a/gkeys/seed.py
+++ b/gkeys/gkeys/seed.py
diff --git a/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py
index cc797b9..cc797b9 100644
--- a/gkeys/seedhandler.py
+++ b/gkeys/gkeys/seedhandler.py
diff --git a/gkeys/utils.py b/gkeys/gkeys/utils.py
index 92abc50..92abc50 100644
--- a/gkeys/utils.py
+++ b/gkeys/gkeys/utils.py
diff --git a/gkeys_setup.py b/gkeys/setup.py
index 20b346e..20b346e 100755
--- a/gkeys_setup.py
+++ b/gkeys/setup.py
diff --git a/testpath b/testpath
index 3bf8bde..b624ba2 100644
--- a/testpath
+++ b/testpath
@@ -12,9 +12,9 @@
# $ esearch some-package
if [[ "$SHELL" =~ "zsh" ]]; then
- export PATH="$(dirname $0)/../pyGPG/bin:$(dirname $0)/bin:${PATH}"
- export PYTHONPATH="$(dirname $0)/../pyGPG/:$(dirname $0)/../ssl-fetch/:$(dirname $0)/:${PYTHONPATH}"
+ export PATH="$(dirname $0)/../pyGPG/bin:$(dirname $0)/gkeys/bin:$(dirname $0)/gkeys-ldap/bin:$(dirname $0)/gkeys-gen/bin:${PATH}"
+ export PYTHONPATH="$(dirname $0)/../pyGPG/:$(dirname $0)/../ssl-fetch/:$(dirname $0)/gkeys/:$(dirname $0)/gkeys-ldap/:$(dirname $0)/gkeys-gen/:${PYTHONPATH}"
else
- export PATH="$(dirname $BASH_SOURCE[0])/../pyGPG/bin:$(dirname $BASH_SOURCE[0])/bin:${PATH}"
- export PYTHONPATH="$(dirname $BASH_SOURCE[0])/../pyGPG/:$(dirname $BASH_SOURCE[0])/../ssl-fetch/:$(dirname $BASH_SOURCE[0])/:${PYTHONPATH}"
+ export PATH="$(dirname $BASH_SOURCE[0])/../pyGPG/bin:$(dirname $BASH_SOURCE[0])/gkeys/bin:$(dirname $BASH_SOURCE[0])/gkeys-ldap/bin:$(dirname $BASH_SOURCE[0])/gkeys-gen/bin:${PATH}"
+ export PYTHONPATH="$(dirname $BASH_SOURCE[0])/../pyGPG/:$(dirname $BASH_SOURCE[0])/../ssl-fetch/:$(dirname $BASH_SOURCE[0])/gkeys/:$(dirname $BASH_SOURCE[0])/gkeys-gen/:$(dirname $BASH_SOURCE[0])/gkeys-ldap/:${PYTHONPATH}"
fi