diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/control | 11 | ||||
| -rw-r--r-- | debian/keytab-backend.docs | 2 | ||||
| -rw-r--r-- | debian/keytab-backend.install | 1 | ||||
| -rwxr-xr-x | debian/rules | 115 | ||||
| -rw-r--r-- | debian/wallet-client.docs | 2 | ||||
| -rw-r--r-- | debian/wallet-server.docs | 2 |
7 files changed, 28 insertions, 108 deletions
diff --git a/debian/changelog b/debian/changelog index 9cc4614..473677d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,9 @@ wallet (0.10-1) UNRELEASED; urgency=low - Do not log the data passed to store. - New wallet-report script and multiple additional database reports. - Report ACL names as well as numbers in object history. + * Update debhelper compatibility level to V7. + - Use debhelper rule minimization with overrides. + - Add ${misc:Depends} to dependencies. -- Russ Allbery <rra@debian.org> Sun, 21 Feb 2010 17:49:43 -0800 diff --git a/debian/control b/debian/control index a603b82..148dc02 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,14 @@ Source: wallet Section: net Priority: extra Maintainer: Russ Allbery <rra@debian.org> -Build-Depends: debhelper (>= 5), libdbi-perl, libdbd-sqlite3-perl, +Build-Depends: debhelper (>= 7.0.50~), libdbi-perl, libdbd-sqlite3-perl, libkrb5-dev, libremctl-dev, libtest-pod-perl, perl Standards-Version: 3.7.3 Package: keytab-backend Architecture: all -Depends: krb5-admin-server, perl, remctl-server +Depends: ${misc:Depends}, ${perl:Depends}, krb5-admin-server, perl, + remctl-server Description: Provide existing Kerberos keytabs via remctl keytab-backend is a service that runs under remctld and allows authenticated clients to download Kerberos keytabs without changing the @@ -19,7 +20,7 @@ Description: Provide existing Kerberos keytabs via remctl Package: wallet-client Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: Kerberos-authenticated secure data management client The wallet is a system for managing secure data, authorization rules to retrieve or change that data, and audit rules for documenting actions @@ -35,8 +36,8 @@ Description: Kerberos-authenticated secure data management client Package: wallet-server Architecture: all -Depends: krb5-user, libdbi-perl, libdbd-sqlite3-perl | libdbd-mysql-perl, - remctl-server, ${perl:Depends} +Depends: ${misc:Depends}, ${perl:Depends}, krb5-user, libdbi-perl, + libdbd-sqlite3-perl | libdbd-mysql-perl, remctl-server Suggests: libauthen-krb5-perl, libnet-remctl-perl Description: Kerberos-authenticated secure data management server The wallet is a system for managing secure data, authorization rules to diff --git a/debian/keytab-backend.docs b/debian/keytab-backend.docs new file mode 100644 index 0000000..724e084 --- /dev/null +++ b/debian/keytab-backend.docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian/keytab-backend.install b/debian/keytab-backend.install index 8d16b5d..666b71c 100644 --- a/debian/keytab-backend.install +++ b/debian/keytab-backend.install @@ -1,3 +1,4 @@ +debian/tmp/etc/remctl/acl/keytab debian/tmp/usr/sbin/keytab-backend debian/tmp/usr/share/man/man8/keytab-backend.8 diff --git a/debian/rules b/debian/rules index f6773bc..02c065e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,109 +1,18 @@ #!/usr/bin/make -f -# -*- makefile -*- -# GNU copyright 1997 to 1999 by Joey Hess. -# Further updates by Russ Allbery <rra@debian.org> -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +%: + dh $@ -# This has to be exported to make some magic below work. -export DH_OPTIONS +override_dh_auto_configure: + dh_auto_econfigure -- --enable-reduced-depends -# Used only for the man page. -VERSION := $(shell dpkg-parsechangelog | grep ^Version: | cut -d' ' -f2 \ - | cut -d- -f1) +# We rebuild the perl directory Makefile to encode the correct installation +# paths, since otherwise it defaults to using the local site module path. +override_dh_auto_install: + cd perl && perl Makefile.PL INSTALLDIRS=vendor + dh_auto_install + install -d debian/tmp/etc/remctl/acl + install -m 0644 config/keytab.acl debian/tmp/etc/remctl/acl/keytab -# Tell Autoconf the correct system types. We need to know the host -# architecture to determine whether setpag is available. -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -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 - -# Set up compiler flags. -CFLAGS = -Wall -g -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - CFLAGS="$(CFLAGS)" ./configure $(SYSTEM) --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --enable-reduced-depends - touch $@ - -build: build-arch build-indep -build-arch: build-stamp -build-indep: -build-stamp: configure-stamp - dh_testdir - $(MAKE) - $(MAKE) check - touch $@ - -clean: - dh_testdir - dh_testroot - rm -f configure-stamp build-stamp install-stamp - [ ! -f Makefile ] || $(MAKE) distclean - dh_clean - -install: install-stamp -install-stamp: build-stamp - dh_testdir - dh_testroot - dh_clean - cd $(CURDIR)/perl && perl Makefile.PL INSTALLDIRS=vendor - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - DH_OPTIONS= dh_installdirs - DH_OPTIONS= dh_install --fail-missing - install -m 0644 config/keytab.acl \ - $(CURDIR)/debian/keytab-backend/etc/remctl/acl/keytab - touch $@ - -binary: binary-arch binary-indep - -binary-arch: DH_OPTIONS=-a -binary-arch: install-stamp - dh_testdir - dh_testroot +override_dh_installchangelogs: dh_installchangelogs NEWS - dh_installdocs -A README TODO - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - 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 NEWS - dh_installdocs -A README TODO - dh_installman - dh_link - dh_strip - dh_compress - dh_perl - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: build build-arch build-indep clean binary-arch binary-indep binary -.PHONY: install diff --git a/debian/wallet-client.docs b/debian/wallet-client.docs new file mode 100644 index 0000000..724e084 --- /dev/null +++ b/debian/wallet-client.docs @@ -0,0 +1,2 @@ +README +TODO diff --git a/debian/wallet-server.docs b/debian/wallet-server.docs index db7ea6a..ceecb82 100644 --- a/debian/wallet-server.docs +++ b/debian/wallet-server.docs @@ -1,3 +1,5 @@ +README +TODO docs/design docs/design-acl docs/design-api |