control: Split python stuff from server, client, tests to python- ipa{server,client,tests}

rename python-freeipa to match and move translations to freeipa-common. Mark them Arch:all where possible, and add Breaks/Replaces.

debian/changelog

@@ -18,6 +18,10 @@ freeipa (4.3.0-1) UNRELEASED; urgency=medium
   * control: Drop python-m2crypto from deps, obsolete.
   * control: Bump sssd deps to 1.13.1.
   * control: Add python-six to build-deps and python-freeipa deps.
+  * control: Split python stuff from server, client, tests to python-
+    ipa{server,client,tests}, rename python-freeipa to match and move
+    translations to freeipa-common. Mark them Arch:all where possible,
+    and add Breaks/Replaces.
 
  -- Timo Aaltonen <tjaalton@debian.org>  Sat, 03 Oct 2015 08:56:31 +0300
 

debian/control

@@ -77,6 +77,7 @@ Depends:
  fonts-font-awesome,
  freeipa-admintools (= ${binary:Version}),
  freeipa-client (= ${binary:Version}),
+ freeipa-common (= ${binary:Version}),
  krb5-admin-server,
  krb5-kdc,
  krb5-kdc-ldap,
@@ -95,10 +96,9 @@ Depends:
  pki-ca (>= 10.2.6),
  pki-kra (>= 10.2.6),
  python-dateutil,
- python-freeipa (= ${binary:Version}),
+ python-ipaserver (= ${binary:Version}),
  python-gssapi,
  python-ldap (>= 2.4.15),
- python-pyasn1,
  slapi-nis (>= 0.54.2),
  softhsm2,
  systemd-sysv,
@@ -116,7 +116,9 @@ Description: FreeIPA centralized identity framework -- server
 Package: freeipa-server-trust-ad
 Architecture: any
 Depends:
+ freeipa-common (= ${binary:Version}),
  freeipa-server (= ${binary:Version}),
+ python-ipaserver (= ${binary:Version}),
  python-libsss-nss-idmap,
  python-samba,
  samba,
@@ -134,6 +136,20 @@ Description: FreeIPA centralized identity framework -- AD trust installer
  installation. This package is provided for convenience to install all required
  dependencies at once.
 
+Package: freeipa-common
+Architecture: all
+Breaks: python-freeipa
+Replaces: python-freeipa
+Depends:
+ ${misc:Depends},
+Description: FreeIPA centralized identity framework -- common files
+ 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 includes common files.
+
 Package: freeipa-client
 Architecture: any
 Depends:
@@ -141,6 +157,7 @@ Depends:
  certmonger (>= 0.76.8),
  curl,
  dnsutils,
+ freeipa-common (= ${binary:Version}),
  krb5-user,
  libcurl3 (>= 7.22.0),
  libnss3-tools,
@@ -148,7 +165,7 @@ Depends:
  libxmlrpc-core-c3 (>= 1.16.33-3.1ubuntu5),
  ntp,
  python-dnspython,
- python-freeipa (= ${binary:Version}),
+ python-ipaclient (= ${binary:Version}),
  python-gssapi,
  python-ldap,
  sssd (>= 1.13.1),
@@ -165,15 +182,14 @@ Description: FreeIPA centralized identity framework -- client
  This is the client package.
 
 Package: freeipa-admintools
-Architecture: any
+Architecture: all
 Depends:
  freeipa-client (= ${binary:Version}),
- python-freeipa (= ${binary:Version}),
+ python-ipalib (= ${binary:Version}),
  python-gssapi,
  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
@@ -183,17 +199,11 @@ Description: FreeIPA centralized identity framework -- admintools
  This package contains some tools for administrators.
 
 Package: freeipa-tests
-Architecture: any
+Architecture: all
 Depends:
  freeipa-client (= ${binary:Version}),
- libnss3-tools,
- python-coverage,
- python-freeipa (= ${binary:Version}),
- python-nose,
- python-paramiko,
- python-paste,
- python-polib,
- xz-utils,
+ python-ipalib (= ${binary:Version}),
+ python-ipatests (= ${binary:Version}),
  ${misc:Depends},
  ${python:Depends}
 Recommends: python-yaml
@@ -205,10 +215,32 @@ Description: FreeIPA centralized identity framework -- tests
  .
  This package contains tests that verify IPA functionality.
 
