[Pkg-sssd-devel] sssd: Changes to 'debian-unstable'

Fri Aug 30 13:10:12 UTC 2013

debian/changelog |    5 +++++
 debian/control   |   40 +++-------------------------------------
 debian/rules     |    2 +-
 3 files changed, 9 insertions(+), 38 deletions(-)

New commits:
commit 9dd0dc6c2dc7652b005a918dd0587575a2b59648
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Aug 30 16:10:03 2013 +0300

    false alarm, enable parallel again

diff --git a/debian/changelog b/debian/changelog
index 217486f..6f96364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ sssd (1.11.0-1) UNRELEASED; urgency=low
   * control: Don't hardcode 'multiarch-support'.
   * control: Drop unnecessary multiarch declarations.
   * control: Drop obsolete Breaks/Conflicts.
+  * rules: Enable parallel build.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 06 Aug 2013 17:04:28 +0300
 
diff --git a/debian/rules b/debian/rules
index 9b874ef..823a77d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@ --with quilt,autoreconf,python2,systemd --builddirectory=build
+	dh $@ --with quilt,autoreconf,python2,systemd --parallel --builddirectory=build
 
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk

commit eeb2ab0f7eb525163123997b649e96d944d456e9
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Aug 30 12:16:11 2013 +0300

    control: Drop obsolete Breaks/Conflicts.

diff --git a/debian/changelog b/debian/changelog
index e81b048..217486f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ sssd (1.11.0-1) UNRELEASED; urgency=low
   * control: Drop M-A: foreign from sssd-* and add back to sssd instead.
   * control: Don't hardcode 'multiarch-support'.
   * control: Drop unnecessary multiarch declarations.
+  * control: Drop obsolete Breaks/Conflicts.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 06 Aug 2013 17:04:28 +0300
 
diff --git a/debian/control b/debian/control
index db24649..731a0f1 100644
--- a/debian/control
+++ b/debian/control
@@ -187,8 +187,6 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
  python,
-Breaks: sssd (<< 1.8.0~beta3-1)
-Replaces: sssd (<< 1.8.0~beta3-1)
 Description: System Security Services Daemon -- tools
  Provides a set of daemons to manage access to remote directories and
  authentication mechanisms. It provides an NSS and PAM interface toward
@@ -220,8 +218,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-6),
  libpam-pwquality (>= 1.2.2-1),
 Recommends: sssd
 Multi-Arch: same
-Breaks: sssd (<< 1.8.0~beta3-1)
-Replaces: sssd (<< 1.8.0~beta3-1)
 Description: Pam module for the System Security Services Daemon 
  Provides a set of daemons to manage access to remote directories and
  authentication mechanisms. It provides an NSS and PAM interface toward
@@ -235,8 +231,6 @@ Package: libipa-hbac0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Conflicts: sssd (<< 1.5.15)
-Replaces: sssd (<< 1.5.15)
 Description: FreeIPA HBAC Evaluator library
  Utility library to validate FreeIPA HBAC rules for authorization requests.
 
@@ -244,8 +238,6 @@ Package: libipa-hbac-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libipa-hbac0 (= ${binary:Version})
-Conflicts: sssd (<< 1.5.15)
-Replaces: sssd (<< 1.5.15)
 Description: FreeIPA HBAC Evaluator library
  Utility library to validate FreeIPA HBAC rules for authorization requests.
  .
@@ -300,8 +292,6 @@ Section: python
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
  libipa-hbac0 (= ${binary:Version})
-Conflicts: python-sss (<< 1.5.15)
-Replaces: python-sss (<< 1.5.15)
 Description: Python bindings for the FreeIPA HBAC Evaluator library
  The libipa_hbac-python contains the bindings so that libipa_hbac can be
  used by Python applications.

commit c661f883bb52834fc2cdfee9f529e0ea95923e94
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Aug 30 12:12:31 2013 +0300

    control: Drop unnecessary multiarch declarations.

diff --git a/debian/changelog b/debian/changelog
index fc94449..e81b048 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ sssd (1.11.0-1) UNRELEASED; urgency=low
     file provided by upstream.
   * control: Drop M-A: foreign from sssd-* and add back to sssd instead.
   * control: Don't hardcode 'multiarch-support'.
+  * control: Drop unnecessary multiarch declarations.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 06 Aug 2013 17:04:28 +0300
 
diff --git a/debian/control b/debian/control
index 99bf499..db24649 100644
--- a/debian/control
+++ b/debian/control
@@ -235,10 +235,8 @@ Package: libipa-hbac0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
 Conflicts: sssd (<< 1.5.15)
 Replaces: sssd (<< 1.5.15)
-Multi-Arch: same
 Description: FreeIPA HBAC Evaluator library
  Utility library to validate FreeIPA HBAC rules for authorization requests.
 
@@ -258,8 +256,6 @@ Package: libsss-idmap0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: ID mapping library for SSSD
  Utility library to convert SIDs to Unix uids and gids.
 
@@ -277,8 +273,6 @@ Package: libsss-nss-idmap0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: SID based lookups library for SSSD
  Utility library for SID based lookups.
 
