diff -Nru globus-gram-job-manager-slurm-3.0/debian/changelog globus-gram-job-manager-slurm-3.0/debian/changelog --- globus-gram-job-manager-slurm-3.0/debian/changelog 2018-09-16 01:16:31.000000000 +0000 +++ globus-gram-job-manager-slurm-3.0/debian/changelog 2019-07-12 14:34:38.000000000 +0000 @@ -1,3 +1,11 @@ +globus-gram-job-manager-slurm (3.0-2) unstable; urgency=medium + + * Convert debian/rules to dh tool + * Change to debhelper compat level 10 + * Update documentation links in README file + + -- Mattias Ellert Fri, 12 Jul 2019 16:34:38 +0200 + globus-gram-job-manager-slurm (3.0-1) unstable; urgency=medium * Switch upstream to Grid Community Toolkit diff -Nru globus-gram-job-manager-slurm-3.0/debian/compat globus-gram-job-manager-slurm-3.0/debian/compat --- globus-gram-job-manager-slurm-3.0/debian/compat 2018-03-02 17:17:07.000000000 +0000 +++ globus-gram-job-manager-slurm-3.0/debian/compat 2019-07-11 13:07:02.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru globus-gram-job-manager-slurm-3.0/debian/control globus-gram-job-manager-slurm-3.0/debian/control --- globus-gram-job-manager-slurm-3.0/debian/control 2018-09-04 11:03:01.000000000 +0000 +++ globus-gram-job-manager-slurm-3.0/debian/control 2019-07-12 14:34:38.000000000 +0000 @@ -1,8 +1,10 @@ Source: globus-gram-job-manager-slurm Priority: optional Maintainer: Mattias Ellert -Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config -Standards-Version: 4.2.1 +Build-Depends: + debhelper (>= 10), + pkg-config +Standards-Version: 4.4.0 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-gram-job-manager-slurm Vcs-Git: https://salsa.debian.org/ellert/globus-gram-job-manager-slurm.git @@ -12,8 +14,15 @@ Section: net Architecture: all Multi-Arch: foreign -Provides: globus-gram-job-manager-slurm-setup-poll -Depends: ${misc:Depends}, ${perl:Depends}, globus-gram-job-manager (>= 13), globus-gram-job-manager-scripts (>= 4), globus-gass-cache-program (>= 5), globus-gatekeeper (>= 9) +Provides: + globus-gram-job-manager-slurm-setup-poll +Depends: + ${misc:Depends}, + ${perl:Depends}, + globus-gram-job-manager (>= 13), + globus-gram-job-manager-scripts (>= 4), + globus-gass-cache-program (>= 5), + globus-gatekeeper (>= 9) Description: Grid Community Toolkit - SLURM Job Manager Support The Grid Community Toolkit (GCT) is an open source software toolkit used for building grid systems and applications. It is a fork of the Globus Toolkit diff -Nru globus-gram-job-manager-slurm-3.0/debian/copyright globus-gram-job-manager-slurm-3.0/debian/copyright --- globus-gram-job-manager-slurm-3.0/debian/copyright 2018-09-16 00:55:20.000000000 +0000 +++ globus-gram-job-manager-slurm-3.0/debian/copyright 2019-07-12 14:34:38.000000000 +0000 @@ -38,7 +38,7 @@ Files: debian/* Copyright: - 2008-2018 Mattias Ellert + 2008-2019 Mattias Ellert 2010-2013 Initiative for Globus in Europe (IGE), http://www.ige-project.eu/ License: Apache-2.0 diff -Nru globus-gram-job-manager-slurm-3.0/debian/globus-gram-job-manager-slurm.docs globus-gram-job-manager-slurm-3.0/debian/globus-gram-job-manager-slurm.docs --- globus-gram-job-manager-slurm-3.0/debian/globus-gram-job-manager-slurm.docs 1970-01-01 00:00:00.000000000 +0000 +++ globus-gram-job-manager-slurm-3.0/debian/globus-gram-job-manager-slurm.docs 2019-07-11 13:15:01.000000000 +0000 @@ -0,0 +1 @@ +debian/README diff -Nru globus-gram-job-manager-slurm-3.0/debian/README globus-gram-job-manager-slurm-3.0/debian/README --- globus-gram-job-manager-slurm-3.0/debian/README 2018-03-23 15:16:57.000000000 +0000 +++ globus-gram-job-manager-slurm-3.0/debian/README 2019-07-10 14:55:09.000000000 +0000 @@ -1,28 +1,28 @@ This package is part of the Grid Resource Allocation and Management component of the Grid Community Toolkit. For more information visit: -https://gridcf.org/gct-docs/gram5/ +https://gridcf.org/gct-docs/latest/gram5/ Key Concepts: -https://gridcf.org/gct-docs/gram5/key/ +https://gridcf.org/gct-docs/latest/gram5/key/ Admin Guide: -https://gridcf.org/gct-docs/gram5/admin/ +https://gridcf.org/gct-docs/latest/gram5/admin/ User's Guide: -https://gridcf.org/gct-docs/gram5/user/ +https://gridcf.org/gct-docs/latest/gram5/user/ Developer's Guide: -https://gridcf.org/gct-docs/gram5/developer/ +https://gridcf.org/gct-docs/latest/gram5/developer/ Release Notes: -https://gridcf.org/gct-docs/gram5/rn/ +https://gridcf.org/gct-docs/latest/gram5/rn/ Public Interface Guide: -https://gridcf.org/gct-docs/gram5/pi/ +https://gridcf.org/gct-docs/latest/gram5/pi/ Quality Profile: -https://gridcf.org/gct-docs/gram5/qp/ +https://gridcf.org/gct-docs/latest/gram5/qp/ Migrating Guide: -https://gridcf.org/gct-docs/gram5/mig/ +https://gridcf.org/gct-docs/latest/gram5/mig/ diff -Nru globus-gram-job-manager-slurm-3.0/debian/rules globus-gram-job-manager-slurm-3.0/debian/rules --- globus-gram-job-manager-slurm-3.0/debian/rules 2018-09-16 01:16:31.000000000 +0000 +++ globus-gram-job-manager-slurm-3.0/debian/rules 2019-07-12 14:34:38.000000000 +0000 @@ -2,27 +2,17 @@ # -*- makefile -*- name = globus-gram-job-manager-slurm -_name = globus_gram_job_manager_slurm -INSTALLDIR = $(CURDIR)/debian/tmp +INSTALLDIR = debian/tmp -_prefix = /usr -_bindir = $(_prefix)/bin -_sbindir = $(_prefix)/sbin -_includedir = $(_prefix)/include -_datadir = $(_prefix)/share -_mandir = $(_datadir)/man -_docdir = $(_datadir)/doc/$(name) +_docdir = /usr/share/doc/$(name) perl_vendorlib = $(shell eval "`perl -V:installvendorlib`"; echo $$installvendorlib) -configure: configure-stamp - -configure-stamp: - dh_testdir - - dh_autoreconf +%: + dh $@ +override_dh_auto_configure: MPIRUN=no \ SRUN=/usr/bin/srun \ SBATCH=/usr/bin/sbatch \ @@ -31,44 +21,13 @@ SCONTROL=/usr/bin/scontrol \ dh_auto_configure -- \ --disable-static \ - --includedir=$(_includedir)/globus \ - --libexecdir=$(_datadir)/globus \ + --includedir=/usr/include/globus \ + --libexecdir=/usr/share/globus \ --docdir=$(_docdir) \ --with-perlmoduledir=$(perl_vendorlib) - touch $@ - -build: build-arch build-indep - -build-arch: - -build-indep: build-stamp - -build-stamp: configure-stamp - dh_testdir - - $(MAKE) - - touch $@ - -clean: - dh_testdir - dh_testroot - - if [ -r Makefile ] ; then $(MAKE) distclean ; fi - - dh_autoreconf_clean - - rm -f build-stamp configure-stamp - - dh_clean - -install: build-stamp - dh_testdir - dh_testroot - dh_prep - - $(MAKE) install DESTDIR=$(INSTALLDIR) +override_dh_auto_install: + dh_auto_install --destdir=$(INSTALLDIR) # Remove jobmanager-slurm from install dir - leave it for admin config rm $(INSTALLDIR)/etc/grid-services/jobmanager-slurm @@ -76,25 +35,5 @@ # Remove installed license files rm $(INSTALLDIR)$(_docdir)/*LICENSE* -binary: binary-arch binary-indep - -binary-arch: - -binary-indep: install - dh_testdir - dh_testroot - dh_installdocs debian/README - dh_installchangelogs - dh_install +override_dh_missing: dh_missing --fail-missing - dh_installman - dh_link - dh_compress - dh_fixperms - dh_perl - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -.PHONY: binary binary-arch binary-indep build build-arch build-indep clean configure install