Update DEB specs to v. 2014.1.1

diff --git a/debian/changelog b/debian/changelog
index 12b040f8e6392e168a1d3fa0ec4faabbeaade155..9b99960f633d98d41ee5cf587b54de66d5f55adc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,43 @@
-cinder (1:2014.1~rc1-0ubuntu1~cloud0) precise-icehouse; urgency=medium
+cinder (1:2014.1.1-0ubuntu1) trusty; urgency=medium
 
-  * New update for the Ubuntu Cloud Archive.
+  * Resynchronize with stable/icehouse (aa0e752) (LP: #1328134):
+    - [d58abc1] Update cinder.conf
+    - [5330d3b] Updated from global requirements
+    - [41127fb] Properly initialize rpc in cinder-volume-usage-audit
+    - [75fa69d] Storwize/SVC driver crashes when check volume copy status
+    - [bc585a0] Fix solaris_execute in SolarisISCSIDriver.
+    - [bc0442a] Fix wrong exception reference
+    - [59fe59e] Correct metadata ordering issue in tests
+    - [1e48833] Fallback to None on missing Glance image attrs
+    - [767c2a6] Keep volume available if retype fails due to quota
+    - [d0602f6] Fixes cinder error state volume delete on Windows
+    - [1815c72] Re-raise exceptions in upload-to-image
+    - [560740f] GlusterFS: Delete active snapshot file on volume delete.
+    - [d17277d] Add exception catch if Storwize/SVC driver failed when retyping
+    - [49446bc] Disable oslo.messaging debug logs
+    - [aa0e752] Adjust sample config for keystoneclient 0.8.0 release
+  * debian/patches/fix-requirements.patch: Refreshed, drop six requirement to
+    align to 14.04 version.
 
- -- Openstack Ubuntu Testing Bot <openstack-testing-bot@ubuntu.com>  Tue, 01 Apr 2014 00:05:17 -0400
+ -- Corey Bryant <corey.bryant@canonical.com>  Mon, 09 Jun 2014 14:39:03 -0400
+
+cinder (1:2014.1-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release (LP: #1299055).
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Wed, 16 Apr 2014 13:06:37 -0400
+
+cinder (1:2014.1~rc3-0ubuntu1) trusty; urgency=medium
+
+  * New release candidate (LP: #1299010).
+
+ -- Chuck Short <zulcss@ubuntu.com>  Tue, 15 Apr 2014 09:02:40 -0400
+
+cinder (1:2014.1~rc2-0ubuntu1) trusty; urgency=medium
+
+  * New upstream release (LP: #1299010).
+
+ -- Chuck Short <zulcss@ubuntu.com>  Mon, 07 Apr 2014 11:18:57 -0400
 
 cinder (1:2014.1~rc1-0ubuntu1) trusty; urgency=medium
 

diff --git a/debian/control b/debian/control
index 2e9598d7101389e3c4fb1ec061b73e31e76ed58b..4363fb5962e2d9bb8fdae3a62f783f6de7b7b14b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,6 @@ Depends:
  python-lockfile,
  python-lxml (>= 2.3),
  python-migrate,
- python-mysqldb,
  python-netaddr,
  python-novaclient (>= 1:2.12.0),
  python-oslo.config (>= 1:1.1.0),
@@ -85,9 +84,8 @@ Depends:
  python-taskflow,
  python-webob (>= 1.2.3),
  ${misc:Depends},
- ${python:Depends},
- python-ceph
-Suggests: python-hp3parclient
+ ${python:Depends}
+Suggests: python-ceph, python-hp3parclient
 Description: Cinder Python libraries
  OpenStack is a reliable cloud infrastructure. Its mission is to produce
  the ubiquitous cloud computing platform that will meet the needs of public

diff --git a/debian/patches/fix-requirements.patch b/debian/patches/fix-requirements.patch
index 3f73bcceb9e5577beb76f8e548633bf52608eda0..f59e7025c8830c20bb2a28cc131f561152c21fc2 100644 (file)
--- a/debian/patches/fix-requirements.patch
+++ b/debian/patches/fix-requirements.patch
@@ -1,13 +1,19 @@
-diff --git a/requirements.txt b/requirements.txt
-index 956c5de..1033d31 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -22,7 +22,6 @@ python-swiftclient>=1.6
+Description: Requirement alignment for Ubuntu 14.04
+ rtslib-fb: not supported in Ubuntu, dropped.
+ six: 1.5.2 present in 14.04, features of 1.6.0 not used.
+Forwarded: not-needed
+
+Index: cinder/requirements.txt
+===================================================================
+--- cinder.orig/requirements.txt       2014-06-09 14:41:57.268598007 -0400
++++ cinder/requirements.txt    2014-06-09 14:42:20.900598907 -0400
+@@ -22,8 +22,7 @@
  requests>=1.1
  Routes>=1.12.3
  taskflow>=0.1.3,<0.2
 -rtslib-fb>=2.1.39
- six>=1.5.2
+-six>=1.6.0
++six>=1.5.2
  SQLAlchemy>=0.7.8,<=0.9.99
  sqlalchemy-migrate>=0.8.2,!=0.8.4
-
+ stevedore>=0.14