Merge lp:~zulcss/python-keystoneclient/test-fbtfs-drop into lp:~openstack-ubuntu-testing/python-keystoneclient/havana

Proposed by Chuck Short
Status: Needs review
Proposed branch: lp:~zulcss/python-keystoneclient/test-fbtfs-drop
Merge into: lp:~openstack-ubuntu-testing/python-keystoneclient/havana
Diff against target: 221 lines (+173/-0) (has conflicts)
9 files modified
debian/changelog (+77/-0)
debian/compat (+1/-0)
debian/control (+31/-0)
debian/copyright (+43/-0)
debian/docs (+2/-0)
debian/pydist-overrides (+1/-0)
debian/rules (+14/-0)
debian/source/format (+1/-0)
debian/watch (+3/-0)
Conflict adding file debian.  Moved existing file to debian.moved.
To merge this branch: bzr merge lp:~zulcss/python-keystoneclient/test-fbtfs-drop
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Openstack Ubuntu Testers Pending
Review via email: mp+167822@code.launchpad.net

Description of the change

dropped patch

To post a comment you must log in.
Andres Rodriguez (andreserl) wrote :

lgtm

review: Approve

Unmerged revisions

25. By Chuck Short on 2013-06-06

Dropped 01-fix-running-test-location/patch

24. By Andres Rodriguez on 2013-05-22

Add patch

23. By Andres Rodriguez on 2013-05-22

* New upstream release.
* debian/control: Build-Depends python-pbr and python-d2to1.
* debian/patches/01-fix-running-test-location.patch: Fix test location.

22. By Chuck Short on 2013-04-02

releasing version 1:1.0.3-0ubuntu1

21. By Chuck Short on 2013-02-15

releasing version 1:1.0.2.20.g20dcc85-0ubuntu1

20. By Chuck Short on 2013-01-29

Fix changelog

19. By Chuck Short on 2013-01-29

* New upstream release.
* debian/control: Drop python-nose in favor of testrepository.

18. By Adam Gandelman on 2013-01-10

New upstream release.

17. By Chuck Short on 2013-01-03

debian/control: Add python-testtools and python-fixtures as a build dep.

16. By Chuck Short on 2013-01-03

