This is an automated email from the git hooks/post-receive script.
mattia pushed a commit to branch master
in repository hyphen.
commit 1d77f4a6b6c81da9e4e25a9d1a310c1ad2065704
Author: Mattia Rizzolo <mat...@debian.org>
Date: Thu Apr 21 16:48:00 2016 +0000
debian/rules: rewrite using the dh sequencer. Closes: #821991
---
debian/control | 2 +-
debian/{docs => libhyphen-dev.docs} | 1 +
debian/{docs => libhyphen0.docs} | 0
debian/rules | 108 ++++++------------------------------
4 files changed, 19 insertions(+), 92 deletions(-)
diff --git a/debian/control b/debian/control
index fc002b8..1d956eb 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: hyphen
Priority: optional
Maintainer: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Uploaders: Rene Engelhard <r...@debian.org>
-Build-Depends: debhelper (>= 9), texlive-base (>= 2013~), gawk
+Build-Depends: debhelper (>= 9), dh-autoreconf, texlive-base (>= 2013~), gawk
Build-Depends-Indep: dictionaries-common-dev
Standards-Version: 3.7.2
Section: libs
diff --git a/debian/docs b/debian/libhyphen-dev.docs
similarity index 70%
copy from debian/docs
copy to debian/libhyphen-dev.docs
index b3d68df..cc75a3d 100644
--- a/debian/docs
+++ b/debian/libhyphen-dev.docs
@@ -1,3 +1,4 @@
+doc/tb87nemeth.pdf
README
README.hyphen
README.nonstandard
diff --git a/debian/docs b/debian/libhyphen0.docs
similarity index 100%
rename from debian/docs
rename to debian/libhyphen0.docs
diff --git a/debian/rules b/debian/rules
index f912d20..54eb28b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,103 +1,29 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# 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
+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)
-# shared library versions, option 1
-version=2.0.5
-major=2
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
-
-config.status:
- dh_testdir
- # Add here commands to configure the package.
- dh_autoreconf
- ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" AWK=gawk
-
-
-build: build-stamp
-build-stamp: config.status
- dh_testdir
-
- $(MAKE)
- $(MAKE) check
-
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- [ ! -f Makefile ] || $(MAKE) distclean
-
- dh_autoreconf_clean
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,-z,defs
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- dh_install --sourcedir=debian/tmp
+%:
+ dh $@ --parallel --with autoreconf
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -i ChangeLog
- dh_installdocs -i
- dh_installexamples -i
- dh_installman -i
- dh_link -i
- dh_strip -i
- dh_compress -i
- dh_fixperms -i
- dh_perl -i
- dh_makeshlibs -i
- dh_installdeb -i
- dh_shlibdeps -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
+override_dh_auto_configure-arch:
+ ./configure \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ AWK=gawk
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installchangelogs -a ChangeLog
- dh_installdocs -a -Nlibhyphen-dev
- dh_installdocs -plibhyphen-dev doc/tb87nemeth.pdf
- dh_installexamples -a
- dh_installman -a
- dh_link -a
- dh_strip -a
- dh_compress -a
- dh_fixperms -a
- dh_perl -a
- dh_makeshlibs -a
- dh_installdeb -a
- dh_shlibdeps -a
- dh_gencontrol -a
- dh_md5sums -a
- dh_builddeb -a
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_configure-indep:
+override_dh_auto_build-indep:
+override_dh_auto_install-indep:
+ @# nothing to do for the indep case here
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-openoffice/hyphen.git
