summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-09-24 15:20:05 -0400
committerKali Kaneko <kali@leap.se>2015-09-24 15:20:05 -0400
commitae391b09024825a044fbdc91cd44ce125093490c (patch)
treef6294385c78b5957196e904396e2dcbf745c3177
parent5b62dbbc0de18342c7b9ab0236e888b01be0ff41 (diff)
parent0176fddcc10c6e8c3be4404ead2511a36eb86a90 (diff)
Merge branch 'debian/experimental' of ssh://leap.se/leap_pycommon into debian/experimental
-rw-r--r--debian/changelog6
-rw-r--r--debian/control8
-rw-r--r--debian/copyright2
-rw-r--r--debian/pydist-overrides1
4 files changed, 11 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index d5243da..fcee68a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,12 @@ leap-common (0.4.3) unstable; urgency=medium
leap-common (0.4.2) unstable; urgency=medium
* Update to 0.4.2 release
+ * Update standards version to 3.9.6 (no changes)
+ * Change my email address
+ * Add pydist-overrides for pyopenssl
+ * Specify explicit dependencies for python-zmq and python-txzmq
- -- Ben Carrillo <ben@futeisha.org> Fri, 07 Nov 2014 18:50:11 +0100
+ -- Micah Anderson <micah@leap.se> Tue, 01 Sep 2015 14:18:31 -0400
leap-common (0.3.8) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index a5795bd..45ed005 100644
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
Source: leap-common
-Maintainer: Micah Anderson <micah@debian.org>
+Maintainer: Micah Anderson <micah@leap.se>
Uploaders: Ben Carrillo <ben@futeisha.org>
Section: python
Priority: optional
@@ -8,7 +8,7 @@ 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, python-txzmq
-Description: Common python files needed by LEAP projects.
- This package contains common python functions that are needed
+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)
+Description: Common Python files needed by LEAP projects
+ This package contains common Python functions that are needed
for the LEAP Client project
diff --git a/debian/copyright b/debian/copyright
index 353207a..ed928e5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,4 +13,4 @@ License: GPL-3+
License: GPL-3+
On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'.
+ Public License can be found in `/usr/share/common-licenses/GPL-3'.
diff --git a/debian/pydist-overrides b/debian/pydist-overrides
new file mode 100644
index 0000000..b1ee55e
--- /dev/null
+++ b/debian/pydist-overrides
@@ -0,0 +1 @@
+pyopenssl python-openssl