Merge lp:~cprov/txstatsd/debian-setuptools into lp:~ubuntuone-hackers/txstatsd/debian

Proposed by Celso Providelo
Status: Merged
Approved by: Wes Mason
Approved revision: 15
Merged at revision: 15
Proposed branch: lp:~cprov/txstatsd/debian-setuptools
Merge into: lp:~ubuntuone-hackers/txstatsd/debian
Diff against target: 78 lines (+11/-22)
3 files modified
debian/changelog (+8/-2)
debian/control (+2/-6)
debian/rules (+1/-14)
To merge this branch: bzr merge lp:~cprov/txstatsd/debian-setuptools
Reviewer Review Type Date Requested Status
Wes Mason (community) Approve
Review via email: mp+241469@code.launchpad.net

Description of the change

Replace python-central by setuptools for modern series (post-precise)

https://code.launchpad.net/~cprov/+recipe/txstatsd-daily

To post a comment you must log in.
Revision history for this message
Wes Mason (wesmason) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-06-28 16:52:09 +0000
+++ debian/changelog 2014-11-11 22:47:07 +0000
@@ -1,3 +1,9 @@
1python-txstatsd (1.0.0ubuntu1) trusty; urgency=medium
2
3 * Building on trusty
4
5 -- Celso Providelo <celso.providelo@gmail.com> Tue, 11 Nov 2014 20:00:52 -0200
6
1txstatsd (1.0.0) lucid; urgency=low7txstatsd (1.0.0) lucid; urgency=low
28
3 * New upstream release.9 * New upstream release.
@@ -6,7 +12,7 @@
612
7txstatsd (0.7.0-0~landscape1) lucid; urgency=low13txstatsd (0.7.0-0~landscape1) lucid; urgency=low
814
9 * New upstream. 15 * New upstream.
1016
11 -- Andreas Hasenack <andreas@canonical.com> Mon, 30 Jan 2012 20:04:28 -020017 -- Andreas Hasenack <andreas@canonical.com> Mon, 30 Jan 2012 20:04:28 -0200
1218
@@ -25,7 +31,7 @@
2531
26txstatsd (0.1.1-0~landscape1) natty; urgency=low32txstatsd (0.1.1-0~landscape1) natty; urgency=low
2733
28 * New upstream release. 34 * New upstream release.
2935
30 -- Sidnei da Silva <sidnei.da.silva@canonical.com> Thu, 28 Jul 2011 11:16:26 -030036 -- Sidnei da Silva <sidnei.da.silva@canonical.com> Thu, 28 Jul 2011 11:16:26 -0300
3137
3238
=== modified file 'debian/control'
--- debian/control 2012-06-28 16:46:11 +0000
+++ debian/control 2014-11-11 22:47:07 +0000
@@ -2,17 +2,13 @@
2Section: python2Section: python
3Priority: extra3Priority: extra
4Maintainer: Andreas Hasenack <andreas@canonical.com>4Maintainer: Andreas Hasenack <andreas@canonical.com>
5Build-Depends: debhelper (>= 7), python-twisted-core, python-central,5Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7), python-twisted-core, python-psutil, python-scipy
6 python-psutil, python-scipy6Standards-Version: 3.9.5
7Standards-Version: 3.8.3
8XS-Python-Version: >= 2.6
9Homepage: https://launchpad.net/txstatsd7Homepage: https://launchpad.net/txstatsd
108
11Package: python-txstatsd9Package: python-txstatsd
12Architecture: all10Architecture: all
13Depends: ${python:Depends}, ${misc:Depends}, python-psutil, python-twisted-core11Depends: ${python:Depends}, ${misc:Depends}, python-psutil, python-twisted-core
14Provides: ${python:Provides}
15XB-Python-Version: ${python:Versions}
16Description: A network daemon for aggregating statistics12Description: A network daemon for aggregating statistics
17 A network daemon for aggregating statistics (counters and timers), rolling13 A network daemon for aggregating statistics (counters and timers), rolling
18 them up, then sending them to graphite. Really a port of14 them up, then sending them to graphite. Really a port of
1915
=== modified file 'debian/rules'
--- debian/rules 2012-06-28 16:46:11 +0000
+++ debian/rules 2014-11-11 22:47:07 +0000
@@ -1,17 +1,4 @@
1#!/usr/bin/make -f1#!/usr/bin/make -f
2# -*- makefile -*-
3# Sample debian/rules that uses debhelper.
4# This file was originally written by Joey Hess and Craig Small.
5# As a special exception, when this file is copied by dh-make into a
6# dh-make output file, you may use that output file without restriction.
7# This special exception was added by Craig Small in version 0.37 of dh-make.
8
9# Uncomment this to turn on verbose mode.
10#export DH_VERBOSE=1
11
122
13%:3%:
14 dh --with python-central $@4 dh $@ --with python2 --buildsystem=python_distutils
15
16override_dh_pycentral:
17 DH_PYCENTRAL=include-links dh_pycentral

Subscribers

People subscribed via source and target branches