[SCM] Debian packaging for XMLTooling-C branch, master, updated. debian/1.3.3-2-17-g716022d
Russ Allbery
rra at debian.org
Mon Mar 14 03:58:35 UTC 2011
The following commit has been merged in the master branch:
commit c8d96a967cc5817871581a531bc6efd280fea8d3
Author: Russ Allbery <rra at debian.org>
Date: Sun Mar 13 18:28:24 2011 -0700
Update debhelper compatibility level to V8
* Update to debhelper compatibility level V8.
- Use the autotools-dev debhelper module for config.{sub,guess}.
- Use debhelper rule minimization.
diff --git a/debian/changelog b/debian/changelog
index 1936651..cfcd788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ xmltooling (1.4.1-1) UNRELEASED; urgency=low
build results.
* Add build dependency on pkg-config, which upstream now uses to find
the SSL libraries.
+ * Update to debhelper compatibility level V8.
+ - Use the autotools-dev debhelper module for config.{sub,guess}.
+ - Use debhelper rule minimization.
* Update debian/copyright to the current DEP-5 specification.
-- Russ Allbery <rra at debian.org> Sun, 13 Mar 2011 17:55:12 -0700
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 23ea2f1..00dd791 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
Priority: extra
Maintainer: Debian Shib Team <pkg-shibboleth-devel at lists.alioth.debian.org>
Uploaders: Russ Allbery <rra at debian.org>, Ferenc Wagner <wferi at niif.hu>
-Build-Depends: debhelper (>= 7), autotools-dev, doxygen,
+Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1~), doxygen,
libcurl4-openssl-dev, liblog4cpp5-dev, libxerces-c-dev,
libxml-security-c-dev (>= 1.6), pkg-config
Standards-Version: 3.8.4
diff --git a/debian/rules b/debian/rules
index 1087090..1084a43 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,4 @@
#!/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.
-#
-# Modified to make a template file for a multi-binary package with separated
-# build-arch and build-indep targets by Bill Allombert 2001
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
DEBUG = --enable-debug
@@ -22,80 +6,11 @@ else
DEBUG =
endif
-# Tell Autoconf the correct system types.
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
- SYSTEM = --build $(DEB_HOST_GNU_TYPE)
-else
- SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-endif
-
-configure: configure-stamp
-configure-stamp:
- dh_testdir
- cp /usr/share/misc/config.guess config.guess
- cp /usr/share/misc/config.sub config.sub
- CFLAGS="$(CFLAGS)" LIBS=-lpthread ./configure --prefix=/usr \
- --disable-dependency-tracking $(SYSTEM) $(DEBUG)
- touch $@
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep:
-build-stamp: configure-stamp
- dh_testdir
- $(MAKE)
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f configure-stamp build-stamp install-stamp
- [ ! -f Makefile ] || $(MAKE) distclean
- dh_clean config.guess config.sub
-
-install: install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_prep
- $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
- rm -r $(CURDIR)/debian/tmp/usr/share/doc/xmltooling*
- dh_install -a -i --fail-missing
- touch $@
-
-binary: binary-arch binary-indep
-binary-arch: DH_OPTIONS=-a
-binary-arch: install-stamp
- dh_testdir
- dh_testroot
- dh_installchangelogs
- dh_installdocs -A doc/NOTICE.txt
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+override_dh_auto_configure:
+ dh_auto_configure -- --disable-dependency-tracking $(DEBUG)
-binary-indep: DH_OPTIONS=-i
-binary-indep: install-stamp
- dh_testdir
- dh_testroot
- dh_installchangelogs
+override_dh_installdocs:
dh_installdocs -A doc/NOTICE.txt
- dh_link
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-.PHONY: binary binary-arch binary-indep build build-arch build-indep clean
-.PHONY: install
+%:
+ dh $@ --with autotools_dev
--
Debian packaging for XMLTooling-C
More information about the Pkg-shibboleth-devel
mailing list