-Package: python-freeipa
+Package: python-ipaclient
+Architecture: all
+Section: python
+Breaks: freeipa-client (<< 4.3.0-1)
+Replaces: freeipa-client (<< 4.3.0-1)
+Depends:
+ freeipa-common (= ${binary:Version}),
+ python-dnspython,
+ python-ipalib (= ${binary:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+Description: FreeIPA centralized identity framework -- Python modules for ipaclient
+ 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 Python module is used by FreeIPA client.
+
+Package: python-ipalib
 Architecture: any
 Section: python
+Breaks: python-freeipa
+Replaces: python-freeipa
 Depends:
+ freeipa-common (= ${binary:Version}),
  gnupg2,
  gnupg-agent,
  iproute,
@@ -230,11 +262,59 @@ Depends:
  python-yubico,
  ${misc:Depends},
  ${python:Depends},
- ${shlibs:Depends}
-Description: FreeIPA centralized identity framework -- Python modules
+ ${shlib:Depends},
+Description: FreeIPA centralized identity framework -- shared Python modules
  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 Python module is used by other FreeIPA packages.
+
+Package: python-ipaserver
+Architecture: all
+Section: python
+Breaks: freeipa-server (<< 4.3.0-1), freeipa-server-trust-ad (<< 4.3.0-1)
+Replaces: freeipa-server (<< 4.3.0-1), freeipa-server-trust-ad (<< 4.3.0-1)
+Depends:
+ freeipa-common (= ${binary:Version}),
+ python-dbus,
+ python-dnspython,
+ python-gssapi,
+ python-ipaclient (= ${binary:Version}),
+ python-ipalib (= ${binary:Version}),
+ python-ldap,
+ python-pyasn1,
+ ${misc:Depends},
+ ${python:Depends},
+Description: FreeIPA centralized identity framework -- Python modules for server
+ 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 Python module is used by FreeIPA server.
+
+Package: python-ipatests
+Architecture: all
+Breaks: freeipa-tests (<< 4.3.0-1)
+Replaces: freeipa-tests (<< 4.3.0-1)
+Depends:
+ libnss3-tools,
+ python-coverage,
+ python-ipalib (= ${binary:Version}),
+ python-nose,
+ python-paramiko,
+ python-paste,
+ python-polib,
+ xz-utils,
+ ${misc:Depends},
+ ${python:Depends}
+Recommends: python-yaml
+Description: FreeIPA centralized identity framework -- Python modules for 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 Python module is used by FreeIPA tests.

debian/freeipa-client.install

@@ -1,4 +1,3 @@
-usr/lib/python*/dist-packages/ipaclient/*.py
 usr/sbin/ipa-certupdate
 usr/sbin/ipa-client-automount
 usr/sbin/ipa-client-install

debian/freeipa-common.install

@@ -0,0 +1 @@
+usr/share/locale

debian/freeipa-server-trust-ad.install

@@ -5,8 +5,6 @@ usr/lib/*/dirsrv/plugins/libipa_sidgen.so
 usr/lib/*/dirsrv/plugins/libipa_sidgen_task.so
 usr/lib/*/ipa/com.redhat.idm.trust-fetch-domains
 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

@@ -20,38 +20,6 @@ usr/lib/*/ipa-otpd
 usr/lib/*/ipa/ipa-httpd-kdcproxy
 usr/lib/*/ipa/certmonger/*
 usr/lib/*/krb5/plugins/kdb/*.so
-usr/lib/python*/dist-packages/ipaserver/__init__*
-usr/lib/python*/dist-packages/ipaserver/advise/*
-usr/lib/python*/dist-packages/ipaserver/install/__init__.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
-usr/lib/python*/dist-packages/ipaserver/install/certs.py
-usr/lib/python*/dist-packages/ipaserver/install/dns.py
-usr/lib/python*/dist-packages/ipaserver/install/dnskeysyncinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/dogtaginstance.py
-usr/lib/python*/dist-packages/ipaserver/install/dsinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/httpinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/installutils.py
-usr/lib/python*/dist-packages/ipaserver/install/ipa_*.py
-usr/lib/python*/dist-packages/ipaserver/install/kra.py
-usr/lib/python*/dist-packages/ipaserver/install/krainstance.py
-usr/lib/python*/dist-packages/ipaserver/install/krbinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/ldapupdate.py
-usr/lib/python*/dist-packages/ipaserver/install/memcacheinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/ntpinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/odsexporterinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/opendnssecinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/otpdinstance.py
-usr/lib/python*/dist-packages/ipaserver/install/plugins
-usr/lib/python*/dist-packages/ipaserver/install/replication.py
-usr/lib/python*/dist-packages/ipaserver/install/schemaupdate.py
-usr/lib/python*/dist-packages/ipaserver/install/server/*
-usr/lib/python*/dist-packages/ipaserver/install/service.py
-usr/lib/python*/dist-packages/ipaserver/install/sysupgrade.py
-usr/lib/python*/dist-packages/ipaserver/install/upgradeinstance.py
-usr/lib/python*/dist-packages/ipaserver/plugins/*
-usr/lib/python*/dist-packages/ipaserver/rpcserver*
 usr/sbin/ipa-advise
 usr/sbin/ipa-backup
 usr/sbin/ipa-ca-install

debian/freeipa-tests.install

@@ -1,8 +1,6 @@
 usr/bin/ipa-run-tests
 usr/bin/ipa-test-config
 usr/bin/ipa-test-task
-usr/lib/python*/dist-packages/ipatests-*
-usr/lib/python*/dist-packages/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/python-ipaclient.install

@@ -0,0 +1 @@
+usr/lib/python*/dist-packages/ipaclient/*.py

debian/python-ipalib.install

@@ -10,4 +10,3 @@ usr/lib/python*/dist-packages/ipapython-*.egg-info
 usr/lib/python*/dist-packages/ipapython/*.py
 usr/lib/python*/dist-packages/ipapython/install/*.py
 usr/lib/python*/dist-packages/python_default_encoding-*.egg-info
-usr/share/locale

debian/python-ipaserver.install

@@ -0,0 +1 @@
+usr/lib/python*/dist-packages/ipaserver/

debian/python-ipatests.install

@@ -0,0 +1,2 @@
+usr/lib/python*/dist-packages/ipatests-*
+usr/lib/python*/dist-packages/ipatests/*