[Pkg-freeipa-devel] freeipa: Changes to 'master'

[Benjamin Drung]

 debian/control   |    6 +++---
 debian/copyright |   18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 78453a1c573000eedc41695ff88fd1395b64df9b
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Mon Nov 24 11:44:39 2014 +0100

    Let python-freeipa depend on python-pyasn1.
    
    pyasn1 is imported by ipalib/pkcs10.py and ipalib/plugins/cert.py.

diff --git a/debian/control b/debian/control
index 0f40dec..eb7a6aa 100644
--- a/debian/control
+++ b/debian/control
@@ -202,6 +202,7 @@ Depends:
  python-netaddr,
  python-nss,
  python-openssl,
+ python-pyasn1,
  python-qrcode (>= 5.0.0),
  python-yubico,
  ${misc:Depends},

commit 671a50bc8639dedcdcd304e406ceb1fe0dd81def
Author: Benjamin Drung <benjamin.drung at profitbricks.com>
Date:   Mon Nov 24 11:44:14 2014 +0100

    Run wrap-and-sort -s

diff --git a/debian/control b/debian/control
index ee63f05..0f40dec 100644
--- a/debian/control
+++ b/debian/control
@@ -87,10 +87,10 @@ Depends:
  memcached,
  ntp,
  pki-ca,
+ python-dateutil,
  python-freeipa (= ${binary:Version}),
  python-krbv,
  python-ldap,
- python-dateutil,
  python-pyasn1,
  slapi-nis (>= 0.54),
  ${misc:Depends},
@@ -176,8 +176,7 @@ Description: FreeIPA centralized identity framework -- admintools
 
 Package: freeipa-tests
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends},
- xz-utils,
+Depends: xz-utils, ${misc:Depends}, ${python:Depends}
 Description: FreeIPA centralized identity framework -- tests
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
diff --git a/debian/copyright b/debian/copyright
index b10860a..b89d264 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -174,19 +174,19 @@ License: BSD-3-clause
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 License: MIT
- Permission is hereby granted, free of charge, to any person obtaining a copy of this software 
- and associated documentation files (the "Software"), to deal in the Software without 
- restriction, including without limitation the rights to use, copy, modify, merge, publish, 
- distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the 
+ Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ and associated documentation files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the
  Software is furnished to do so, subject to the following conditions:
  .
- The above copyright notice and this permission notice shall be included in all copies or 
+ The above copyright notice and this permission notice shall be included in all copies or
  substantial portions of the Software.
  .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING 
- BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND 
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
- DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
+ BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 License: AFL-2.1