[MOS 9.0] Update python-django-openstack-auth package 49/19449/1
authorIvan Udovichenko <iudovichenko@mirantis.com>
Fri, 8 Apr 2016 12:31:20 +0000 (15:31 +0300)
committerIgor Yozhikov <iyozhikov@mirantis.com>
Fri, 8 Apr 2016 13:54:11 +0000 (13:54 +0000)
Change-Id: I71345a0ccf5da02b88277484ed77517e2bbafd31
Version: 2.2.1-1~u14.04+mos1
Source: https://anonscm.debian.org/git/openstack/python-django-openstack-auth.git
Related-Bug: #1567835
Commit: 0cc144f42b790bef1b651515f8eb593c614d2918

trusty/debian/changelog
trusty/debian/control
trusty/debian/copyright
trusty/debian/gbp.conf
trusty/debian/rules

index c9881d0cba2d563228ef7d1e48306485aeada299..9f97afd454697e4db9cc495706a86c1ea0eec9c1 100644 (file)
@@ -1,3 +1,89 @@
+python-django-openstack-auth (2.2.1-1~u14.04+mos1) mos9.0; urgency=medium
+
+  * Source: https://anonscm.debian.org/git/openstack/python-django-openstack-auth.git
+    Commit: 0cc144f42b790bef1b651515f8eb593c614d2918
+
+ -- Ivan Udovichenko <iudovichenko@mirantis.com>  Fri, 08 Apr 2016 15:29:32 +0300
+
+python-django-openstack-auth (2.2.1-1) unstable; urgency=medium
+
+  [ Ondřej Nový ]
+  * Fixed homepage (https).
+  * Fixed VCS URLs (https).
+
+  [ Thomas Goirand ]
+  * New upstream release.
+  * Uploading to unstable.
+  * Standards-Version: 3.9.7 (no change).
+  * Removed debian/patches/fix-request.REQUEST-non-existant.patch applied
+    upstream.
+  * Removed fix-check-of-redirections.patch also applied upstream.
+  * Removed Monkey-patch_to_avoid_breaking_Django_with_hash_user.id.patch as
+    a better solution was implemented.
+
+ -- Thomas Goirand <zigo@debian.org>  Wed, 06 Apr 2016 08:50:17 +0000
+
+python-django-openstack-auth (2.2.0-1~u14.04+mos1) mos9.0; urgency=medium
+
+  * Update to 2.2.0
+  * Update runtime requirements according to global requirements of Mitaka
+  * Related-Bug: #1544961
+
+ -- Daniil Trishkin <dtrishkin@mirantis.com>  Thu, 17 Mar 2016 17:22:31 +0300
+
+python-django-openstack-auth (2.1.1-1~u14.04+mos3) mos9.0; urgency=medium
+
+  * Source: https://anonscm.debian.org/cgit/openstack/python-django-openstack-auth.git/?h=debian%2Fmitaka
+
+ -- Dmitry Burmistrov <dburmistrov@mirantis.com>  Fri, 22 Jan 2016 13:57:48 +0300
+
+python-django-openstack-auth (2.1.1-1) experimental; urgency=medium
+
+  [ Ivan Udovichenko ]
+  * New upstream release.
+  * d/control: Fixed (build-)depends for this release.
+
+  [ Thomas Goirand ]
+  * Fixed debian/copyright ordering.
+  * Re-applied Django 1.9 and REQUEST patches.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 21 Jan 2016 07:45:26 +0000
+
+python-django-openstack-auth (2.0.1-1) unstable; urgency=medium
+
+  * New upstream release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 10 Dec 2015 00:48:05 +0100
+
+python-django-openstack-auth (2.0.0-3) unstable; urgency=medium
+
+  * Transition from python-openstack-auth to python-django-openstack-auth.
+  * Added Python 3 support.
+  * Fixed debian/copyright: the package really is under Apache-2.0 and not
+    a BSD license.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 22 Oct 2015 17:45:52 +0200
+
+python-django-openstack-auth (2.0.0-2) unstable; urgency=medium
+
+  * Uploading to unstable.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 16 Oct 2015 08:41:08 +0000
+
+python-django-openstack-auth (2.0.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+
+ -- Thomas Goirand <zigo@debian.org>  Fri, 25 Sep 2015 00:19:06 +0200
+
+python-django-openstack-auth (1.4.0-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Fixed (build-)depends for this release.
+
+ -- Thomas Goirand <zigo@debian.org>  Thu, 10 Sep 2015 09:45:50 +0200
+
 python-django-openstack-auth (1.2.0-1~u14.04+mos1) mos8.0; urgency=low
 
   * Source: http://http.debian.net/debian/pool/main/p/python-django-openstack-auth/python-django-openstack-auth_1.2.0-1.dsc
index 04d671f05b1283c9dc90acd0785cc73a82291e5e..0b0762463525feedd6e6130a8aa72dd30980d8fa 100644 (file)
@@ -3,39 +3,92 @@ Section: python
 Priority: optional
 Maintainer: PKG OpenStack <openstack-devel@lists.alioth.debian.org>
 Uploaders: Thomas Goirand <zigo@debian.org>,
+           Ivan Udovichenko <iudovichenko@mirantis.com>,
 Build-Depends: debhelper (>= 9),
                dh-python,
                openstack-pkg-tools,
                python-all,
-               python-pbr,
-               python-setuptools,
-               python-sphinx,
-Build-Depends-Indep: python-babel,
-                     python-coverage,
-                     python-django,
-                     python-hacking,
-                     python-keystoneclient (>= 1:1.1.0),
-                     python-mock,
-                     python-mox3,
-                     python-oslo.config (>= 1:1.9.3),
+               python-pbr (>= 1.8),
+               python-setuptools (>= 16.0),
+               python-sphinx (>= 1.1.2),
+               python3-all,
+               python3-pbr (>= 1.8),
+               python3-setuptools (>= 16.0),
+Build-Depends-Indep: python-babel (>= 1.3),
+                     python-coverage (>= 3.6),
+                     python-django (>= 1.8),
+                     python-hacking (>= 0.10.2),
+                     python-keystoneclient (>= 1:1.6.0),
+                     python-mock (>= 1.3),
+                     python-mox3 (>= 0.7.0),
+                     python-oslo.config (>= 1:3.7.0),
+                     python-oslo.policy (>= 0.5.0),
                      python-oslosphinx (>= 2.5.0),
                      python-six (>= 1.9.0),
-                     python-testscenarios,
-Standards-Version: 3.9.6
-Vcs-Git: git://anonscm.debian.org/openstack/python-django-openstack-auth.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=openstack/python-django-openstack-auth.git;a=summary
-Homepage: http://pypi.python.org/pypi/django_openstack_auth
+                     python-testscenarios (>= 0.4),
+                     python3-babel (>= 1.3),
+                     python3-django (>= 1.8),
+                     python3-keystoneclient (>= 1:1.6.0),
+                     python3-mock (>= 1.3),
+                     python3-mox3 (>= 0.7.0),
+                     python3-oslo.config (>= 1:3.7.0),
+                     python3-oslo.policy (>= 0.5.0),
+                     python3-six (>= 1.9.0),
+                     python3-testscenarios (>= 0.4),
+Standards-Version: 3.9.7
+Vcs-Git: https://anonscm.debian.org/git/openstack/python-django-openstack-auth.git
+Vcs-Browser: https://anonscm.debian.org/cgit/openstack/python-django-openstack-auth.git/
+Homepage: https://pypi.python.org/pypi/django_openstack_auth
 
-Package: python-openstack-auth
+Package: python-django-openstack-auth
 Architecture: all
-Depends: python-django,
-         python-keystoneclient (>= 1:1.1.0),
-         python-pbr,
-         python-oslo.config (>= 1:1.9.3),
+Depends: python-django (>= 1.8),
+         python-keystoneclient (>= 1:1.6.0),
+         python-oslo.config (>= 1:3.7.0),
+         python-oslo.policy (>= 0.5.0),
+         python-pbr (>= 1.8),
          python-six (>= 1.9.0),
          ${misc:Depends},
          ${python:Depends},
-Description: Django authentication backend for Openstack
+Breaks: python-openstack-auth (<= 2.0.0-2),
+Replaces: python-openstack-auth (<= 2.0.0-2),
+Provides: python-openstack-auth,
+          ${python:Provides},
+Description: Django authentication backend for Openstack - Python 2.7
+ Django authentication backend for use with the OpenStack Keystone Identity
+ backend. This Python module is used by Horizon (the Openstack Dashport web
+ GUI) to auth against Keystone.
+ .
+ This package provides the Python 2.7 module.
+
+Package: python-openstack-auth
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: python-django-openstack-auth,
+         ${misc:Depends},
+Description: Django authentication backend for Openstack - transition package
+ Django authentication backend for use with the OpenStack Keystone Identity
+ backend. This Python module is used by Horizon (the Openstack Dashport web
+ GUI) to auth against Keystone.
+ .
+ This is a transitional package to upgrade to python-django-openstack-auth,
+ and it is safe to remove.
+
+Package: python3-django-openstack-auth
+Architecture: all
+Depends: python3-django (>= 1.8),
+         python3-keystoneclient (>= 1:1.6.0),
+         python3-oslo.config (>= 1:3.7.0),
+         python3-oslo.policy (>= 0.5.0),
+         python3-pbr (>= 1.8),
+         python3-six (>= 1.9.0),
+         ${misc:Depends},
+         ${python3:Depends},
+Provides: ${python3:Provides},
+Description: Django authentication backend for Openstack - Python 3.x
  Django authentication backend for use with the OpenStack Keystone Identity
  backend. This Python module is used by Horizon (the Openstack Dashport web
  GUI) to auth against Keystone.
+ .
+ This package provides the Python 3.x module.
index 1de22932ad6d36ebd2c8f195ae63d2ffbb376ea8..7e9a5125fb19e28d0a52b633be756adfc60d83c5 100644 (file)
@@ -2,35 +2,28 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: python-django-openstack-auth
 Source: https://github.com/openstack/django_openstack_auth.git
 
-Files: debian/*
-Copyright: (c) 2012, Canonical Ltd
-           (c) 2012, Thomas Goirand <zigo@debian.org>
-License: BSD-3-clauses
-
 Files: *
 Copyright: 2012 Gabriel Hurley
-License: BSD-3-clauses
+License: Apache-2.0
 
-License: BSD-3-clauses
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
+Files: debian/*
+Copyright: (c) 2012, Canonical Ltd
+           (c) 2012-2016, Thomas Goirand <zigo@debian.org>
+           (c) 2016, Ivan Udovichenko <iudovichenko@mirantis.com>
+License: Apache-2.0
+
+License: Apache-2.0
+ 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
  .
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-  * 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.
-  * Neither the name of the author nor the names of other contributors may be
-    used to endorse or promote products derived from this software without
-    specific prior written permission.
+ 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.
  .
- 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.
+ 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.
index b719733c88a5eaed0dfa540b87d193c3a80f80a4..c737cbbfb6d7a8df6ccb41a5d9bf6f3397635a49 100644 (file)
@@ -1,6 +1,6 @@
 [DEFAULT]
 upstream-branch = master
-debian-branch = debian/kilo
+debian-branch = debian/mitaka
 upstream-tag = %(version)s
 compression = xz
 
index 906417df738b4433525a2e7ebfc4b4c807005d2b..4630b920250e72c4d1e03cee38b8f2838038863f 100755 (executable)
@@ -9,27 +9,27 @@ include /usr/share/openstack-pkg-tools/pkgos.make
 export OSLO_PACKAGE_VERSION=$(VERSION)
 
 %:
-       dh $@  --with python2
+       dh $@  --with python2,python3
 
 override_dh_auto_install:
-       set -e && for pyvers in $(PYTHONS); do \
+       set -e ; for pyvers in $(PYTHONS); do \
                python$$pyvers setup.py install --install-layout=deb \
-                       --root $(CURDIR)/debian/python-openstack-auth; \
+                       --root $(CURDIR)/debian/python-django-openstack-auth; \
+       done
+       set -e ; for pyvers in $(PYTHON3S); do \
+               python$$pyvers setup.py install --install-layout=deb \
+                       --root $(CURDIR)/debian/python3-django-openstack-auth; \
        done
-#      set -e && for pyvers in $(PYTHON3S); do \
-#              python$$pyvers setup.py install --install-layout=deb \
-#                      --root $(CURDIR)/debian/python3-openstack-auth; \
-#      done
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-       set -e && for pyversion in $(shell pyversions -r); do \
+       set -e ; for pyversion in 2.7 ; do \
                NOSE_WITH_OPENSTACK=1 \
                NOSE_OPENSTACK_COLOR=1 \
                NOSE_OPENSTACK_RED=0.05 \
                NOSE_OPENSTACK_YELLOW=0.025 \
                NOSE_OPENSTACK_SHOW_ELAPSED=1 \
-               PYTHONPATH=. $$pyversion openstack_auth/tests/run_tests.py ; \
+               PYTHONPATH=. python$$pyversion openstack_auth/tests/run_tests.py ; \
        done
 endif