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.
Revision history for this message
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
=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2013-06-06 18:00:35 +0000
@@ -0,0 +1,77 @@
1python-cinderclient (1:1.0.4.20.g9357c1-0ubuntu1) UNRELEASED; urgency=low
2
3 * New upstream release.
4 * debian/control: Build-Depends python-pbr and python-d2to1.
5
6 -- Andres Rodriguez <andreserl@ubuntu.com> Wed, 22 May 2013 11:28:30 -0400
7
8python-cinderclient (1:1.0.3-0ubuntu1) raring; urgency=low
9
10 * New upstream release.
11
12 -- Chuck Short <zulcss@ubuntu.com> Tue, 02 Apr 2013 09:20:51 -0500
13
14python-cinderclient (1:1.0.2.20.g20dcc85-0ubuntu1) raring; urgency=low
15
16 * New upstream release.
17 * debian/control: Drop python-nose in favor of testrepository.
18
19 -- Chuck Short <zulcss@ubuntu.com> Thu, 14 Feb 2013 20:58:32 -0600
20
21python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1) raring; urgency=low
22
23 [ Adam Gandelman ]
24 * New upstream release.
25
26 [ Chuck Short ]
27 * New upstream release.
28 * debian/control: Add python-requests as a build dep
29 * debian/control: Add python-testtools and python-fixtures as a build dep.
30
31 [ Yolanda Robla ]
32 * debian/control: add python-setuptools-git dependency
33 * debian/copyright: Removed remaining dh boilerplate template.
34
35 -- Adam Gandelman <adamg@ubuntu.com> Thu, 10 Jan 2013 11:35:58 -0800
36
37python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low
38
39 [ Chuck Short ]
40 * New upstream release.
41 * debian/patches/fix-pep8-errors.patch: Dropped dont run
42 pep8 tests.
43
44 [ Adam Gandelman ]
45 * debian/control: Drop 'Provides: ${python:Provides}'.
46
47 -- Chuck Short <zulcss@ubuntu.com> Mon, 01 Oct 2012 12:05:26 -0500
48
49python-cinderclient (1:0.2.12-0ubuntu1) quantal; urgency=low
50
51 [ Soren Hansen ]
52 * Update debian/watch to account for symbolically named tarballs and
53 use newer URL.
54 * Fix Launchpad URLs in debian/watch.
55
56 [ Chuck Short ]
57 * New upstream version.
58
59 -- Chuck Short <zulcss@ubuntu.com> Fri, 07 Sep 2012 11:35:32 -0500
60
61python-cinderclient (1:0.2-0ubuntu1) quantal; urgency=low
62
63 * New upstream version.
64 * debian/watch: Update.
65 * debian/control: clean up run time deps and build deps.
66 * debian/control: Add python-provides
67
68 [ Adam Gandelman ]
69 * debian/control: Set Provides: ${python:Provides}.
70
71 -- Chuck Short <zulcss@ubuntu.com> Thu, 16 Aug 2012 12:03:50 -0500
72
73python-cinderclient (2012.2~f1~20120621.8-0ubuntu1) quantal; urgency=low
74
75 * Initial release.
76
77 -- Chuck Short <zulcss@ubuntu.com> Wed, 27 Jun 2012 13:32:14 -0400
078
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2013-06-06 18:00:35 +0000
@@ -0,0 +1,1 @@
18
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2013-06-06 18:00:35 +0000
@@ -0,0 +1,31 @@
1Source: python-cinderclient
2Section: python
3Priority: optional
4Maintainer: Chuck Short <zulcss@ubuntu.com>
5Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6),
6 python-setuptools,
7 python-httplib2,
8 python-requests,
9 python-prettytable,
10 python-simplejson,
11 python-mock,
12 pep8,
13 python-sphinx,
14 python-unittest2,
15 python-setuptools-git (>= 0.4),
16 python-testtools,
17 python-fixtures,
18 python-pbr,
19 python-d2to1,
20 testrepository
21Standards-Version: 3.9.3
22X-Python-Version: >= 2.5
23
24Package: python-cinderclient
25Architecture: all
26Depends: ${python:Depends}, ${misc:Depends}, python-httplib2,
27 python-prettytable, python-requests, python-simplejson
28Description: python bindings to the OpenStack Volume API
29 This is a client for the OpenStack Volume API. There's a Python API (the
30 ``cinderclient`` module), and a command-line script (``cinder``). Each
31 implements 100% of the OpenStack Volume API.
032
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2013-06-06 18:00:35 +0000
@@ -0,0 +1,43 @@
1Format: http://dep.debian.net/deps/dep5
2Upstream-Name: python-cinderclient
3Source: https://github.com/openstack/python-cinderclient
4
5Files: *
6Copyright: 2011 X.commerce, a business unit of eBay Inc.
7 2011 OpenStack, LLC
8 2011 Rackspace
9 2009 Jacob Kaplan-Moss
10License: Apache-2
11 Licensed under the Apache License, Version 2.0 (the "License");
12 you may not use this file except in compliance with the License.
13 You may obtain a copy of the License at
14 .
15 http://www.apache.org/licenses/LICENSE-2.0
16 .
17 Unless required by applicable law or agreed to in writing, software
18 distributed under the License is distributed on an "AS IS" BASIS,
19 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
20 See the License for the specific language governing permissions and
21 limitations under the License.
22 .
23 On Debian-based systems the full text of the Apache version 2.0 license
24 can be found in `/usr/share/common-licenses/Apache-2.0'
25
26Files: debian/*
27Copyright: 2012 Canonical
28License: GPL-2+
29 This package is free software; you can redistribute it and/or modify
30 it under the terms of the GNU General Public License as published by
31 the Free Software Foundation; either version 2 of the License, or
32 (at your option) any later version.
33 .
34 This package is distributed in the hope that it will be useful,
35 but WITHOUT ANY WARRANTY; without even the implied warranty of
36 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
37 GNU General Public License for more details.
38 .
39 You should have received a copy of the GNU General Public License
40 along with this program. If not, see <http://www.gnu.org/licenses/>
41 .
42 On Debian systems, the complete text of the GNU General
43 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
044
=== added file 'debian/docs'
--- debian/docs 1970-01-01 00:00:00 +0000
+++ debian/docs 2013-06-06 18:00:35 +0000
@@ -0,0 +1,2 @@
1README.rst
2ChangeLog
03
=== added directory 'debian/patches'
=== added file 'debian/pydist-overrides'
--- debian/pydist-overrides 1970-01-01 00:00:00 +0000
+++ debian/pydist-overrides 2013-06-06 18:00:35 +0000
@@ -0,0 +1,1 @@
1argparse
02
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2013-06-06 18:00:35 +0000
@@ -0,0 +1,14 @@
1#!/usr/bin/make -f
2# -*- makefile -*-
3
4# Uncomment this to turn on verbose mode.
5#export DH_VERBOSE=1
6
7%:
8 dh $@ --with python2
9
10get-orig-source:
11 uscan --verbose --force-download --rename --destdir=../build-area
12
13override_dh_auto_test:
14 ./run_tests.sh -N -P
015
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format 1970-01-01 00:00:00 +0000
+++ debian/source/format 2013-06-06 18:00:35 +0000
@@ -0,0 +1,1 @@
13.0 (quilt)
02
=== added file 'debian/watch'
--- debian/watch 1970-01-01 00:00:00 +0000
+++ debian/watch 2013-06-06 18:00:35 +0000
@@ -0,0 +1,3 @@
1version=3
2opts="uversionmangle=s/%7E/~/" https://launchpad.net/python-cinderclient/+download https://launchpad.net/python-cinderclient/.*/.*/.*/python-cinderclient-(.*)\.tar\.gz
3http://tarballs.openstack.org/python-cinderclient python-cinderclient-(\d.*).tar.gz

Subscribers

People subscribed via source and target branches