summaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control16
1 files changed, 16 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index b97c437..fcbc70b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,5 @@
Source: leap-common
+<<<<<<< HEAD
Maintainer: Micah Anderson <micah@debian.org>
Uploaders: Ben Carrillo <ben@futeisha.org>
Section: python
@@ -15,4 +16,19 @@ Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema,
python-txzmq (>=0.7.3),
Description: Common python files needed by LEAP projects.
This package contains common python functions that are needed
+=======
+Maintainer: Micah Anderson <micah@leap.se>
+Uploaders: Ben Carrillo <ben@futeisha.org>
+Section: python
+Priority: optional
+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 9)
+Standards-Version: 3.9.6
+
+Package: python-leap-common
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema, python-dirspec, python-dateutil, python-openssl, python-zmq (>=14.4.1-1.1), python-txzmq (>= 0.7.3), python-twisted-web (>= 13.0.0)
+Recommends: python-service-identity
+Description: Common Python files needed by LEAP projects
+ This package contains common Python functions that are needed
+>>>>>>> debian/experimental
for the LEAP Client project