diff -Nru globus-gram-job-manager-lsf-3.0/debian/changelog globus-gram-job-manager-lsf-3.0/debian/changelog --- globus-gram-job-manager-lsf-3.0/debian/changelog 2018-09-16 01:16:31.000000000 +0000 +++ globus-gram-job-manager-lsf-3.0/debian/changelog 2019-07-12 14:34:36.000000000 +0000 @@ -1,3 +1,11 @@ +globus-gram-job-manager-lsf (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:36 +0200 + globus-gram-job-manager-lsf (3.0-1) unstable; urgency=medium * Switch upstream to Grid Community Toolkit diff -Nru globus-gram-job-manager-lsf-3.0/debian/compat globus-gram-job-manager-lsf-3.0/debian/compat --- globus-gram-job-manager-lsf-3.0/debian/compat 2018-03-02 17:17:04.000000000 +0000 +++ globus-gram-job-manager-lsf-3.0/debian/compat 2019-07-11 13:07:02.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru globus-gram-job-manager-lsf-3.0/debian/control globus-gram-job-manager-lsf-3.0/debian/control --- globus-gram-job-manager-lsf-3.0/debian/control 2018-09-04 11:03:01.000000000 +0000 +++ globus-gram-job-manager-lsf-3.0/debian/control 2019-07-12 14:34:36.000000000 +0000 @@ -1,8 +1,12 @@ Source: globus-gram-job-manager-lsf Priority: optional Maintainer: Mattias Ellert -Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, libglobus-common-dev (>= 15), libglobus-scheduler-event-generator-dev (>= 4) -Standards-Version: 4.2.1 +Build-Depends: + debhelper (>= 10), + pkg-config, + libglobus-common-dev (>= 15), + libglobus-scheduler-event-generator-dev (>= 4) +Standards-Version: 4.4.0 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-gram-job-manager-lsf Vcs-Git: https://salsa.debian.org/ellert/globus-gram-job-manager-lsf.git @@ -12,10 +16,21 @@ Section: net Architecture: all Multi-Arch: foreign -Provides: globus-gram-job-manager-setup-lsf -Replaces: globus-gram-job-manager-setup-lsf (<< 2.6), globus-gram-job-manager-setup-lsf-doc (<< 2.6) -Conflicts: globus-gram-job-manager-setup-lsf (<< 2.6), globus-gram-job-manager-setup-lsf-doc (<< 2.6) -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-setup-lsf +Replaces: + globus-gram-job-manager-setup-lsf (<< 2.6), + globus-gram-job-manager-setup-lsf-doc (<< 2.6) +Conflicts: + globus-gram-job-manager-setup-lsf (<< 2.6), + globus-gram-job-manager-setup-lsf-doc (<< 2.6) +Depends: + ${misc:Depends}, + ${perl:Depends}, + globus-gram-job-manager (>= 13), + globus-gram-job-manager-scripts (>= 4), + globus-gass-cache-program (>= 5), + globus-gatekeeper (>= 9) Recommends: globus-gram-job-manager-lsf-setup-poll | globus-gram-job-manager-lsf-setup-seg Description: Grid Community Toolkit - LSF Job Manager Support The Grid Community Toolkit (GCT) is an open source software toolkit used for @@ -31,7 +46,10 @@ Section: net Architecture: all Multi-Arch: foreign -Depends: globus-gram-job-manager-lsf (= ${source:Version}), globus-gram-job-manager-scripts (>= 4), ${misc:Depends} +Depends: + globus-gram-job-manager-lsf (= ${source:Version}), + globus-gram-job-manager-scripts (>= 4), + ${misc:Depends} Description: Grid Community Toolkit - LSF Job Manager Support using polling 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 @@ -46,7 +64,12 @@ Section: net Architecture: any Multi-Arch: same -Depends: globus-gram-job-manager-lsf (= ${source:Version}), globus-gram-job-manager-scripts (>= 4), globus-scheduler-event-generator-progs (>= 4), ${misc:Depends}, ${shlibs:Depends} +Depends: + globus-gram-job-manager-lsf (= ${source:Version}), + globus-gram-job-manager-scripts (>= 4), + globus-scheduler-event-generator-progs (>= 4), + ${misc:Depends}, + ${shlibs:Depends} Description: Grid Community Toolkit - LSF Job Manager Support using SEG 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-lsf-3.0/debian/copyright globus-gram-job-manager-lsf-3.0/debian/copyright --- globus-gram-job-manager-lsf-3.0/debian/copyright 2018-09-16 00:55:20.000000000 +0000 +++ globus-gram-job-manager-lsf-3.0/debian/copyright 2019-07-12 14:34:36.000000000 +0000 @@ -11,7 +11,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-lsf-3.0/debian/globus-gram-job-manager-lsf.docs globus-gram-job-manager-lsf-3.0/debian/globus-gram-job-manager-lsf.docs --- globus-gram-job-manager-lsf-3.0/debian/globus-gram-job-manager-lsf.docs 1970-01-01 00:00:00.000000000 +0000 +++ globus-gram-job-manager-lsf-3.0/debian/globus-gram-job-manager-lsf.docs 2019-07-11 13:15:01.000000000 +0000 @@ -0,0 +1 @@ +debian/README diff -Nru globus-gram-job-manager-lsf-3.0/debian/README globus-gram-job-manager-lsf-3.0/debian/README --- globus-gram-job-manager-lsf-3.0/debian/README 2018-03-23 15:16:56.000000000 +0000 +++ globus-gram-job-manager-lsf-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-lsf-3.0/debian/rules globus-gram-job-manager-lsf-3.0/debian/rules --- globus-gram-job-manager-lsf-3.0/debian/rules 2018-03-24 13:10:34.000000000 +0000 +++ globus-gram-job-manager-lsf-3.0/debian/rules 2019-07-11 17:49:06.000000000 +0000 @@ -1,33 +1,21 @@ #!/usr/bin/make -f # -*- makefile -*- --include /usr/share/dpkg/buildflags.mk - name = globus-gram-job-manager-lsf -_name = globus_gram_job_manager_lsf -INSTALLDIR = $(CURDIR)/debian/tmp +INSTALLDIR = debian/tmp -_prefix = /usr -_bindir = $(_prefix)/bin -_sbindir = $(_prefix)/sbin -_includedir = $(_prefix)/include -_libdir = $(_prefix)/lib -_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 $@ - dh_autoreconf +override_dh_autoreconf: + dh_autoreconf --as-needed - CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ - FFLAGS="$(FFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ +override_dh_auto_configure: LDFLAGS="$(LDFLAGS) -Wl,--as-needed -Wl,-z,defs" \ BSUB=/usr/bin/bsub \ BQUEUES=/usr/bin/bqueues \ @@ -39,51 +27,17 @@ MPIRUN=no \ 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) \ --with-globus-state-dir=/var/log/globus - # Reduce overlinking - sed 's!CC \(.*-shared\) !CC \\\$${wl}--as-needed \1 !' -i libtool - - touch $@ - -build: build-arch build-indep - -build-arch: build-stamp - -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 # Remove libtool archives (.la files) - rm $(INSTALLDIR)$(_libdir)/*/*.la + rm $(INSTALLDIR)/usr/lib/*/*.la # Remove jobmanager-lsf from install dir - leave it for admin config rm $(INSTALLDIR)/etc/grid-services/jobmanager-lsf @@ -91,44 +45,8 @@ # Remove installed license file rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE -binary: binary-arch binary-indep - -binary-arch: install - dh_testdir - dh_testroot - dh_installdocs -a - dh_installchangelogs -a - dh_install -a - dh_missing -a --fail-missing - dh_installman -a - dh_lintian -a - dh_link -a - dh_strip -a --dbgsym-migration='$(name)-dbg (<< 2.7-2~)' - 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-indep: install - dh_testdir - dh_testroot - dh_installdocs -i debian/README - dh_installchangelogs -i - dh_install -i - dh_missing -i --fail-missing - dh_installman -i - dh_link -i - dh_compress -i - dh_fixperms -i - dh_perl -i - dh_installdeb -i - dh_gencontrol -i - dh_md5sums -i - dh_builddeb -i +override_dh_missing: + dh_missing --fail-missing -.PHONY: binary binary-arch binary-indep build build-arch build-indep clean configure install +override_dh_strip: + dh_strip --dbgsym-migration='$(name)-dbg (<< 2.7-2~)'