wrap-and-sort -s

debian/control

@@ -3,29 +3,43 @@ Section: net
 Priority: extra
 Maintainer: Debian FreeIPA Team <pkg-freeipa-devel@lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton@ubuntu.com>
-Build-Depends: quilt, debhelper (>= 9), dh-autoreconf,
+Build-Depends:
-# client
+ 389-ds-base-dev (>= 1.1.3),
+ check,
+ debhelper (>= 9),
+ dh-autoreconf,
  gettext,
  krb5-user,
+ libcmocka-dev,
  libcurl4-nss-dev,
+ libkrad-dev,
  libkrb5-dev (>= 1.12),
  libldap2-dev,
- libnss3-dev,
  libnspr4-dev,
+ libnss3-dev,
  libpopt-dev,
+ librhino-java,
  libsasl2-dev,
  libssl-dev,
+ libsss-idmap-dev,
+ libsss-nss-idmap-dev,
+ libsvrcore-dev,
  libtalloc-dev,
+ libtevent-dev,
+ libunistring-dev,
+ libverto-dev,
  libxmlrpc-core-c3-dev,
  python-all-dev,
  python-dnspython,
  python-kerberos,
  python-krbv,
- python-lesscpy,
  python-ldap,
+ python-lesscpy,
  python-libipa-hbac,
+ python-lxml,
  python-memcache,
  python-netaddr,
+ python-nose,
  python-nss,
  python-openssl,
  python-polib,
@@ -35,25 +49,11 @@ Build-Depends: quilt, debhelper (>= 9), dh-autoreconf,
  python-sss (>= 1.8.0),
  python-support,
  python-yubico,
-# server
+ quilt,
- 389-ds-base-dev (>= 1.1.3),
- libkrad-dev,
- librhino-java,
- libsss-idmap-dev,
- libsss-nss-idmap-dev,
- libsvrcore-dev,
- libtevent-dev,
- libunistring-dev,
- libverto-dev,
  rhino,
  samba-dev,
  selinux-policy-dev,
- uuid-dev,
+ uuid-dev
-# tests
- check,
- libcmocka-dev,
- python-lxml,
- python-nose,
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-freeipa/freeipa.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-freeipa/freeipa.git
@@ -61,31 +61,34 @@ Homepage: http://www.freeipa.org
 
 Package: freeipa-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends:
- freeipa-client (= ${binary:Version}),
- freeipa-admintools (= ${binary:Version}),
- python-freeipa (= ${binary:Version}),
  389-ds-base,
  acl,
  apache2,
- dogtag-pki-common-theme,
  dogtag-pki-ca-theme,
+ dogtag-pki-common-theme,
+ freeipa-admintools (= ${binary:Version}),
+ freeipa-client (= ${binary:Version}),
  krb5-kdc,
  krb5-kdc-ldap,
  krb5-pkinit,
  ldap-utils,
- libnss3-tools,
- libsasl2-modules-gssapi-mit,
- libapache2-mod-wsgi,
  libapache2-mod-auth-kerb,
  libapache2-mod-nss,
+ libapache2-mod-wsgi,
+ libnss3-tools,
+ libsasl2-modules-gssapi-mit,
  ntp,
  pki-ca,
  pki-setup,
  pki-silent,
- python-ldap,
+ python-freeipa (= ${binary:Version}),
  python-krbv,
+ python-ldap,
  python-pyasn1,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Description: FreeIPA centralized identity framework -- server
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
@@ -96,13 +99,15 @@ Description: FreeIPA centralized identity framework -- server
 
 Package: freeipa-server-trust-ad
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends},
+Depends:
  freeipa-server (= ${binary:Version}),
  python-libsss-nss-idmap,
  python-m2crypto,
  python-samba,
  samba,
  winbind,
+ ${misc:Depends},
+ ${python:Depends}
 Description: FreeIPA centralized identity framework -- AD trust installer
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
@@ -115,8 +120,7 @@ Description: FreeIPA centralized identity framework -- AD trust installer
 
 Package: freeipa-client
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends:
- python-freeipa (= ${binary:Version}),
  bind9utils,
  certmonger,
  krb5-user,
@@ -126,27 +130,33 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libxmlrpc-core-c3 (>= 1.16.33-3.1ubuntu5),
  ntp,
  python-dnspython,
- python-ldap,
+ python-freeipa (= ${binary:Version}),
  python-krbv,
+ python-ldap,
  sssd (>= 1.9.2),
  wget,
-Suggests:
+ ${misc:Depends},
- libpam-krb5,
+ ${python:Depends},
+ ${shlibs:Depends}
+Suggests: libpam-krb5
 Description: FreeIPA centralized identity framework -- client
- FreeIPA is an integrated solution to provide centrally managed Identity 
+ FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
  (configuration settings, access control information) and Audit (events,
- logs, analysis thereof). 
+ logs, analysis thereof).
  .
  This is the client package.
 
 Package: freeipa-admintools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends:
  freeipa-client (= ${binary:Version}),
  python-freeipa (= ${binary:Version}),
  python-krbv,
  python-ldap,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Description: FreeIPA centralized identity framework -- admintools
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
@@ -157,9 +167,7 @@ Description: FreeIPA centralized identity framework -- admintools
 
 Package: freeipa-tests
 Architecture: any
-Depends: ${misc:Depends}, ${python:Depends},
+Depends: tar, xz, ${misc:Depends}, ${python:Depends}
- tar,
- xz,
 Description: FreeIPA centralized identity framework -- tests
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
@@ -171,7 +179,7 @@ Description: FreeIPA centralized identity framework -- tests
 Package: python-freeipa
 Architecture: any
 Section: python
-Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends},
+Depends:
  gnupg,
  iproute,
  keyutils,
