From d133acf41e00a72c15f55008130c5bf99cd33f93 Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Tue, 12 Feb 2019 14:48:32 +0200 Subject: [PATCH] Split server build-deps from the stub. --- debian/changelog | 1 + debian/control.common | 1 + debian/control.server | 1 + debian/control.server-bdeps | 13 +++++++++++++ debian/control.stub | 23 ++++------------------- debian/rules | 1 + 6 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 debian/control.server-bdeps diff --git a/debian/changelog b/debian/changelog index 2b7e8711f..c6be74918 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ freeipa (4.7.2-2) UNRELEASED; urgency=medium * tests: Disabled, they are for the server. + * Split server build-deps from the stub. -- Timo Aaltonen Tue, 05 Feb 2019 23:37:16 +0200 diff --git a/debian/control.common b/debian/control.common index ee2dd44c4..6e5ff9c27 100644 --- a/debian/control.common +++ b/debian/control.common @@ -1,3 +1,4 @@ + Package: freeipa-admintools Architecture: any Depends: ${misc:Depends}, diff --git a/debian/control.server b/debian/control.server index 3c62b5f78..d9397f410 100644 --- a/debian/control.server +++ b/debian/control.server @@ -1,3 +1,4 @@ + Package: freeipa-server Architecture: amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x Breaks: freeipa-server-trust-ad (<< 4.3.0-1) diff --git a/debian/control.server-bdeps b/debian/control.server-bdeps new file mode 100644 index 000000000..cb9b42228 --- /dev/null +++ b/debian/control.server-bdeps @@ -0,0 +1,13 @@ + 389-ds-base-dev (>= 1.3.7.9), + libsss-idmap-dev, + libsss-certmap-dev, + libsss-nss-idmap-dev (>= 1.14.0), + libtevent-dev, + libunistring-dev, + libverto-dev, + nodejs [amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x], + node-uglify [amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x], + pki-base (>= 10.6.0~), + python3-lesscpy, + python3-pkg-resources, + samba-dev, diff --git a/debian/control.stub b/debian/control.stub index 98a4bc1a5..ce4109270 100644 --- a/debian/control.stub +++ b/debian/control.stub @@ -3,8 +3,11 @@ Section: net Priority: optional Maintainer: Debian FreeIPA Team Uploaders: Timo Aaltonen +Standards-Version: 4.1.5 +Vcs-Git: https://salsa.debian.org/freeipa-team/freeipa.git +Vcs-Browser: https://salsa.debian.org/freeipa-team/freeipa +Homepage: http://www.freeipa.org Build-Depends: - 389-ds-base-dev (>= 1.3.7.9), check, debhelper (>= 11), dh-python, @@ -20,17 +23,8 @@ Build-Depends: libpopt-dev, libsasl2-dev, libssl-dev, - libsss-idmap-dev, - libsss-certmap-dev, - libsss-nss-idmap-dev (>= 1.14.0), libtalloc-dev, - libtevent-dev, - libunistring-dev, - libverto-dev, libxmlrpc-core-c3-dev (>= 1.33.06), - nodejs [amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x], - node-uglify [amd64 arm64 armhf i386 mips mips64el mipsel ppc64 ppc64el s390x], - pki-base (>= 10.6.0~), python-all-dev, python-cryptography, python-dbus, @@ -55,14 +49,5 @@ Build-Depends: python-sss (>= 1.14.0), python-usb (>= 1.0.0~b2), python-yubico, - python3-lesscpy, - python3-pkg-resources, - samba-dev, systemd, uuid-dev, - 389-ds-base-dev, -Standards-Version: 4.1.5 -Vcs-Git: https://salsa.debian.org/freeipa-team/freeipa.git -Vcs-Browser: https://salsa.debian.org/freeipa-team/freeipa -Homepage: http://www.freeipa.org - diff --git a/debian/rules b/debian/rules index 15823ec4f..1f3057fe0 100755 --- a/debian/rules +++ b/debian/rules @@ -49,6 +49,7 @@ ifeq ($(ONLY_CLIENT), 1) > debian/control else cat debian/control.stub \ + debian/control.server-bdeps \ debian/control.common \ debian/control.server \ > debian/control