summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog12
-rw-r--r--debian/control19
2 files changed, 31 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2fe6641..84e5729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,12 @@ leap-common (0.4.11) unstable; urgency=medium
-- Ben Carrillo <ben@futeisha.org> Thu, 29 Oct 2015 16:33:25 -0400
+leap-common (0.4.10) unstable; urgency=medium
+
+ * Update to 0.4.0 release
+
+ -- Ben Carrillo <ben@futeisha.org> Mon, 01 Jun 2015 14:30:27 -0400
+
leap-common (0.4.4) unstable; urgency=medium
* Update to 0.4.4 release
@@ -35,6 +41,12 @@ leap-common (0.4.2) unstable; urgency=medium
-- Micah Anderson <micah@leap.se> Tue, 01 Sep 2015 14:18:31 -0400
+leap-common (0.3.9) unstable; urgency=medium
+
+ * Update to 0.3.9 release
+
+ -- Ben Carrillo <ben@futeisha.org> Fri, 07 Nov 2014 18:50:11 +0100
+
leap-common (0.3.8) unstable; urgency=medium
* Update to 0.3.8 release
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