[SCM] Debian packaging for OpenSAML 2.0 branch, master, updated. debian/2.3-2-15-ge479aa0

Mon Apr 4 02:28:17 UTC 2011

The following commit has been merged in the master branch:
commit 316e99ea24547e46e1b6079cfb85e666fdaebcd0
Author: Russ Allbery <rra at debian.org>
Date:   Sun Apr 3 18:35:08 2011 -0700

    Update to debhelper compatibility level V8
    
    * Replace the version of jQuery installed by Doxygen in the
      documentation package with a symlink to the version supplied by the
      Debian package and add a dependency.
    * 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 51929a4..2475e29 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,12 @@ opensaml2 (2.4.1-1) UNRELEASED; urgency=low
     - Duplication and line feed fixes for DiscoFeed.
     - Fix reload interval backoff after reload failures
     - Strip whitespace from SAMLRequest URL parameter values
+  * Replace the version of jQuery installed by Doxygen in the
+    documentation package with a symlink to the version supplied by the
+    Debian package and add a dependency.
+  * 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.
   * Change to Debian source format 3.0 (quilt).  Force a single Debian
     patch for simplicity since the packaging is maintained in Git using
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 1d0b600..5864c92 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ 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, liblog4cpp5-dev,
- libssl-dev, libxerces-c-dev (>= 3.0.1-2~), libxml-security-c-dev (>= 1.5),
- libxmltooling-dev (>= 1.3)
+Build-Depends: debhelper (>= 8), autotools-dev (>= 20100122.1~), doxygen,
+ liblog4cpp5-dev, libssl-dev, libxerces-c-dev (>= 3.0.1-2~),
+ libxml-security-c-dev (>= 1.5), libxmltooling-dev (>= 1.3)
 Standards-Version: 3.8.4
 Homepage: https://spaces.internet2.edu/display/OpenSAML/Home
 Vcs-Git: git://git.debian.org/git/pkg-shibboleth/opensaml2.git
@@ -64,7 +64,7 @@ Description: Security Assertion Markup Language library (XML schemas)
 Package: libsaml2-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, libjs-jquery
 Description: Security Assertion Markup Language library (API docs)
  OpenSAML is an open source implementation of the OASIS Security Assertion
  Markup Language Specification. It contains a set of open source C++ classes
diff --git a/debian/rules b/debian/rules
index c6b488b..8f6b46a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,6 @@
 #!/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
+DOCS = debian/libsaml2-doc/usr/share/doc/libsaml2-doc
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
     DEBUG = --enable-debug
@@ -22,80 +8,20 @@ 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)" ./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 $@
+override_dh_auto_configure:
+	dh_auto_configure -- --disable-dependency-tracking $(DEBUG)
 
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f configure-stamp build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean config.guess config.sub
+override_dh_install:
+	rm -r debian/tmp/usr/share/doc/opensaml*
+	dh_install -a -i --fail-missing
 
-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/opensaml*
-	dh_install -s -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
-
-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
+	set -e; if [ -d "$(DOCS)" ] ; then \
+	    rm $(DOCS)/html/jquery.js ; \
+	    ln -s /usr/share/javascript/jquery/jquery.min.js \
+		$(DOCS)/html/jquery.js ; \
+	fi
+
+%:
+	dh $@ --with autotools_dev

-- 
Debian packaging for OpenSAML 2.0

