summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog37
-rw-r--r--debian/control16
-rw-r--r--debian/copyright2
-rw-r--r--debian/pydist-overrides1
4 files changed, 55 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index fbfd6d3..84e5729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,46 @@
+leap-common (0.4.11.1) unstable; urgency=medium
+
+ * Move python-service-identity to Recommends.
+ Closes leap issue #7559
+
+ -- Ben Carrillo <ben@futeisha.org> Mon, 02 Nov 2015 11:55:28 -0400
+
+leap-common (0.4.11) unstable; urgency=medium
+
+ * Dummy release. This is exactly tag 0.4.4, to fix a former versioning
+ error. Closes leap issue 7555.
+ * Remove dh-python so we can build on wheezy
+
+ -- 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
+
+ -- Ben Carrillo <ben@futeisha.org> Thu, 29 Oct 2015 12:00:51 -0400
+
+leap-common (0.4.3) unstable; urgency=medium
+
+ * Update to 0.4.3 release
+
+ -- Ben Carrillo <ben@futeisha.org> Thu, 24 Sep 2015 15:18:51 -0400
+
+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
+
+ -- 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
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
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