Fix changelog

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'debian'
2=== renamed directory 'debian' => 'debian.moved'
3=== added file 'debian/changelog'
4--- debian/changelog 1970-01-01 00:00:00 +0000
5+++ debian/changelog 2013-06-06 18:00:35 +0000
6@@ -0,0 +1,77 @@
7+python-cinderclient (1:1.0.4.20.g9357c1-0ubuntu1) UNRELEASED; urgency=low
8+
9+ * New upstream release.
10+ * debian/control: Build-Depends python-pbr and python-d2to1.
11+
12+ -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 22 May 2013 11:28:30 -0400
13+
14+python-cinderclient (1:1.0.3-0ubuntu1) raring; urgency=low
15+
16+ * New upstream release.
17+
18+ -- Chuck Short <zulcss@ubuntu.com> Tue, 02 Apr 2013 09:20:51 -0500
19+
20+python-cinderclient (1:1.0.2.20.g20dcc85-0ubuntu1) raring; urgency=low
21+
22+ * New upstream release.
23+ * debian/control: Drop python-nose in favor of testrepository.
24+
25+ -- Chuck Short <zulcss@ubuntu.com> Thu, 14 Feb 2013 20:58:32 -0600
26+
27+python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1) raring; urgency=low
28+
29+ [ Adam Gandelman ]
30+ * New upstream release.
31+
32+ [ Chuck Short ]
33+ * New upstream release.
34+ * debian/control: Add python-requests as a build dep
35+ * debian/control: Add python-testtools and python-fixtures as a build dep.
36+
37+ [ Yolanda Robla ]
38+ * debian/control: add python-setuptools-git dependency
39+ * debian/copyright: Removed remaining dh boilerplate template.
40+
41+ -- Adam Gandelman <adamg@ubuntu.com> Thu, 10 Jan 2013 11:35:58 -0800
42+
43+python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low
44+
45+ [ Chuck Short ]
46+ * New upstream release.
47+ * debian/patches/fix-pep8-errors.patch: Dropped dont run
48+ pep8 tests.
49+
50+ [ Adam Gandelman ]
51+ * debian/control: Drop 'Provides: ${python:Provides}'.
52+
53+ -- Chuck Short <zulcss@ubuntu.com> Mon, 01 Oct 2012 12:05:26 -0500
54+
55+python-cinderclient (1:0.2.12-0ubuntu1) quantal; urgency=low
56+
57+ [ Soren Hansen ]
58+ * Update debian/watch to account for symbolically named tarballs and
59+ use newer URL.
60+ * Fix Launchpad URLs in debian/watch.
61+
62+ [ Chuck Short ]
63+ * New upstream version.
64+
65+ -- Chuck Short <zulcss@ubuntu.com> Fri, 07 Sep 2012 11:35:32 -0500
66+
67+python-cinderclient (1:0.2-0ubuntu1) quantal; urgency=low
68+
69+ * New upstream version.
70+ * debian/watch: Update.
71+ * debian/control: clean up run time deps and build deps.
72+ * debian/control: Add python-provides
73+
74+ [ Adam Gandelman ]
75+ * debian/control: Set Provides: ${python:Provides}.
76+
77+ -- Chuck Short <zulcss@ubuntu.com> Thu, 16 Aug 2012 12:03:50 -0500
78+
79+python-cinderclient (2012.2~f1~20120621.8-0ubuntu1) quantal; urgency=low
80+
81+ * Initial release.
82+
83+ -- Chuck Short <zulcss@ubuntu.com> Wed, 27 Jun 2012 13:32:14 -0400
84
85=== added file 'debian/compat'
86--- debian/compat 1970-01-01 00:00:00 +0000
87+++ debian/compat 2013-06-06 18:00:35 +0000
88@@ -0,0 +1,1 @@
89+8
90
91=== added file 'debian/control'
92--- debian/control 1970-01-01 00:00:00 +0000
93+++ debian/control 2013-06-06 18:00:35 +0000
94@@ -0,0 +1,31 @@
95+Source: python-cinderclient
96+Section: python
97+Priority: optional
98+Maintainer: Chuck Short <zulcss@ubuntu.com>
99+Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6),
100+ python-setuptools,
101+ python-httplib2,
102+ python-requests,
103+ python-prettytable,
104+ python-simplejson,
105+ python-mock,
106+ pep8,
107+ python-sphinx,
108+ python-unittest2,
109+ python-setuptools-git (>= 0.4),
110+ python-testtools,
111+ python-fixtures,
112+ python-pbr,
113+ python-d2to1,
114+ testrepository
115+Standards-Version: 3.9.3
116+X-Python-Version: >= 2.5
117+
118+Package: python-cinderclient
119+Architecture: all
120+Depends: ${python:Depends}, ${misc:Depends}, python-httplib2,
121+ python-prettytable, python-requests, python-simplejson
122+Description: python bindings to the OpenStack Volume API
123+ This is a client for the OpenStack Volume API. There's a Python API (the
124+ ``cinderclient`` module), and a command-line script (``cinder``). Each
125+ implements 100% of the OpenStack Volume API.
126
127=== added file 'debian/copyright'
128--- debian/copyright 1970-01-01 00:00:00 +0000
129+++ debian/copyright 2013-06-06 18:00:35 +0000
130@@ -0,0 +1,43 @@
131+Format: http://dep.debian.net/deps/dep5
132+Upstream-Name: python-cinderclient
133+Source: https://github.com/openstack/python-cinderclient
134+
135+Files: *
136+Copyright: 2011 X.commerce, a business unit of eBay Inc.
137+ 2011 OpenStack, LLC
138+ 2011 Rackspace
139+ 2009 Jacob Kaplan-Moss
140+License: Apache-2
141+ Licensed under the Apache License, Version 2.0 (the "License");
142+ you may not use this file except in compliance with the License.
143+ You may obtain a copy of the License at
144+ .
145+ http://www.apache.org/licenses/LICENSE-2.0
146+ .
147+ Unless required by applicable law or agreed to in writing, software
148+ distributed under the License is distributed on an "AS IS" BASIS,
149+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
150+ See the License for the specific language governing permissions and
151+ limitations under the License.
152+ .
153+ On Debian-based systems the full text of the Apache version 2.0 license
154+ can be found in `/usr/share/common-licenses/Apache-2.0'
155+
156+Files: debian/*
157+Copyright: 2012 Canonical
158+License: GPL-2+
159+ This package is free software; you can redistribute it and/or modify
160+ it under the terms of the GNU General Public License as published by
161+ the Free Software Foundation; either version 2 of the License, or
162+ (at your option) any later version.
163+ .
164+ This package is distributed in the hope that it will be useful,
165+ but WITHOUT ANY WARRANTY; without even the implied warranty of
166+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
167+ GNU General Public License for more details.
168+ .
169+ You should have received a copy of the GNU General Public License
170+ along with this program. If not, see <http://www.gnu.org/licenses/>
171+ .
172+ On Debian systems, the complete text of the GNU General
173+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
174
175=== added file 'debian/docs'
176--- debian/docs 1970-01-01 00:00:00 +0000
177+++ debian/docs 2013-06-06 18:00:35 +0000
178@@ -0,0 +1,2 @@
179+README.rst
180+ChangeLog
181
182=== added directory 'debian/patches'
183=== added file 'debian/pydist-overrides'
184--- debian/pydist-overrides 1970-01-01 00:00:00 +0000
185+++ debian/pydist-overrides 2013-06-06 18:00:35 +0000
186@@ -0,0 +1,1 @@
187+argparse
188
189=== added file 'debian/rules'
190--- debian/rules 1970-01-01 00:00:00 +0000
191+++ debian/rules 2013-06-06 18:00:35 +0000
192@@ -0,0 +1,14 @@
193+#!/usr/bin/make -f
194+# -*- makefile -*-
195+
196+# Uncomment this to turn on verbose mode.
197+#export DH_VERBOSE=1
198+
199+%:
200+ dh $@ --with python2
201+
202+get-orig-source:
203+ uscan --verbose --force-download --rename --destdir=../build-area
204+
205+override_dh_auto_test:
206+ ./run_tests.sh -N -P
207
208=== added directory 'debian/source'
209=== added file 'debian/source/format'
210--- debian/source/format 1970-01-01 00:00:00 +0000
211+++ debian/source/format 2013-06-06 18:00:35 +0000
212@@ -0,0 +1,1 @@
213+3.0 (quilt)
214
215=== added file 'debian/watch'
216--- debian/watch 1970-01-01 00:00:00 +0000
217+++ debian/watch 2013-06-06 18:00:35 +0000
218@@ -0,0 +1,3 @@
219+version=3
220+opts="uversionmangle=s/%7E/~/" https://launchpad.net/python-cinderclient/+download https://launchpad.net/python-cinderclient/.*/.*/.*/python-cinderclient-(.*)\.tar\.gz
221+http://tarballs.openstack.org/python-cinderclient python-cinderclient-(\d.*).tar.gz

Subscribers

People subscribed via source and target branches