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

Proposed by Celso Providelo on 2014-11-11
Status: Merged
Approved by: Wes Mason on 2015-04-15
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) 2014-11-11 Approve on 2014-11-11
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.
Wes Mason (wesmason) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-28 16:52:09 +0000
3+++ debian/changelog 2014-11-11 22:47:07 +0000
4@@ -1,3 +1,9 @@
5+python-txstatsd (1.0.0ubuntu1) trusty; urgency=medium
6+
7+ * Building on trusty
8+
9+ -- Celso Providelo <celso.providelo@gmail.com> Tue, 11 Nov 2014 20:00:52 -0200
10+
11 txstatsd (1.0.0) lucid; urgency=low
12
13 * New upstream release.
14@@ -6,7 +12,7 @@
15
16 txstatsd (0.7.0-0~landscape1) lucid; urgency=low
17
18- * New upstream.
19+ * New upstream.
20
21 -- Andreas Hasenack <andreas@canonical.com> Mon, 30 Jan 2012 20:04:28 -0200
22
23@@ -25,7 +31,7 @@
24
25 txstatsd (0.1.1-0~landscape1) natty; urgency=low
26
27- * New upstream release.
28+ * New upstream release.
29
30 -- Sidnei da Silva <sidnei.da.silva@canonical.com> Thu, 28 Jul 2011 11:16:26 -0300
31
32
33=== modified file 'debian/control'
34--- debian/control 2012-06-28 16:46:11 +0000
35+++ debian/control 2014-11-11 22:47:07 +0000
36@@ -2,17 +2,13 @@
37 Section: python
38 Priority: extra
39 Maintainer: Andreas Hasenack <andreas@canonical.com>
40-Build-Depends: debhelper (>= 7), python-twisted-core, python-central,
41- python-psutil, python-scipy
42-Standards-Version: 3.8.3
43-XS-Python-Version: >= 2.6
44+Build-Depends: python-setuptools (>= 0.6b3), python-all (>= 2.6.6-3), debhelper (>= 7), python-twisted-core, python-psutil, python-scipy
45+Standards-Version: 3.9.5
46 Homepage: https://launchpad.net/txstatsd
47
48 Package: python-txstatsd
49 Architecture: all
50 Depends: ${python:Depends}, ${misc:Depends}, python-psutil, python-twisted-core
51-Provides: ${python:Provides}
52-XB-Python-Version: ${python:Versions}
53 Description: A network daemon for aggregating statistics
54 A network daemon for aggregating statistics (counters and timers), rolling
55 them up, then sending them to graphite. Really a port of
56
57=== modified file 'debian/rules'
58--- debian/rules 2012-06-28 16:46:11 +0000
59+++ debian/rules 2014-11-11 22:47:07 +0000
60@@ -1,17 +1,4 @@
61 #!/usr/bin/make -f
62-# -*- makefile -*-
63-# Sample debian/rules that uses debhelper.
64-# This file was originally written by Joey Hess and Craig Small.
65-# As a special exception, when this file is copied by dh-make into a
66-# dh-make output file, you may use that output file without restriction.
67-# This special exception was added by Craig Small in version 0.37 of dh-make.
68-
69-# Uncomment this to turn on verbose mode.
70-#export DH_VERBOSE=1
71-
72
73 %:
74- dh --with python-central $@
75-
76-override_dh_pycentral:
77- DH_PYCENTRAL=include-links dh_pycentral
78+ dh $@ --with python2 --buildsystem=python_distutils

Subscribers

People subscribed via source and target branches