[Pkg-fedora-ds-maintainers] [libapache2-mod-nss] 149/156: control, rules: Use dh and dh-autoreconf.

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton-guest pushed a commit to branch master
in repository libapache2-mod-nss.

commit 436f3c33335bf8e08bda22c3528611952ffaa689
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Wed Jul 2 11:44:04 2014 +0300

    control, rules: Use dh and dh-autoreconf.
---
 debian/changelog |  1 +
 debian/control   |  6 +---
 debian/rules     | 95 ++++++--------------------------------------------------
 3 files changed, 11 insertions(+), 91 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e124841..0e33dcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libapache2-mod-nss (1.0.8+git20140226-1) UNRELEASED; urgency=medium
   * control: Use canonical vcs urls.
   * compat: Bump to 9.
   * debian/nss.conf: Removed, use the patched upstream conf instead.
+  * control, rules: Use dh and dh-autoreconf.
 
  -- Timo Aaltonen <tjaalton at ubuntu.com>  Wed, 02 Jul 2014 09:43:00 +0300
 
diff --git a/debian/control b/debian/control
index db32fe4..f37e5be 100644
--- a/debian/control
+++ b/debian/control
@@ -5,14 +5,10 @@ Maintainer: Debian 389ds Team <pkg-fedora-ds-maintainers at lists.alioth.debian.org
 Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends: debhelper (>= 5),
  dh-apache2,
+ dh-autoreconf,
  apache2-dev (>= 2.4),
  libnss3-dev,
  libapr1-dev, 
- quilt,
- autoconf (>= 2.65),
- autotools-dev,
- automake,
- libtool,
  pkg-config,
  flex,
 Standards-Version: 3.9.5
diff --git a/debian/rules b/debian/rules
index 881e03e..d75b284 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,93 +1,16 @@
 #!/usr/bin/make -f
 
-include /usr/share/quilt/quilt.make  
+#export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+override_dh_auto_configure:
+	dh_auto_configure -- \
+		--enable-ecc
 
-UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: *\(.*\)-.*$$/\1/ p' | sed -e 's/~.*//')
-MOD_MAJOR_VERSION := $(word 1, $(subst ., ,$(UPSTREAM_VERSION)))
-MOD_MINOR_VERSION := $(word 2, $(subst ., ,$(UPSTREAM_VERSION)))
-MOD_PATCH_VERSION := $(word 3, $(subst ., ,$(UPSTREAM_VERSION)))
-
-CFLAGS := -Wall -pipe
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2 -fno-strict-aliasing
-endif
-
-CFLAGS += -g
-CONFIGURE_SWITCHES := --prefix=/usr \
-			--exec-prefix=/usr \
-			--sysconfdir=/usr \
-			--mandir=/usr/share/man \
-			--with-apxs=/usr/bin/apxs2 \
-			--enable-ecc
-
-
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
-ifneq "$(wildcard /usr/share/misc/config.sub)" "" 
-	cp -f /usr/share/misc/config.sub config.sub 
-endif 
-ifneq "$(wildcard /usr/share/misc/config.guess)" "" 
-	cp -f /usr/share/misc/config.guess config.guess 
-endif 
-
-	autoreconf -i -f
-	dh_testdir
-	./configure $(CONFIGURE_SWITCHES)
-	touch $@
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean: clean-patched unpatch
-clean-patched:
-	dh_testdir
-	dh_testroot
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f build-stamp configure-stamp install-stamp config.log
-	dh_clean
-
-install: build install-stamp
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-	# FIXME: brrrr
+override_dh_auto_install:
 	mv $(CURDIR)/.libs/libmodnss.so $(CURDIR)/.libs/mod_nss.so
-	touch install-stamp
-
-binary-indep: build install 
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_install
-	dh_apache2
-	dh_link -a
-	dh_strip
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a -L libapache2-mod-nss -l debian/libapache2-mod-nss/usr/lib/apache2/modules
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
 
-binary: binary-arch
+override_dh_install:
+	dh_install --fail-missing
 
-.PHONY: clean install build binary-indep binary-arch binary
+%:
+	dh $@ --with autoreconf,apache2

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-fedora-ds/libapache2-mod-nss.git