add freeipa-server-trust-ad and freeipa-tests packages, modify -server & -admintools installs, drop tomcat6 from depends

debian/control

@@ -80,7 +80,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  python-ldap,
  python-krbv,
  python-pyasn1,
- tomcat6,
 Description: FreeIPA centralized identity framework -- server
  FreeIPA is an integrated solution to provide centrally managed Identity
  (machine, user, virtual machines, groups, authentication credentials), Policy
@@ -89,6 +88,25 @@ Description: FreeIPA centralized identity framework -- server
  .
  This is the server package.
 
+Package: freeipa-server-trust-ad
+Architecture: any
+Depends: ${misc:Depends}, ${python:Depends},
+ freeipa-server (= ${binary:Version}),
+ python-libsss-nss-idmap,
+ python-m2crypto,
+ python-samba,
+ samba,
+ winbind,
+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
+ (configuration settings, access control information) and Audit (events,
+ logs, analysis thereof).
+ .
+ Cross-realm trusts with Active Directory in IPA require working Samba 4
+ installation. This package is provided for convenience to install all required
+ dependencies at once.
+
 Package: freeipa-client
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
@@ -132,6 +150,19 @@ Description: FreeIPA centralized identity framework -- admintools
  .
  This package contains some tools for administrators.
 
+Package: freeipa-tests
+Architecture: any
+Depends: ${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
+ (configuration settings, access control information) and Audit (events,
+ logs, analysis thereof).
+ .
+ This package contains tests that verify IPA functionality.
+
 Package: python-freeipa
 Architecture: any
 Section: python

debian/freeipa-admintools.install

@@ -1,2 +1,3 @@
+etc/bash_completion.d/ipa
 usr/bin/ipa
 usr/share/man/man1/ipa.1

debian/freeipa-server-trust-ad.install

@@ -0,0 +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
+usr/lib/python*/dist-packages/ipaserver/install/adtrustinstance*
+usr/share/ipa/smb.conf.empty
+usr/share/man/man1/ipa-adtrust-install.1

debian/freeipa-server.install

@@ -1,49 +1,70 @@
+etc/ipa/html/*
+lib/systemd/system/ipa-otpd@.service
+lib/systemd/system/ipa-otpd.socket
+usr/lib/*/dirsrv/plugins/libipa_cldap.so
+usr/lib/*/dirsrv/plugins/libipa_dns.so
+usr/lib/*/dirsrv/plugins/libipa_enrollment_extop.so
+usr/lib/*/dirsrv/plugins/libipa_lockout.so
+usr/lib/*/dirsrv/plugins/libipa_modrdn.so
+usr/lib/*/dirsrv/plugins/libipa_pwd_extop.so
+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/*/krb5/plugins/kdb/*.so
+usr/lib/python*/dist-packages/ipaserver/*
+
+usr/sbin/ipa-advise
+usr/sbin/ipa-backup
 usr/sbin/ipa-ca-install
+usr/sbin/ipa-compat-manage
+usr/sbin/ipa-csreplica-manage
 usr/sbin/ipa-dns-install
-usr/sbin/ipa-server-install
+usr/sbin/ipa-ldap-updater
+usr/sbin/ipa-managed-entries
+usr/sbin/ipa-nis-manage
 usr/sbin/ipa-replica-conncheck
 usr/sbin/ipa-replica-install
-usr/sbin/ipa-replica-prepare
 usr/sbin/ipa-replica-manage
-usr/sbin/ipa-csreplica-manage
+usr/sbin/ipa-replica-prepare
+usr/sbin/ipa-restore
 usr/sbin/ipa-server-certinstall
-usr/sbin/ipa-ldap-updater
-usr/sbin/ipa-compat-manage
-usr/sbin/ipa-nis-manage
-usr/sbin/ipa-managed-entries
-usr/sbin/ipactl
+usr/sbin/ipa-server-install
 usr/sbin/ipa-upgradeconfig
-usr/sbin/ipa-compliance
-usr/lib/python*/dist-packages/ipaserver/*
-usr/share/ipa/wsgi.py
-usr/share/ipa/*.ldif
-usr/share/ipa/*.uldif
-usr/share/ipa/*.template
-etc/ipa/html/*
-usr/share/ipa/migration/*
-usr/share/ipa/ui/*
+usr/sbin/ipactl
+usr/share/ipa/advise/legacy/*.template
+usr/share/ipa/copy-schema-to-ca.py
+usr/share/ipa/ca_renewal
+usr/share/ipa/ffextension/*
 usr/share/ipa/ipa.conf
-usr/share/ipa/ipa-rewrite.conf
 usr/share/ipa/ipa-pki-proxy.conf
+usr/share/ipa/ipa-rewrite.conf
+usr/share/ipa/*.ldif
+usr/share/ipa/migration/*
+usr/share/ipa/*.template
+usr/share/ipa/ui/*
+usr/share/ipa/*.uldif
 usr/share/ipa/updates/*
-usr/lib/*/dirsrv/plugins/*.so
-usr/lib/*/ipa/certmonger/*
-usr/lib/*/krb5/plugins/kdb/*.so
-var/lib/ipa/sysrestore
-var/cache/ipa/sessions
+usr/share/ipa/wsgi.py
+usr/share/ipa/wsgi/*
+usr/share/man/man1/ipa-advise.1
+usr/share/man/man1/ipa-backup.1.gz
+usr/share/man/man1/ipa-ca-install.1.gz
+usr/share/man/man1/ipa-compat-manage.1.gz
+usr/share/man/man1/ipa-csreplica-manage.1.gz
+usr/share/man/man1/ipa-dns-install.1.gz
+usr/share/man/man1/ipa-ldap-updater.1.gz
+usr/share/man/man1/ipa-managed-entries.1.gz
+usr/share/man/man1/ipa-nis-manage.1.gz
 usr/share/man/man1/ipa-replica-conncheck.1.gz
 usr/share/man/man1/ipa-replica-install.1.gz
 usr/share/man/man1/ipa-replica-manage.1.gz
-usr/share/man/man1/ipa-csreplica-manage.1.gz
 usr/share/man/man1/ipa-replica-prepare.1.gz
+usr/share/man/man1/ipa-restore.1.gz
 usr/share/man/man1/ipa-server-certinstall.1.gz
 usr/share/man/man1/ipa-server-install.1.gz
-usr/share/man/man1/ipa-dns-install.1.gz
-usr/share/man/man1/ipa-ca-install.1.gz
-usr/share/man/man1/ipa-compat-manage.1.gz
-usr/share/man/man1/ipa-nis-manage.1.gz
-usr/share/man/man1/ipa-managed-entries.1.gz
-usr/share/man/man1/ipa-ldap-updater.1.gz
 usr/share/man/man8/ipactl.8.gz
 usr/share/man/man8/ipa-upgradeconfig.8.gz
-usr/share/man/man1/ipa-compliance.1.gz
+var/lib/ipa/sysrestore

debian/freeipa-tests.install

@@ -0,0 +1,7 @@
+usr/bin/ipa-run-tests
+usr/bin/ipa-test-config
+usr/bin/ipa-test-task
+usr/lib/python*/ipatests/*
+usr/share/man/man1/ipa-run-tests.1
+usr/share/man/man1/ipa-test-config.1
+usr/share/man/man1/ipa-test-task.1

debian/rules

@@ -54,6 +54,8 @@ ifneq ($(ONLY_CLIENT), 1)
 #	cd selinux
 #	make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no install DESTDIR=$(DESTDIR)
 	cd ..
+
+	install -m 0644 contrib/completion/ipa.bash_completion $(DESTDIR)/etc/bash_completion.d/ipa
 else
 	make $(PLATFORM) IPA_VERSION_IS_GIT_SNAPSHOT=no client-install DESTDIR=$(DESTDIR)
 endif
@@ -67,7 +69,7 @@ endif
 	# fix permissions
 	find $(CURDIR)/debian/tmp -name "*.mo" -type f -exec chmod -x "{}" \;
 
-	dh_install --fail-missing
+	dh_install --list-missing
 
 %:
 	dh $@ --with quilt,autoreconf,python2