summaryrefslogtreecommitdiff
path: root/debian/control
diff options
context:
space:
mode:
Diffstat (limited to 'debian/control')
-rw-r--r--debian/control19
1 files changed, 19 insertions, 0 deletions
diff --git a/debian/control b/debian/control
index 3f1c04c..fcbc70b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,22 @@
Source: leap-common
+<<<<<<< HEAD
+Maintainer: Micah Anderson <micah@debian.org>
+Uploaders: Ben Carrillo <ben@futeisha.org>
+Section: python
+Priority: optional
+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3),
+ debhelper (>= 9), python-protobuf, python-protobuf.socketrpc
+Standards-Version: 3.9.5
+
+Package: python-leap-common
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema,
+ python-dirspec, python-protobuf (>=2.4.1), python-protobuf.socketrpc,
+ python-dateutil, python-openssl, python-gnupg, python-zmq (>=14.4.1),
+ 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
@@ -12,4 +30,5 @@ Depends: ${misc:Depends}, ${python:Depends}, python-jsonschema, python-dirspec,
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