diff -pruN 0~dev20111219-1/debian/changelog 0.2+git20120120-0ubuntu1/debian/changelog --- 0~dev20111219-1/debian/changelog 2011-12-19 11:17:50.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/debian/changelog 2012-01-20 19:10:32.000000000 +0000 @@ -1,31 +1,47 @@ -openstackx (0~dev20111219-1) unstable; urgency=low +openstackx (0.2+git20120120-0ubuntu1) precise; urgency=low - * New snapshot. + * New upstream release. + * debian/patches/fix-build.patch - -- Julien Danjou Mon, 19 Dec 2011 12:17:11 +0100 + -- Chuck Short Fri, 20 Jan 2012 14:08:50 -0500 -openstackx (0~dev20111128-4) experimental; urgency=low +openstackx (0.2+git20111219-0ubuntu1) precise; urgency=low - * Revert all Debian patches. + * New upstream version. + * debian/rules: Place the extenstions directory under the openstackx + directory. + * Add python-httplib2 as a build dependency. + * Added patch to clean up the build process. - -- Julien Danjou Mon, 12 Dec 2011 11:48:29 +0100 + -- Chuck Short Mon, 19 Dec 2011 19:26:24 -0500 -openstackx (0~dev20111128-3) unstable; urgency=low +openstackx (0.2+git20111108-0ubuntu2) precise; urgency=low - * Add a patch to revert "fixes to make consoles work in dash" - * Add a patch to revert "fix openstackx due to v2 change" - * Add a patch to fix extensions/admin.py + * debian/rules: Fix override_dh_auto_install, point setup.py to + debian/openstackx. (LP: #904049) - -- Julien Danjou Fri, 02 Dec 2011 15:00:53 +0100 + -- Adam Gandelman Wed, 14 Dec 2011 11:03:05 -0800 -openstackx (0~dev20111128-2) unstable; urgency=low +openstackx (0.2+git20111108-0ubuntu1) precise; urgency=low - * Fix copyright file + * New upstream version - -- Julien Danjou Thu, 01 Dec 2011 12:17:15 +0100 + -- Chuck Short Tue, 08 Nov 2011 13:53:50 -0500 -openstackx (0~dev20111128-1) unstable; urgency=low +openstackx (0.2-0ubuntu3) oneiric; urgency=low - * Initial release (Closes: #650016) + * debian/control: Change arch to all. (LP: #821632) - -- Julien Danjou Mon, 28 Nov 2011 14:48:39 +0100 + -- Chuck Short Wed, 10 Aug 2011 10:55:01 -0400 + +openstackx (0.2-0ubuntu2) oneiric; urgency=low + + * Chagne arch to any. + + -- Chuck Short Tue, 09 Aug 2011 05:00:09 -0400 + +openstackx (0.2-0ubuntu1) oneiric; urgency=low + + * Initial release. + + -- Chuck Short Thu, 04 Aug 2011 16:04:43 -0400 diff -pruN 0~dev20111219-1/debian/control 0.2+git20120120-0ubuntu1/debian/control --- 0~dev20111219-1/debian/control 2011-12-19 11:16:48.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/debian/control 2011-12-20 01:22:39.000000000 +0000 @@ -1,19 +1,13 @@ Source: openstackx Section: python Priority: extra -Maintainer: PKG OpenStack -Uploaders: Julien Danjou , - Thomas Goirand , - Ghe Rivero -Build-Depends: debhelper (>= 8.0.0), python, python-setuptools, python-httplib2 +Maintainer: Chuck Short +Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6.6-3~), + python-setuptools (>= 0.6b3), python-nose, python-mock, python-httplib2 Standards-Version: 3.9.2 -Homepage: https://github.com/cloudbuilders/openstackx -Vcs-Git: git://git.debian.org/openstack/openstackx.git -Vcs-Browser: http://git.debian.org/?p=openstack/openstackx.git;a=summary -Package: python-openstackx +Package: openstackx Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} -Description: client library for OpenStack - This is a deprecated binding to OpenStack. You should use python-novaclient - instead if possible. +Depends: ${python:Depends}, ${misc:Depends} +Description: Client library extenstions for Openstack API + This is the client library extensions for the Openstack API. diff -pruN 0~dev20111219-1/debian/copyright 0.2+git20120120-0ubuntu1/debian/copyright --- 0~dev20111219-1/debian/copyright 2011-12-19 11:16:48.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/debian/copyright 2011-12-16 21:37:30.000000000 +0000 @@ -1,54 +1,51 @@ Format: http://dep.debian.net/deps/dep5 Upstream-Name: openstackx -Source: +Source: https://github.com/cloudbuilders/openstackx Files: * Copyright: 2009 Jacob Kaplan-Moss -License: BSD-3-Clause - -Files: extensions/* -Copyright: 2011 OpenStack LLC -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. +License: Apache 2.0 + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: . - 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'. + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + . + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + 3. Neither the name of this project nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Files: debian/* -Copyright: 2011 Julien Danjou -License: BSD-3-Clause -License: BSD-3-Clause - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the University nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. +Files: debian/* +Copyright: 2011 Chuck Short +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 SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. + 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 + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff -pruN 0~dev20111219-1/debian/docs 0.2+git20120120-0ubuntu1/debian/docs --- 0~dev20111219-1/debian/docs 2011-12-19 11:16:48.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -README.rst diff -pruN 0~dev20111219-1/debian/patches/clean_setup.py 0.2+git20120120-0ubuntu1/debian/patches/clean_setup.py --- 0~dev20111219-1/debian/patches/clean_setup.py 2011-12-19 11:16:48.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/debian/patches/clean_setup.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -Description: Remove shit from setup.py ---- -Origin: other -Forwarded: no - ---- openstackx-0~dev20111128.orig/setup.py -+++ openstackx-0~dev20111128/setup.py -@@ -6,10 +6,6 @@ from setuptools import setup, find_packa - def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() - --dst = 'debian/openstackx/var/lib/nova/' --os.system('rm -rf %s' % dst) --shutil.copytree('extensions', '%s/extensions' % dst) -- - requirements = ['httplib2'] - if sys.version_info < (2,6): - requirements.append('simplejson') diff -pruN 0~dev20111219-1/debian/patches/series 0.2+git20120120-0ubuntu1/debian/patches/series --- 0~dev20111219-1/debian/patches/series 2011-12-19 11:16:50.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -clean_setup.py diff -pruN 0~dev20111219-1/debian/rules 0.2+git20120120-0ubuntu1/debian/rules --- 0~dev20111219-1/debian/rules 2011-12-19 11:16:48.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/debian/rules 2011-12-20 01:21:26.000000000 +0000 @@ -1,10 +1,34 @@ #!/usr/bin/make -f # -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +-include /usr/share/python/python.mk +ifeq (,$(py_sitename)) + py_sitename = site-packages + py_libdir = /usr/lib/python$(subst python,,$(1))/site-packages + py_sitename_sh = $(py_sitename) + py_libdir_sh = $(py_libdir) +endif + %: - dh $@ --with python2 --buildsystem=python_distutils + dh $@ --with python2 + +override_dh_auto_build: + python setup.py build + +override_dh_auto_install: + python setup.py install -f --install-layout=deb --root=$(CURDIR)/debian/openstackx + for ver in $(shell pyversions -vr); do \ + mv $(CURDIR)/debian/openstackx/$(call py_libdir_sh,$$ver)/extensions $(CURDIR)/debian/openstackx/$(call py_libdir_sh,$$ver)/openstackx ; \ + done override_dh_auto_clean: - dh_auto_clean - rm -rf $(CURDIR)/build - rm -f $(CURDIR)/openstackx/*.pyc - rm -rf $(CURDIR)/openstackx.egg-info + python setup.py clean + dh_clean diff -pruN 0~dev20111219-1/extensions/admin.py 0.2+git20120120-0ubuntu1/extensions/admin.py --- 0~dev20111219-1/extensions/admin.py 2011-12-13 21:41:22.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/extensions/admin.py 2012-01-20 19:07:02.000000000 +0000 @@ -39,9 +39,9 @@ from nova.db.sqlalchemy import api as sq from nova.api.openstack import wsgi -import nova.api.openstack.v2 as openstack_api -from nova.api.openstack.v2 import extensions -from nova.api.openstack.v2 import views +import nova.api.openstack.compute as openstack_api +from nova.api.openstack import extensions +from nova.api.openstack.compute import views from nova.compute import instance_types from nova.scheduler import api as scheduler_api diff -pruN 0~dev20111219-1/.gitignore 0.2+git20120120-0ubuntu1/.gitignore --- 0~dev20111219-1/.gitignore 2011-12-13 21:41:22.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -*.egg-info -*.pyc -distribute-* -cover/ -pip-log.txt -/.coverage -/dist -/build -/.tox \ No newline at end of file diff -pruN 0~dev20111219-1/Makefile 0.2+git20120120-0ubuntu1/Makefile --- 0~dev20111219-1/Makefile 2011-12-13 21:41:22.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/Makefile 2012-01-20 19:07:02.000000000 +0000 @@ -1,14 +1,12 @@ PYTHON=`which python` DESTDIR=/ PROJECT=openstackx -BUILDIR=$(CURDIR)/debian/$(PROJECT) VERSION=0.2.0 all: @echo "make source - Create source package" @echo "make install - Install on local system" @echo "make buildrpm - Generate a rpm package" - @echo "make builddeb - Generate a deb package" @echo "make clean - Get rid of scratch and byte files" source: @@ -20,15 +18,6 @@ install: buildrpm: $(PYTHON) setup.py bdist_rpm --post-install=rpm/postinstall --pre-uninstall=rpm/preuninstall -builddeb: - # build the source package in the parent directory - # then rename it to project_version.orig.tar.gz - $(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../ - rename -f 's/$(PROJECT)-(.*)\.tar\.gz/$(PROJECT)_$$1\.orig\.tar\.gz/' ../* - # build the package - #dpkg-buildpackage -i -I -rfakeroot - dpkg-buildpackage -b -rfakeroot -tc -uc -D - clean: $(PYTHON) setup.py clean $(MAKE) -f $(CURDIR)/debian/rules clean diff -pruN 0~dev20111219-1/.pc/applied-patches 0.2+git20120120-0ubuntu1/.pc/applied-patches --- 0~dev20111219-1/.pc/applied-patches 2012-01-20 21:56:03.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/.pc/applied-patches 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -clean_setup.py diff -pruN 0~dev20111219-1/.pc/clean_setup.py/setup.py 0.2+git20120120-0ubuntu1/.pc/clean_setup.py/setup.py --- 0~dev20111219-1/.pc/clean_setup.py/setup.py 2011-12-13 21:41:22.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/.pc/clean_setup.py/setup.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -import os -import shutil -import sys -from setuptools import setup, find_packages - -def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() - -dst = 'debian/openstackx/var/lib/nova/' -os.system('rm -rf %s' % dst) -shutil.copytree('extensions', '%s/extensions' % dst) - -requirements = ['httplib2'] -if sys.version_info < (2,6): - requirements.append('simplejson') - -setup( - name = "openstackx", - version = "0.2", - description = "Client library extensions for the OpenStack API", - long_description = read('README.rst'), - url = 'http://github.com/cloudbuilders/openstackx/', - license = 'Apache 2.0', - author = 'Anthony Young', - author_email = 'sleepsonthefloor@gmail.com', - packages = find_packages(exclude=['tests']), - classifiers = [ - 'Intended Audience :: Developers', - 'Intended Audience :: Information Technology', - 'License :: OSI Approved :: Apache 2.0 License', - 'Operating System :: OS Independent', - 'Programming Language :: Python', - ], - namespace_packages = ["openstackx"], - install_requires = requirements, - tests_require = ["nose", "mock"], - test_suite = "nose.collector", -) - diff -pruN 0~dev20111219-1/setup.py 0.2+git20120120-0ubuntu1/setup.py --- 0~dev20111219-1/setup.py 2012-01-20 21:56:03.000000000 +0000 +++ 0.2+git20120120-0ubuntu1/setup.py 2012-01-20 19:07:02.000000000 +0000 @@ -6,6 +6,10 @@ from setuptools import setup, find_packa def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() +dst = 'debian/openstackx/var/lib/nova/' +os.system('rm -rf %s' % dst) +shutil.copytree('extensions', '%s/extensions' % dst) + requirements = ['httplib2'] if sys.version_info < (2,6): requirements.append('simplejson')