[Pkg-fedora-ds-maintainers] 389-admin: Changes to 'master'

Fri Apr 15 11:27:44 UTC 2016

debian/389-admin.dirsrv-admin.init |    2 +-
 debian/changelog                   |   15 +++++++++++++++
 debian/control                     |    2 ++
 debian/libds-admin-serv0.install   |    1 +
 debian/libds-admin-serv0.links.in  |    1 -
 debian/patches/fix-linking.patch   |   17 ++++++++++++++++-
 debian/rules                       |   16 +++++++---------
 7 files changed, 42 insertions(+), 12 deletions(-)

New commits:
commit f5f3a04f2f57135d0bbf4b301612a63d8b41f8db
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Apr 15 14:23:55 2016 +0300

    releasing package 389-admin version 1.1.42-2

diff --git a/debian/changelog b/debian/changelog
index 00a3471..bb0d498 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-389-admin (1.1.42-2) UNRELEASED; urgency=medium
+389-admin (1.1.42-2) unstable; urgency=medium
 
   * Migrate to systemd
     - 389-admin.dirsrv-admin.service, rules: Add a unit file.
@@ -11,7 +11,7 @@
     - rules: Remove upstream initscript
   * control: Add libcgi-pm-perl to Depends.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Wed, 13 Apr 2016 21:46:35 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Fri, 15 Apr 2016 14:23:50 +0300
 
 389-admin (1.1.42-1) unstable; urgency=medium
 

commit 7ffdf1b744afdc8722db820a039d127eec5a561c
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Fri Apr 15 14:23:47 2016 +0300

    bunch of changes

diff --git a/debian/389-admin.dirsrv-admin.init b/debian/389-admin.dirsrv-admin.init
index 86f4c53..486cf76 100644
--- a/debian/389-admin.dirsrv-admin.init
+++ b/debian/389-admin.dirsrv-admin.init
@@ -4,7 +4,7 @@
 
 ### BEGIN INIT INFO
 # Provides:          dirsrv-admin
-# Required-Start:    $remote_fs dirsrv
+# Required-Start:    $remote_fs
 # Required-Stop:     $remote_fs
 # Should-Start:      $network
 # Should-Stop:       $network
