[ogdi-dfsg] 08/19: Use minimal dh rules with autoreconf.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Apr 3 00:13:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository ogdi-dfsg.
commit 5b7c9c0b1d1c21c1a551cbad130828c86818a51b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Apr 2 21:39:57 2016 +0200
Use minimal dh rules with autoreconf.
---
debian/changelog | 1 +
debian/control | 1 +
debian/libogdi3.2-dev.install | 8 +--
debian/rules | 126 ++++++++----------------------------------
4 files changed, 30 insertions(+), 106 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8561070..2ce780d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ ogdi-dfsg (3.2.0~beta2-8) UNRELEASED; urgency=medium
* Restructure control file with cme, changes:
- Use canonical Vcs-* URLs over HTTPS
* Bump debhelper compatibility to 9.
+ * Use minimal dh rules with autoreconf.
-- Bas Couwenberg <sebastic at debian.org> Sat, 02 Apr 2016 21:13:49 +0200
diff --git a/debian/control b/debian/control
index f7f8589..0209597 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>
Section: libs
Priority: extra
Build-Depends: debhelper (>= 9),
+ dh-autoreconf,
autotools-dev,
libexpat1-dev,
libproj-dev,
diff --git a/debian/libogdi3.2-dev.install b/debian/libogdi3.2-dev.install
index 9cdd7b2..1e5c04e 100644
--- a/debian/libogdi3.2-dev.install
+++ b/debian/libogdi3.2-dev.install
@@ -1,5 +1,5 @@
usr/lib/lib*.so
-usr/include/ecs.h usr/include/ogdi
-usr/include/ecs_util.h usr/include/ogdi
-usr/bin/ogdi-config
-usr/share/pkgconfig/ogdi.pc
+usr/include/ecs.h usr/include/ogdi
+usr/include/ecs_util.h usr/include/ogdi
+ogdi-config usr/bin/
+ogdi.pc usr/share/pkgconfig/
diff --git a/debian/rules b/debian/rules
index b99da7a..e9f08c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,112 +4,34 @@
# Uncomment this to turn on verbose mode.
#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)
+export TOPDIR=$(CURDIR)
+%:
+ dh $@ --with autoreconf
-CFLAGS = -Wall -g
+override_dh_auto_clean:
+ if [ -e config/common.mak ]; then \
+ dh_auto_clean ; \
+ fi
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
+override_dh_auto_configure:
+ dh_auto_configure -- \
+ --libdir=$(CURDIR)/debian/tmp/usr/lib \
+ --with-expat=yes \
+ --with-expatinc=/usr/include \
+ --with-expatlib=-lexpat \
+ --with-proj=yes \
+ --with-projinc=/usr/include \
+ --with-projlib=-lproj \
+ --with-zlib=yes \
+ --with-zlibinc=/usr/include \
+ --with-zliblib=-lz
-# shared library versions, option 1
-version=3.2.0
-major=3.2
+override_dh_auto_install:
+ dh_auto_install -- prefix=$(CURDIR)/debian/tmp/usr
-#
-# Note that TOPDIR pre-definition is an ogdi specificity.
-# It could be possibly removed in a future version.
-#
-config.status:
- dh_testdir
-
- TOPDIR=$(CURDIR) ./configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info \
- --with-projinc=/usr/include \
- --with-projlib=-lproj \
- --with-proj=yes \
- --with-zliblib=-lz \
- --with-zlibinc=/usr/include \
- --with-zlib=yes \
- --with-expatlib=-lexpat \
- --with-expatinc=/usr/include \
- --with-expat=yes \
- --with-pkgconfigdir=/usr/lib/pkgconfig \
- CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+ $(RM) $(CURDIR)/debian/tmp/usr/lib/ogdi/libskeleton.so
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- # Add here commands to compile the package.
- TOPDIR=$(CURDIR) $(MAKE)
-
- touch $@
+override_dh_install:
+ dh_install --list-missing
-clean:
- dh_testdir
- dh_testroot
-
- # Add here commands to clean up after the build process.
- [ ! -f config/common.mak ] || TOPDIR=$(CURDIR) $(MAKE) clean
-
-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
- rm -f config.status config.log
- rm -rf $(CURDIR)/bin $(CURDIR)/lib
- rm -f ogdi-config ogdi.pc config/common.mak config/Linux.mak
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_prep
- dh_installdirs
-
- # Add here commands to install the package into debian/tmp
- TOPDIR=$(CURDIR) $(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
- install -o root -g root $(CURDIR)/ogdi-config $(CURDIR)/debian/tmp/usr/bin/ogdi-config
- install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pkgconfig
- install -o root -g root -m 644 $(CURDIR)/ogdi.pc $(CURDIR)/debian/tmp/usr/share/pkgconfig
- rm -f $(CURDIR)/debian/tmp/usr/lib/ogdi/libskeleton.so
-
-# Build architecture-independent files here.
-binary-indep:
-# We have nothing to do by default.
-
-# Build architecture-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs ChangeLog
- dh_installdocs
- dh_installexamples
- dh_install --sourcedir=$(CURDIR)/debian/tmp
- dh_installman
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ogdi-dfsg.git
More information about the Pkg-grass-devel
mailing list