[pdl] 17/25: Use minimal dh rules.

Bas Couwenberg sebastic at debian.org
Sun Jun 12 21:29:12 UTC 2016


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

sebastic pushed a commit to branch master
in repository pdl.

commit 79002049b8d1ddd352500b831197dc943704e9be
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jun 12 19:05:03 2016 +0200

    Use minimal dh rules.
---
 debian/changelog |   1 +
 debian/rules     | 120 ++++++++++---------------------------------------------
 2 files changed, 23 insertions(+), 98 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 17ae090..e606b8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ pdl (1:2.016-1) UNRELEASED; urgency=medium
   * Align paths in install files.
   * Add upstream metadata.
   * Add libdevel-checklib-perl to build dependencies.
+  * Use minimal dh rules.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 12 Jun 2016 16:00:28 +0200
 
diff --git a/debian/rules b/debian/rules
index 704ead7..2df466e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,90 +1,46 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# PDL debian/rules that uses debhelper.
-# much of it is based on the original debmake-based one.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-unexport DISPLAY
-
-WARNING_FLAGS:=-Wall -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	export DEB_CFLAGS_MAINT_APPEND:=$(WARNING_FLAGS)
-else
-	export DEB_CFLAGS_MAINT_APPEND:=$(WARNING_FLAGS) -ffunction-sections
-endif
+# Enable hardening build flags
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 export DEB_LDFLAGS_MAINT_APPEND:=-Wl,--as-needed
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-subst_pdlapi  = -Vpdlapi:Provides="`perl -Mblib -MPDL::Config::Debian -e 'print \"pdlapi-$$PDL::Config::Debian::pdl_core_version\n\"'`"
+subst_pdlapi = -Vpdlapi:Provides="`perl -Mblib -MPDL::Config::Debian -e 'print \"pdlapi-$$PDL::Config::Debian::pdl_core_version\n\"'`"
 
 vendorarch := $(shell perl -MConfig -e 'print substr($$Config{vendorarch}, 1)')
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package
-	dh_auto_configure -- F77CONF=debian/f77conf.pl PDLCONF=debian/perldl.conf
-
-	touch configure-stamp
+%:
+	dh $@ --parallel
 
+override_dh_clean:
+	dh_clean t/callext.o t/callext.so Graphics/TriD/OpenGL/tmp*.h-out \
+	         Perldl2/pdl2.pod debian/dh_pdl.1
 
+override_dh_auto_configure:
+	dh_auto_configure -- F77CONF=debian/f77conf.pl \
+	                     PDLCONF=debian/perldl.conf
 
-build-arch: build
-build-indep: build
+override_dh_auto_build:
+	LD_RUN_PATH="" dh_auto_build
 
-build: build-stamp
-build-stamp: configure-stamp 
-	dh_testdir
-
-	# Add here commands to compile the package.
-	$(MAKE) LD_RUN_PATH=""
 	mkdir -p blib/lib/PDL/Config
 	perl -Mblib debian/write_config_debian.pl > blib/lib/PDL/Config/Debian.pm
-	pod2man debian/dh_pdl > debian/dh_pdl.1
 
-	touch build-stamp
+	pod2man debian/dh_pdl > debian/dh_pdl.1
 
-test: test-stamp
-test-stamp: build-stamp
-	dh_testdir
+override_dh_auto_test:
 	@echo "BEGIN test verbose"
-	$(MAKE) TEST_VERBOSE=1 LC_ALL=C test
+	TEST_VERBOSE=1 LC_ALL=C dh_auto_test
 	@echo "END test verbose"
-	touch test-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp test-stamp
 
-	dh_clean 
+override_dh_auto_install:
+	dh_auto_install --destdir=$(CURDIR)/debian/pdl
 
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f t/callext.o t/callext.so Graphics/TriD/OpenGL/tmp*.h-out \
-	 	Perldl2/pdl2.pod debian/dh_pdl.1 \
-	 	debian/pdl.lintian-overrides debian/pdl.install \
-	 	debian/pdl.links debian/pdl.postinst \
-	 	debian/pdl.triggers
+	(cd debian/pdl; while read f ; do rm -f "$$f" ; done < ../pdl.remove)
 
-install: build test
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	# Add here commands to install the package into debian/pdl.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/pdl
-	cd debian/pdl; while read f ; do rm -f "$$f" ; done < ../pdl.remove
 	# create placeholder in usr/share/perl5/PDL
 	echo > $(CURDIR)/debian/pdl/usr/share/perl5/PDL/.placeholder
 
@@ -95,41 +51,9 @@ install: build test
 	 	sed -e 's, at vendorarch@,$(vendorarch),g' $$f.in > $$f ; \
 	done
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_install
-	dh_installmenu
-	dh_lintian
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
+override_dh_shlibdeps:
 	dh_shlibdeps -X OpenGLQ.so
+
+override_dh_gencontrol:
 	dh_gencontrol -- $(subst_pdlapi)
-	dh_md5sums
-	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/pdl.git



More information about the Pkg-perl-cvs-commits mailing list