diff options
| author | Micah Anderson <micah@riseup.net> | 2013-08-27 14:45:19 -0400 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2013-08-27 14:45:19 -0400 |
| commit | ce411ee35e22a4d17b953ce4f8d22c7b648857c7 (patch) | |
| tree | 078c282115974d0d4bbdeb97748c26948ae70fcd /debian | |
| parent | f82457d8b3533dfa71b452cf1881ff3393368dd9 (diff) | |
| parent | ca67759c55395c694af51b4ae619fce794b31a1f (diff) | |
Merge remote-tracking branch 'leapcode/debian' into debian
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/files | 1 | ||||
| -rw-r--r-- | debian/pydist-overrides | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index 8c16005..622e71c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ leap-keymanager (0.3.1) unstable; urgency=low - * Merge new version to get soledad split + * Update to 0.3.1 * Note correct package name for python-leap-common in pydist-overrides - -- Micah Anderson <micah@debian.org> Thu, 22 Aug 2013 15:13:03 -0400 + -- Micah Anderson <micah@debian.org> Tue, 27 Aug 2013 20:12:43 +0200 leap-keymanager (0.3.0) unstable; urgency=low diff --git a/debian/files b/debian/files deleted file mode 100644 index bae9bc1..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -python-leap.keymanager_0.2.0-1_all.deb python optional diff --git a/debian/pydist-overrides b/debian/pydist-overrides index ba38e00..e32eedb 100644 --- a/debian/pydist-overrides +++ b/debian/pydist-overrides @@ -1 +1 @@ -python-leap.common python-leap-common +leap.common python-leap-common ; PEP386 diff --git a/debian/rules b/debian/rules index bcebae9..2bdcd17 100755 --- a/debian/rules +++ b/debian/rules @@ -3,4 +3,7 @@ %: dh $@ --with python2 --buildsystem=python_distutils +override_dh_installchangelogs: + dh_installchangelogs CHANGELOG + |