@@ -286,8 +280,6 @@ Package: libsss-nss-idmap-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libsss-nss-idmap0 (= ${binary:Version})
-Pre-Depends: ${misc:Pre-Depends}
-Multi-Arch: same
 Description: SID based lookups library for SSSD -- development files
  Utility library for SID based lookups.
  .
@@ -298,9 +290,7 @@ Package: libsss-sudo
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: ${misc:Pre-Depends}
 Replaces: libsss-sudo-dev (<= 1.9.3)
-Multi-Arch: same
 Description: Communicator library for sudo
  Utility library to allow communication between sudo and SSSD for caching
  sudo rules by SSSD.

commit e96826a674a461d0df061e33ac92d0043f9a4e85
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Aug 30 12:07:21 2013 +0300

    control: Don't hardcode 'multiarch-support'.

diff --git a/debian/changelog b/debian/changelog
index 809483f..fc94449 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ sssd (1.11.0-1) UNRELEASED; urgency=low
   * control, rules, sssd-common.install: Install the systemd service
     file provided by upstream.
   * control: Drop M-A: foreign from sssd-* and add back to sssd instead.
+  * control: Don't hardcode 'multiarch-support'.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 06 Aug 2013 17:04:28 +0300
 
diff --git a/debian/control b/debian/control
index aeee3ff..99bf499 100644
--- a/debian/control
+++ b/debian/control
@@ -202,7 +202,7 @@ Description: System Security Services Daemon -- tools
 Package: libnss-sss
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Recommends: sssd
 Multi-Arch: same
 Description: Nss library for the System Security Services Daemon 
@@ -235,7 +235,7 @@ Package: libipa-hbac0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: sssd (<< 1.5.15)
 Replaces: sssd (<< 1.5.15)
 Multi-Arch: same
@@ -258,7 +258,7 @@ Package: libsss-idmap0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: ID mapping library for SSSD
  Utility library to convert SIDs to Unix uids and gids.
@@ -277,7 +277,7 @@ Package: libsss-nss-idmap0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: SID based lookups library for SSSD
  Utility library for SID based lookups.
@@ -286,7 +286,7 @@ Package: libsss-nss-idmap-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, libsss-nss-idmap0 (= ${binary:Version})
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Multi-Arch: same
 Description: SID based lookups library for SSSD -- development files
  Utility library for SID based lookups.
@@ -298,7 +298,7 @@ Package: libsss-sudo
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
-Pre-Depends: multiarch-support
+Pre-Depends: ${misc:Pre-Depends}
 Replaces: libsss-sudo-dev (<= 1.9.3)
 Multi-Arch: same
 Description: Communicator library for sudo

commit d6dfbc9ee1096b90addf41b7810143b37f389660
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Aug 30 12:00:35 2013 +0300

    control: Drop M-A: foreign from sssd-* and add back to sssd instead.

diff --git a/debian/changelog b/debian/changelog
index f696f84..809483f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ sssd (1.11.0-1) UNRELEASED; urgency=low
   * sssd-common.postrm: Remove /etc/apparmor.d too, if empty.
   * control, rules, sssd-common.install: Install the systemd service
     file provided by upstream.
+  * control: Drop M-A: foreign from sssd-* and add back to sssd instead.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Tue, 06 Aug 2013 17:04:28 +0300
 
diff --git a/debian/control b/debian/control
index 0340479..aeee3ff 100644
--- a/debian/control
+++ b/debian/control
@@ -52,6 +52,8 @@ Homepage: https://fedorahosted.org/sssd/
 Package: sssd
 Section: metapackages
 Architecture: any
+Multi-Arch: foreign
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
  sssd-common (= ${binary:Version}),
  sssd-ad (= ${binary:Version}),
@@ -72,11 +74,9 @@ Description: System Security Services Daemon -- metapackage
 
 Package: sssd-common
 Architecture: any
-Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends},
  python,
  python-sss,
-Pre-Depends: ${misc:Pre-Depends}
 Recommends:
  bind9-host,
  libnss-sss,
@@ -99,8 +99,6 @@ Description: System Security Services Daemon -- common files
 
 Package: sssd-ad
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
  sssd-ad-common (= ${binary:Version}),
@@ -114,8 +112,6 @@ Description: System Security Services Daemon -- Active Directory back end
 
 Package: sssd-ad-common
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
 Breaks: sssd (<< 1.10.0~beta2-1),
@@ -126,8 +122,6 @@ Description: System Security Services Daemon -- PAC responder
 
 Package: sssd-ipa
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
  sssd-ad-common (= ${binary:Version}),
@@ -142,8 +136,6 @@ Description: System Security Services Daemon -- IPA back end
 
 Package: sssd-krb5
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
  sssd-krb5-common (= ${binary:Version}),
@@ -155,8 +147,6 @@ Description: System Security Services Daemon -- Kerberos back end
 
 Package: sssd-krb5-common
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
 Recommends:
@@ -169,8 +159,6 @@ Description: System Security Services Daemon -- Kerberos helpers
 
 Package: sssd-ldap
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
  sssd-krb5-common (= ${binary:Version}),
@@ -186,8 +174,6 @@ Description: System Security Services Daemon -- LDAP back end
 
 Package: sssd-proxy
 Architecture: any
-Multi-Arch: foreign
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends},
  sssd-common (= ${binary:Version}),
 Breaks: sssd (<< 1.10.0~beta2-1),

