Merge remote-tracking branch 'micah/debian' into debian

19 files changed, 32 insertions, 50 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 2e20cce..6bb33b5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,3 @@
 include data/*
 include pkg/*
 include pkg/utils/*
-include mx.tac
diff --git a/changes/bug_fix-pip-install b/changes/bug_fix-pip-install
deleted file mode 100644
index fcb5829..0000000
--- a/changes/bug_fix-pip-install
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix broken pip install
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..4340754
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+leap-mx (0.2.2) unstable; urgency=low
+
+  * Initial Debian package
+
+ -- Micah Anderson <micah@debian.org>  Thu, 06 Jun 2013 16:20:55 -0400
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..4a664ba
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+src/leap.mx.egg-info/*
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..78528af
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,12 @@
+Source: leap-mx
+Maintainer: Micah Anderson <micah@debian.org>
+Section: python
+Priority: optional
+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9)
+Standards-Version: 3.9.4
+
+Package: python-leap-mx
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}
+Description: An asynchronous, transparently-encrypting remailer for the L
+ An asynchronous, transparently-encrypting remailer using BigCouch/CouchDB and PGP/GnuPG, written in Twisted Python.
diff --git a/debian/leap-mx.doc b/debian/leap-mx.doc
new file mode 100644
index 0000000..875a55c
--- /dev/null
+++ b/debian/leap-mx.doc
@@ -0,0 +1,3 @@
+../doc
+../README.md
+../VERSION.md
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..bcebae9
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with python2 --buildsystem=python_distutils
+
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..89ae9db
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (native)
diff --git a/mx.tac b/pkg/mx.tac
index cdebba7..cdebba7 100755
--- a/mx.tac
+++ b/pkg/mx.tac
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub
deleted file mode 100644
index 1c8fd34..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.pub
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec
deleted file mode 100644
index 97a60e7..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-001.sec
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub
deleted file mode 100644
index 1cbf8d8..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.pub
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec
deleted file mode 100644
index f89cd97..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-002.sec
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub
deleted file mode 100644
index bc0ac12..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.pub
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec b/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec
deleted file mode 100644
index 397f44a..0000000
--- a/pkg/utils/gpg-keys/generated-2013-02-15_19-15-003.sec
+++ /dev/null
diff --git a/pkg/utils/gpg-keys/gpg-batch-key-script b/pkg/utils/gpg-keys/gpg-batch-key-script
deleted file mode 100644
index 7e48db0..0000000
--- a/pkg/utils/gpg-keys/gpg-batch-key-script
+++ /dev/null
@@ -1,45 +0,0 @@
-%echo Generating keypair 001/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 001/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-001.pub
-%secring generated-2013-02-15_19-15-001.sec
-%commit
-%echo done. 001 keys out of 003 completed.
-
-%echo Generating keypair 002/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 002/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-002.pub
-%secring generated-2013-02-15_19-15-002.sec
-%commit
-%echo done. 002 keys out of 003 completed.
-
-%echo Generating keypair 003/003...
-Key-Type: RSA
-Key-Length: 4096
-Subkey-Type: RSA
-Subkey-Length: 4096
-Name-Real: Louis Lingg
-Name-Email: blackhole@leap.se
-Name-Comment: Test Key 003/003
-Expire-Date: 2013-03-15
-Passphrase: leap
-%pubring generated-2013-02-15_19-15-003.pub
-%secring generated-2013-02-15_19-15-003.sec
-%commit
-%echo done. 003 keys out of 003 completed.
-
diff --git a/setup.py b/setup.py
index 136d7b4..cc4c759 100644
--- a/setup.py
+++ b/setup.py
@@ -44,11 +44,11 @@ else:
     # be automatically
     # placed by distutils, using whatever interpreter is
     # available.
-    data_files = [("/usr/local/bin/", ["mx.tac"]),
+    data_files = [("/usr/local/bin/", ["pkg/mx.tac"]),
                   ("/etc/init.d/", ["pkg/leap_mx"])]
 setup(
     name='leap.mx',
-    version="0.2.1-dev",
+    version="0.2.2-dev",
     # bump also src/leap/mx/__init__
     url="http://github.com/leapcode/leap_mx",
     license='AGPLv3+',
diff --git a/src/leap/mx/__init__.py b/src/leap/mx/__init__.py
index e8c7a5f..e3efc24 100644
--- a/src/leap/mx/__init__.py
+++ b/src/leap/mx/__init__.py
@@ -17,4 +17,4 @@
 """
 Module initialization file for leap.mx .
 """
-__version__ = "0.2.1-dev"
+__version__ = "0.2.2-dev"