diff --git a/debian/changelog b/debian/changelog
index a57ddad..00a3471 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+389-admin (1.1.42-2) UNRELEASED; urgency=medium
+
+  * Migrate to systemd
+    - 389-admin.dirsrv-admin.service, rules: Add a unit file.
+    - control, rules: Add dh-systemd to build-depends
+  * init: Drop hard dependency on dirsrv. (Closes: #820018)
+  * rules: Enable parallel builds.
+  * rules: Pass --fail-missing to dh_install.
+    - libds-admin-serv0.{install,links.in}, rules: Remove .so, install
+      .so.0 provided by upstream, drop .links.in
+    - rules: Remove upstream initscript
+  * control: Add libcgi-pm-perl to Depends.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Wed, 13 Apr 2016 21:46:35 +0300
+
 389-admin (1.1.42-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5c772b6..72d9d46 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Build-Depends:
  debconf-utils,
  debhelper (>= 9),
  dh-autoreconf,
+ dh-systemd,
  libadminutil-dev,
  libapache2-mod-nss,
  libicu-dev,
@@ -48,6 +49,7 @@ Depends:
  389-ds-base,
  apache2,
  libapache2-mod-nss,
+ libcgi-pm-perl,
  libds-admin-serv0 (= ${binary:Version}),
  libmozilla-ldap-perl,
  libnss3-tools,
diff --git a/debian/libds-admin-serv0.install b/debian/libds-admin-serv0.install
index c1b8cd5..3b3d5df 100644
--- a/debian/libds-admin-serv0.install
+++ b/debian/libds-admin-serv0.install
@@ -1 +1,2 @@
 usr/lib/*/libds-admin-serv.so.0.0.0
+usr/lib/*/libds-admin-serv.so.0
diff --git a/debian/libds-admin-serv0.links.in b/debian/libds-admin-serv0.links.in
deleted file mode 100644
index ba1cc55..0000000
--- a/debian/libds-admin-serv0.links.in
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/@MULTIARCH@/libds-admin-serv.so.0.0.0 usr/lib/@MULTIARCH@/libds-admin-serv.so.0
diff --git a/debian/patches/fix-linking.patch b/debian/patches/fix-linking.patch
index 6767e31..ea62ab3 100644
--- a/debian/patches/fix-linking.patch
+++ b/debian/patches/fix-linking.patch
@@ -5,9 +5,24 @@ Date:   Fri Dec 30 18:09:15 2011 +0200
 
     libds-admin-serv.so didn't link against libldap2 though it used it's symbols
 
+    and drop libs that are not used
+
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -283,6 +283,7 @@ update_SCRIPTS = admserv/makeUpgradeTar.
+@@ -151,10 +151,8 @@ else
+ LDAPSDK_LINK = @ldapsdk_lib@ -lssldap60 -lprldap60 -lldap60 -lldif60
+ ADMINUTIL_LINK = @adminutil_lib@ @nspr_lib@ @nss_lib@ @sasl_lib@ @ldapsdk_lib@ @icu_lib@ -ladmsslutil at adminutil_ver@ -ladminutil at adminutil_ver@
+ endif
+-NSPR_LINK = @nspr_lib@ -lplc4 -lplds4 -lnspr4
+-NSS_LINK = @nss_lib@ -lsmime3 -lssl3 -lnss3 -lsoftokn3
+-SASL_LINK = @sasl_lib@ -lsasl2
+-ICU_LINK = @icu_lib@ -licui18n -licuuc -licudata
++NSPR_LINK = @nspr_lib@ -lplc4 -lnspr4
++NSS_LINK = @nss_lib@ -lsmime3 -lssl3 -lnss3
+ 
+ DEFAULT_LIBS_NOCGI = $(ADMINUTIL_LINK) \
+                      $(ICU_LINK) \
+@@ -283,6 +281,7 @@ update_SCRIPTS = admserv/makeUpgradeTar.
  libds_admin_serv_la_SOURCES = $(libbase_a_SOURCES) $(libsi18n_a_SOURCES) $(libadmin_a_SOURCES)
  libds_admin_serv_la_LINK = $(MYLINK)
  libds_admin_serv_la_LIBADD = $(ADMINUTIL_LINK) \
diff --git a/debian/rules b/debian/rules
index cf1f840..edcdc0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,6 @@ else
 	CPPFLAGS=-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
 endif
 
-LDFLAGS += -L/usr/lib/$(DEB_HOST_MULTIARCH)/nss
-
 # Deterministic "build number". Format is defined in ./buildnum.pl
 BUILD_DATE := $(shell dpkg-parsechangelog --show-field Date)
 BUILDNUM := $(shell date --utc --date="$(BUILD_DATE)" +%Y.%j.%H%M)
@@ -22,7 +20,6 @@ override_dh_auto_configure:
 		--disable-rpath \
 		--with-openldap \
 		--with-httpd=/usr/sbin/apache2 \
-		--with-initddir=/etc/init.d \
 		--with-apxs=/usr/bin/apxs2
 
 override_dh_auto_build:
@@ -34,6 +31,9 @@ override_dh_auto_install:
 override_dh_install:
 	# purge .la files
 	find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \;
+	# and others
+	rm -f $(CURDIR)/debian/tmp/usr/lib/*/*.so
+	rm -f $(CURDIR)/debian/tmp/etc/rc.d/init.d/dirsrv-admin
 
 	# rename the binaries & manpages, don't need wrappers
 	rename 's,.pl$$,,' $(CURDIR)/debian/tmp/usr/sbin/*.pl
@@ -41,12 +41,10 @@ override_dh_install:
 
 	chmod -x $(CURDIR)/debian/tmp/etc/default/* \
 		$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/dirsrv/perl/*
-	dh_install
+	dh_install --fail-missing
 
-override_dh_link:
-	sed -e"s/@MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" \
-		debian/libds-admin-serv0.links.in > debian/libds-admin-serv0.links
-	dh_link
+override_dh_systemd_enable:
+	dh_systemd_enable -p389-admin --no-enable --name=dirsrv-admin dirsrv-admin.service
 
 override_dh_installinit:
 	dh_installinit --name dirsrv-admin -- defaults 15 85
@@ -55,4 +53,4 @@ override_dh_shlibdeps:
 	dh_shlibdeps -l"debian/389-admin/usr/lib/$(DEB_HOST_MULTIARCH)/:debian/389-admin/usr/lib/$(DEB_HOST_MULTIARCH)/dirsrv"
 
 %:
-	dh $@ --with quilt,autoreconf --builddir build/
+	dh $@ --with quilt,autoreconf,systemd --parallel --builddir build/

