control, ipaserver: Move adtrustinstance python files to python- ipaserver, and add samba-common to python-ipaserver depends so that uninstall works.

debian/changelog

@@ -11,6 +11,9 @@ freeipa (4.4.4-1) UNRELEASED; urgency=medium
   * client.dirs: Ship /etc/krb5.conf.d, because not having that breaks
     the installer when krb5.conf tries to include that.
   * copyright, watch: Update source/release location.
+  * control, ipaserver: Move adtrustinstance python files to python-
+    ipaserver, and add samba-common to python-ipaserver depends so that
+    uninstall works.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Fri, 17 Feb 2017 01:40:15 +0200
 

debian/control

@@ -312,8 +312,10 @@ Description: FreeIPA centralized identity framework -- shared Python modules
 Package: python-ipaserver
 Architecture: all
 Section: python
-Breaks: freeipa-server (<< 4.3.0-1)
-Replaces: freeipa-server (<< 4.3.0-1)
+Breaks: freeipa-server (<< 4.3.0-1),
+ freeipa-server-trust-ad (<< 4.4.4-1),
+Replaces: freeipa-server (<< 4.3.0-1),
+ freeipa-server-trust-ad (<< 4.4.4-1),
 Depends:
  freeipa-common (= ${binary:Version}),
  pki-tools (>= 10.2.6-3),
@@ -326,6 +328,7 @@ Depends:
  python-ldap (>= 2.4.22),
  python-libsss-nss-idmap,
  python-pyasn1,
+ samba-common,
  zip,
  ${misc:Depends},
  ${python:Depends},

debian/freeipa-server-trust-ad.install

@@ -1,8 +1,6 @@
 etc/dbus-1/system.d/oddjob-ipa-trust.conf
 etc/oddjobd.conf.d/oddjobd-ipa-trust.conf
 usr/lib/*/samba/pdb/ipasam.so
-usr/lib/python*/dist-packages/ipaserver/dcerpc.py
-usr/lib/python*/dist-packages/ipaserver/install/adtrustinstance*
 usr/lib/ipa/oddjob/com.redhat.idm.trust-fetch-domains
 usr/sbin/ipa-adtrust-install
 usr/share/ipa/smb.conf.empty

debian/python-ipaserver.install

@@ -1,7 +1,9 @@
 usr/lib/python*/dist-packages/ipaserver/__init__*
 usr/lib/python*/dist-packages/ipaserver/advise/*
+usr/lib/python*/dist-packages/ipaserver/dcerpc.py
 usr/lib/python*/dist-packages/ipaserver/dns_data_management*
 usr/lib/python*/dist-packages/ipaserver/install/__init__.py
+usr/lib/python*/dist-packages/ipaserver/install/adtrustinstance.py
 usr/lib/python*/dist-packages/ipaserver/install/bindinstance.py
 usr/lib/python*/dist-packages/ipaserver/install/ca.py
 usr/lib/python*/dist-packages/ipaserver/install/cainstance.py