From ebb8f025966ea4fb4006b374464a758299f4de57 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 30 May 2013 11:03:14 +0800 Subject: [PATCH] Ran wrap-and-sort to clean stuff --- debian/changelog | 1 + debian/cinder-common.install | 10 +- debian/cinder-volume.install | 4 +- debian/control | 191 ++++++++++++++++++----------------- debian/copyright | 1 - 5 files changed, 109 insertions(+), 98 deletions(-) diff --git a/debian/changelog b/debian/changelog index 50dbf1bb8..25e3e67b6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ cinder (2013.1.1-2) unstable; urgency=low * Added if [ -r /usr/share/dbconfig-common/dpkg/prerm ] in the prerm. + * Ran wrap-and-sort to clean stuff. -- Thomas Goirand Thu, 23 May 2013 00:08:47 +0800 diff --git a/debian/cinder-common.install b/debian/cinder-common.install index 9f5b95cef..7f74f6a19 100644 --- a/debian/cinder-common.install +++ b/debian/cinder-common.install @@ -1,7 +1,7 @@ -usr/bin/cinder-manage -usr/bin/cinder-rootwrap -etc/cinder/policy.json /etc/cinder -debian/logging.conf /etc/cinder -etc/cinder/rootwrap.conf /etc/cinder debian/cinder.conf /usr/share/cinder-common +debian/logging.conf /etc/cinder etc/cinder/api-paste.ini /usr/share/cinder-common +etc/cinder/policy.json /etc/cinder +etc/cinder/rootwrap.conf /etc/cinder +usr/bin/cinder-manage +usr/bin/cinder-rootwrap diff --git a/debian/cinder-volume.install b/debian/cinder-volume.install index d3bad5c4f..f3827ab85 100644 --- a/debian/cinder-volume.install +++ b/debian/cinder-volume.install @@ -1,5 +1,5 @@ -usr/bin/cinder-volume debian/cinder_tgt.conf etc/tgt/conf.d etc/cinder/rootwrap.d/volume.filters /etc/cinder/rootwrap.d -usr/bin/cinder-volume-usage-audit usr/bin/cinder-clear-rabbit-queues +usr/bin/cinder-volume +usr/bin/cinder-volume-usage-audit diff --git a/debian/control b/debian/control index 3800a46b6..cf76ac72d 100644 --- a/debian/control +++ b/debian/control @@ -8,48 +8,48 @@ Uploaders: Loic Dachary (OuoU) , Ghe Rivero , Mehdi Abaakouk Build-Depends: debhelper (>= 8.0.0), - po-debconf, - python-all (>= 2.6.6-3~), - openstack-pkg-tools + openstack-pkg-tools, + po-debconf, + python-all (>= 2.6.6-3~) Build-Depends-Indep: pep8 (>= 1.3.3), - pylint, - python-amqplib, - python-anyjson, - python-argparse, - python-babel, - python-cheetah, - python-coverage, - python-daemon, - python-eventlet (>= 0.9.17), - python-glanceclient (>= 1:0.5.0), - python-greenlet, - python-hp3parclient, - python-iso8601, - python-keystoneclient (>= 1:0.2.0), - python-kombu, - python-lockfile, - python-lxml, - python-migrate, - python-mock, - python-mox, - python-mysqldb, - python-netaddr, - python-nose, - python-oslo.config, - python-paramiko, - python-paste, - python-pastedeploy, - python-psycopg2, - python-routes, - python-rtslib, - python-setuptools, - python-setuptools-git, - python-sphinx, - python-sqlalchemy, - python-stevedore (>= 0.7), - python-suds, - python-swiftclient, - python-webob (>= 1.2.3), + pylint, + python-amqplib, + python-anyjson, + python-argparse, + python-babel, + python-cheetah, + python-coverage, + python-daemon, + python-eventlet (>= 0.9.17), + python-glanceclient (>= 1:0.5.0), + python-greenlet, + python-hp3parclient, + python-iso8601, + python-keystoneclient (>= 1:0.2.0), + python-kombu, + python-lockfile, + python-lxml, + python-migrate, + python-mock, + python-mox, + python-mysqldb, + python-netaddr, + python-nose, + python-oslo.config, + python-paramiko, + python-paste, + python-pastedeploy, + python-psycopg2, + python-routes, + python-rtslib, + python-setuptools, + python-setuptools-git, + python-sphinx, + python-sqlalchemy, + python-stevedore (>= 0.7), + python-suds, + python-swiftclient, + python-webob (>= 1.2.3) Standards-Version: 3.9.4 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/cinder.git;a=summary Vcs-Git: git://anonscm.debian.org/openstack/cinder.git @@ -59,36 +59,36 @@ Package: python-cinder Section: python Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${python:Depends}, - python-amqplib, - python-anyjson, - python-argparse, - python-babel, - python-cheetah, - python-daemon, - python-eventlet (>= 0.9.17), - python-glanceclient (>= 1:0.5.0), - python-greenlet, - python-iso8601, - python-keystoneclient (>= 1:0.2.0), - python-kombu, - python-lockfile, - python-lxml, - python-migrate, - python-mysqldb, - python-netaddr, - python-oslo.config, - python-paramiko, - python-paste, - python-pastedeploy, - python-routes, - python-rtslib, - python-sqlalchemy, - python-stevedore (>= 0.7), - python-suds, - python-swiftclient, - python-webob (>= 1.2.3), - ${misc:Depends} +Depends: python-amqplib, + python-anyjson, + python-argparse, + python-babel, + python-cheetah, + python-daemon, + python-eventlet (>= 0.9.17), + python-glanceclient (>= 1:0.5.0), + python-greenlet, + python-iso8601, + python-keystoneclient (>= 1:0.2.0), + python-kombu, + python-lockfile, + python-lxml, + python-migrate, + python-mysqldb, + python-netaddr, + python-oslo.config, + python-paramiko, + python-paste, + python-pastedeploy, + python-routes, + python-rtslib, + python-sqlalchemy, + python-stevedore (>= 0.7), + python-suds, + python-swiftclient, + python-webob (>= 1.2.3), + ${misc:Depends}, + ${python:Depends} Description: OpenStack block storage system - Python libraries Cinder is a block storage as service system for the Openstack cloud computing suite. It re-implements the features of nova-volume, which it directly @@ -102,13 +102,12 @@ Description: OpenStack block storage system - Python libraries Package: cinder-common Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: - adduser, - python-cinder (= ${binary:Version}), - debconf, - dbconfig-common, - ${misc:Depends}, - ${python:Depends} +Depends: adduser, + dbconfig-common, + debconf, + python-cinder (= ${binary:Version}), + ${misc:Depends}, + ${python:Depends} Provides: ${python:Provides} Description: OpenStack block storage system - common files Cinder is a block storage as service system for the Openstack cloud computing @@ -124,7 +123,13 @@ Description: OpenStack block storage system - common files Package: cinder-api Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: adduser, ${ostack-lsb-base}, debconf, cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends}, python-keystoneclient +Depends: adduser, + cinder-common (= ${binary:Version}), + debconf, + python-keystoneclient, + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Description: OpenStack block storage system - API server Cinder is a block storage as service system for the Openstack cloud computing suite. It re-implements the features of nova-volume, which it directly @@ -138,15 +143,14 @@ Description: OpenStack block storage system - API server Package: cinder-volume Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: - adduser, - ${ostack-lsb-base}, - cinder-common (= ${binary:Version}), - lvm2, - tgt, - qemu-utils, - ${misc:Depends}, - ${python:Depends} +Depends: adduser, + cinder-common (= ${binary:Version}), + lvm2, + qemu-utils, + tgt, + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Suggests: ceph-common Description: OpenStack block storage system - Volume server Cinder is a block storage as service system for the Openstack cloud computing @@ -161,7 +165,10 @@ Description: OpenStack block storage system - Volume server Package: cinder-scheduler Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: ${ostack-lsb-base}, cinder-common (= ${binary:Version}), ${python:Depends}, ${misc:Depends} +Depends: cinder-common (= ${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Description: OpenStack block storage system - Scheduler server Cinder is a block storage as service system for the Openstack cloud computing suite. It re-implements the features of nova-volume, which it directly @@ -175,7 +182,11 @@ Description: OpenStack block storage system - Scheduler server Package: cinder-backup Architecture: all Pre-Depends: dpkg (>= 1.15.6~) -Depends: adduser, ${ostack-lsb-base}, cinder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends} +Depends: adduser, + cinder-common (= ${binary:Version}), + ${misc:Depends}, + ${ostack-lsb-base}, + ${python:Depends} Description: OpenStack block storage system - Backup server Cinder is a block storage as service system for the Openstack cloud computing suite. It re-implements the features of nova-volume, which it directly diff --git a/debian/copyright b/debian/copyright index 01bbb0ece..423124d03 100644 --- a/debian/copyright +++ b/debian/copyright @@ -23,4 +23,3 @@ License: Apache-2 . 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'. - -- 2.45.2