@@ -183,10 +191,13 @@ Depends: ${shlibs:Depends}, ${python:Depends}, ${misc:Depends},
  python-netaddr,
  python-nss,
  python-openssl,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
 Description: FreeIPA centralized identity framework -- python modules
- FreeIPA is an integrated solution to provide centrally managed Identity 
+ FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
  (configuration settings, access control information) and Audit (events,
- logs, analysis thereof). 
+ logs, analysis thereof).
  .
  This Python module is used by other FreeIPA packages.

debian/copyright

@@ -47,5 +47,5 @@ Copyright: Michele Baldessari michele@pupazzo.org>
 License: GPL-3+
 
 License: GPL-3+
- On Debian machines the full text of the GNU General Public License 
+ On Debian machines the full text of the GNU General Public License
  can be found in the file /usr/share/common-licenses/GPL-3.

debian/freeipa-client.install

@@ -1,12 +1,12 @@
+usr/lib/python*/dist-packages/ipaclient/*.py
 usr/sbin/ipa-client-automount
 usr/sbin/ipa-client-install
 usr/sbin/ipa-getkeytab
-usr/sbin/ipa-rmkeytab
 usr/sbin/ipa-join
-usr/lib/python*/dist-packages/ipaclient/*.py
+usr/sbin/ipa-rmkeytab
 usr/share/man/man1/ipa-client-automount.1.gz
 usr/share/man/man1/ipa-client-install.1.gz
 usr/share/man/man1/ipa-getkeytab.1.gz
-usr/share/man/man1/ipa-rmkeytab.1.gz
 usr/share/man/man1/ipa-join.1.gz
+usr/share/man/man1/ipa-rmkeytab.1.gz
 usr/share/man/man5/default.conf.5.gz

debian/freeipa-server-trust-ad.install

@@ -1,9 +1,9 @@
-usr/sbin/ipa-adtrust-install
 usr/lib/*/dirsrv/plugins/libipa_extdom_extop.so
 usr/lib/*/dirsrv/plugins/libipa_sidgen.so
 usr/lib/*/dirsrv/plugins/libipa_sidgen_task.so
 usr/lib/*/samba/pdb/ipasam.so
 usr/lib/python*/dist-packages/ipaserver/dcerpc.py
 usr/lib/python*/dist-packages/ipaserver/install/adtrustinstance*
+usr/sbin/ipa-adtrust-install
 usr/share/ipa/smb.conf.empty
 usr/share/man/man1/ipa-adtrust-install.1*

debian/freeipa-server.install

@@ -1,6 +1,6 @@
 etc/ipa/html/*
-lib/systemd/system/ipa-otpd@.service
 lib/systemd/system/ipa-otpd.socket
+lib/systemd/system/ipa-otpd@.service
 usr/lib/*/dirsrv/plugins/libipa_cldap.so
 usr/lib/*/dirsrv/plugins/libipa_dns.so
 usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so
@@ -11,8 +11,8 @@ usr/lib/*/dirsrv/plugins/libipa_range_check.so
 usr/lib/*/dirsrv/plugins/libipa_repl_version.so
 usr/lib/*/dirsrv/plugins/libipa_uuid.so
 usr/lib/*/dirsrv/plugins/libipa_winsync.so
-usr/lib/*/ipa/certmonger/*
 usr/lib/*/ipa-otpd
+usr/lib/*/ipa/certmonger/*
 usr/lib/*/krb5/plugins/kdb/*.so
 usr/lib/python*/dist-packages/ipaserver/*
 usr/sbin/ipa-advise
@@ -33,17 +33,17 @@ usr/sbin/ipa-server-certinstall
 usr/sbin/ipa-server-install
 usr/sbin/ipa-upgradeconfig
 usr/sbin/ipactl
+usr/share/ipa/*.ldif
+usr/share/ipa/*.template
+usr/share/ipa/*.uldif
 usr/share/ipa/advise/legacy/*.template
 usr/share/ipa/copy-schema-to-ca.py
 usr/share/ipa/ffextension/*
-usr/share/ipa/ipa.conf
 usr/share/ipa/ipa-pki-proxy.conf
 usr/share/ipa/ipa-rewrite.conf
-usr/share/ipa/*.ldif
+usr/share/ipa/ipa.conf
 usr/share/ipa/migration/*
-usr/share/ipa/*.template
 usr/share/ipa/ui/*
-usr/share/ipa/*.uldif
 usr/share/ipa/updates/*
 usr/share/ipa/wsgi.py
 usr/share/ipa/wsgi/*
@@ -63,6 +63,6 @@ usr/share/man/man1/ipa-replica-prepare.1*
 usr/share/man/man1/ipa-restore.1*
 usr/share/man/man1/ipa-server-certinstall.1*
 usr/share/man/man1/ipa-server-install.1*
-usr/share/man/man8/ipactl.8*
 usr/share/man/man8/ipa-upgradeconfig.8*
+usr/share/man/man8/ipactl.8*
 var/lib/ipa/sysrestore

debian/python-freeipa.install

@@ -1,8 +1,8 @@
-usr/lib/python*/dist-packages/ipalib/*
-usr/lib/python*/dist-packages/ipaplatform/*
-usr/lib/python*/dist-packages/ipapython/*.py
 usr/lib/python*/dist-packages/default_encoding_utf8.so
 usr/lib/python*/dist-packages/freeipa-*.egg-info
+usr/lib/python*/dist-packages/ipalib/*
+usr/lib/python*/dist-packages/ipaplatform/*
 usr/lib/python*/dist-packages/ipapython-*.egg-info
+usr/lib/python*/dist-packages/ipapython/*.py
 usr/lib/python*/dist-packages/python_default_encoding-*.egg-info
 usr/share/locale