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

[Chuck Short]

dropped patch

[Andres Rodriguez (andreserl)]

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

=== 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 @@
+python-cinderclient (1:1.0.4.20.g9357c1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control: Build-Depends python-pbr and python-d2to1.
+
+ -- Andres Rodriguez <[e-mail]>  Wed, 22 May 2013 11:28:30 -0400
+
+python-cinderclient (1:1.0.3-0ubuntu1) raring; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Tue, 02 Apr 2013 09:20:51 -0500
+
+python-cinderclient (1:1.0.2.20.g20dcc85-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * debian/control: Drop python-nose in favor of testrepository.
+
+ -- Chuck Short <[e-mail]>  Thu, 14 Feb 2013 20:58:32 -0600
+
+python-cinderclient (1:1.0.2.3.g61e2a42-0ubuntu1) raring; urgency=low
+
+  [ Adam Gandelman ]
+  * New upstream release.
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/control: Add python-requests as a build dep
+  * debian/control: Add python-testtools and python-fixtures as a build dep.
+
+  [ Yolanda Robla ]
+  * debian/control: add python-setuptools-git dependency
+  * debian/copyright: Removed remaining dh boilerplate template.
+
+ -- Adam Gandelman <[e-mail]>  Thu, 10 Jan 2013 11:35:58 -0800
+
+python-cinderclient (1:1.0.0-0ubuntu1) quantal; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/patches/fix-pep8-errors.patch: Dropped dont run 
+    pep8 tests. 
+  
+  [ Adam Gandelman ]
+  * debian/control: Drop 'Provides: ${python:Provides}'.
+
+ -- Chuck Short <[e-mail]>  Mon, 01 Oct 2012 12:05:26 -0500
+
+python-cinderclient (1:0.2.12-0ubuntu1) quantal; urgency=low
+
+  [ Soren Hansen ]
+  * Update debian/watch to account for symbolically named tarballs and
+    use newer URL.
+  * Fix Launchpad URLs in debian/watch.
+
+  [ Chuck Short ]
+  * New upstream version.
+
+ -- Chuck Short <[e-mail]>  Fri, 07 Sep 2012 11:35:32 -0500
+
+python-cinderclient (1:0.2-0ubuntu1) quantal; urgency=low
+
+  * New upstream version.
+  * debian/watch: Update.
+  * debian/control: clean up run time deps and build deps.
+  * debian/control: Add python-provides
+
+  [ Adam Gandelman ]
+  * debian/control: Set Provides: ${python:Provides}.
+
+ -- Chuck Short <[e-mail]>  Thu, 16 Aug 2012 12:03:50 -0500
+
+python-cinderclient (2012.2~f1~20120621.8-0ubuntu1) quantal; urgency=low
+
+  * Initial release.
+
+ -- Chuck Short <[e-mail]>  Wed, 27 Jun 2012 13:32:14 -0400

=== 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 @@
+8

=== 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 @@
+Source: python-cinderclient
+Section: python
+Priority: optional
+Maintainer: Chuck Short <[e-mail]>
+Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6),
+ python-setuptools,
+ python-httplib2,
+ python-requests,
+ python-prettytable,
+ python-simplejson,
+ python-mock,
+ pep8,
+ python-sphinx,
+ python-unittest2,
+ python-setuptools-git (>= 0.4),
+ python-testtools,
+ python-fixtures,
+ python-pbr,
+ python-d2to1,
+ testrepository
+Standards-Version: 3.9.3
+X-Python-Version: >= 2.5
+
+Package: python-cinderclient
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}, python-httplib2,
+ python-prettytable, python-requests, python-simplejson
+Description: python bindings to the OpenStack Volume API
+ This is a client for the OpenStack Volume API. There's a Python API (the
+ ``cinderclient`` module), and a command-line script (``cinder``). Each
+ implements 100% of the OpenStack Volume API.

=== 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 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: python-cinderclient
+Source: https://github.com/openstack/python-cinderclient
+
+Files: *
+Copyright: 2011 X.commerce, a business unit of eBay Inc.
+           2011 OpenStack, LLC
+           2011 Rackspace
+           2009 Jacob Kaplan-Moss
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'
+
+Files: debian/*
+Copyright: 2012 Canonical
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

=== 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 @@
+README.rst
+ChangeLog

=== 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 @@
+argparse

=== 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 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@  --with python2
+
+get-orig-source:
+	uscan --verbose --force-download --rename --destdir=../build-area
+
+override_dh_auto_test:
+	./run_tests.sh -N -P

=== 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 @@
+3.0 (quilt)

=== 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 @@
+version=3
+opts="uversionmangle=s/%7E/~/" https://launchpad.net/python-cinderclient/+download https://launchpad.net/python-cinderclient/.*/.*/.*/python-cinderclient-(.*)\.tar\.gz
+http://tarballs.openstack.org/python-cinderclient python-cinderclient-(\d.*).tar.gz