summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/control19
1 files changed, 0 insertions, 19 deletions
diff --git a/debian/control b/debian/control
index fcbc70b..3f1c04c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,4 @@
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
@@ -30,5 +12,4 @@ 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