[shapelib] 20/22: Use dh_auto_* tools instead of custom commands.

Bas Couwenberg sebastic at debian.org
Tue Dec 6 20:41:38 UTC 2016


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

sebastic pushed a commit to branch master
in repository shapelib.

commit d92486a6f58c3cb88a092043bc5fe91823660bd2
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 6 21:26:23 2016 +0100

    Use dh_auto_* tools instead of custom commands.
---
 debian/changelog |  1 +
 debian/rules     | 26 --------------------------
 2 files changed, 1 insertion(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11c26c1..2944315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ shapelib (1.4.0~rc1-1) UNRELEASED; urgency=medium
   * Include pkgconfig script in -dev package.
   * Explicitly remove .la files.
   * Drop obsolete build system patches.
+  * Use dh_auto_* tools instead of custom commands.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Dec 2016 19:46:29 +0100
 
diff --git a/debian/rules b/debian/rules
index a76cac5..8041e07 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,8 @@
 # Enable hardening build flags
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 BUILD_DATE := $(shell dpkg-parsechangelog | sed -ne 's/^Date: //p' | LC_ALL=C date -u "+%Y-%m-%d" -f -)
 
-CONTRIB = shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
-
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 %:
@@ -21,28 +17,6 @@ override_dh_auto_build:
 	dh_auto_build
 	ronn -r --date="$(BUILD_DATE)" --manual=shplib debian/man/*.md
 
-#override_dh_auto_test:
-#
-#override_dh_auto_clean:
-#	dh_auto_clean
-#	make -C $(CURDIR)/contrib clean
-#	rm -f contrib/Shape_PointInPoly contrib/shpsort
-#
-#override_dh_auto_install:
-#	mkdir -p debian/tmp/usr/bin/
-#	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-#	mkdir debian/tmp/usr/include/
-#	make bin_install PREFIX=debian/tmp/usr
-#	cp .libs/libshp.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-#	cp .libs/libshp.so.2.0.0 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-#	ln -s libshp.so.2.0.0 libshp.so
-#	ln -s libshp.so.2.0.0 libshp.so.2
-#	mv libshp.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-#	cp shapefil.h debian/tmp/usr/include/
-#	for prg in $(CONTRIB); do \
-#		cp contrib/$$prg debian/tmp/usr/bin/. ; \
-#	done
-
 override_dh_auto_install:
 	dh_auto_install
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/shapelib.git



More information about the Pkg-grass-devel mailing list