diff -Nru globus-ftp-control-9.4/debian/changelog globus-ftp-control-9.4/debian/changelog --- globus-ftp-control-9.4/debian/changelog 2019-02-27 19:00:48.000000000 +0000 +++ globus-ftp-control-9.4/debian/changelog 2019-07-12 14:34:29.000000000 +0000 @@ -1,3 +1,11 @@ +globus-ftp-control (9.4-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:29 +0200 + globus-ftp-control (9.4-1) unstable; urgency=medium * Doxygen fixes diff -Nru globus-ftp-control-9.4/debian/compat globus-ftp-control-9.4/debian/compat --- globus-ftp-control-9.4/debian/compat 2018-03-02 17:15:57.000000000 +0000 +++ globus-ftp-control-9.4/debian/compat 2019-07-11 13:07:02.000000000 +0000 @@ -1 +1 @@ -9 +10 diff -Nru globus-ftp-control-9.4/debian/control globus-ftp-control-9.4/debian/control --- globus-ftp-control-9.4/debian/control 2019-02-27 16:04:31.000000000 +0000 +++ globus-ftp-control-9.4/debian/control 2019-07-11 14:29:27.000000000 +0000 @@ -1,8 +1,19 @@ Source: globus-ftp-control Priority: optional Maintainer: Mattias Ellert -Build-Depends: debhelper (>= 9), dh-autoreconf, pkg-config, libglobus-common-dev (>= 15), libglobus-gss-assist-dev (>= 11), libglobus-gssapi-gsi-dev (>= 13), libglobus-io-dev (>= 11), libglobus-xio-dev (>= 3), libglobus-gssapi-error-dev (>= 4), libglobus-xio-gsi-driver-dev (>= 4), doxygen, openssl -Standards-Version: 4.3.0 +Build-Depends: + debhelper (>= 10), + pkg-config, + libglobus-common-dev (>= 15), + libglobus-gss-assist-dev (>= 11), + libglobus-gssapi-gsi-dev (>= 13), + libglobus-io-dev (>= 11), + libglobus-xio-dev (>= 3), + libglobus-gssapi-error-dev (>= 4), + libglobus-xio-gsi-driver-dev (>= 4), + doxygen, + openssl +Standards-Version: 4.4.0 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-ftp-control Vcs-Git: https://salsa.debian.org/ellert/globus-ftp-control.git @@ -12,8 +23,12 @@ Section: libs Architecture: any Multi-Arch: same -Pre-Depends: ${misc:Pre-Depends} -Depends: ${shlibs:Depends}, ${misc:Depends}, libglobus-xio-gsi-driver (>= 4) +Pre-Depends: + ${misc:Pre-Depends} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libglobus-xio-gsi-driver (>= 4) Description: Grid Community Toolkit - GridFTP Control Library 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 @@ -28,8 +43,17 @@ Section: libdevel Architecture: any Multi-Arch: same -Depends: libglobus-ftp-control1 (= ${binary:Version}), ${misc:Depends}, libglobus-common-dev (>= 15), libglobus-gss-assist-dev (>= 11), libglobus-gssapi-gsi-dev (>= 13), libglobus-io-dev (>= 11), libglobus-xio-dev (>= 3), libglobus-gssapi-error-dev (>= 4) -Suggests: libglobus-ftp-control-doc (= ${source:Version}) +Depends: + libglobus-ftp-control1 (= ${binary:Version}), + ${misc:Depends}, + libglobus-common-dev (>= 15), + libglobus-gss-assist-dev (>= 11), + libglobus-gssapi-gsi-dev (>= 13), + libglobus-io-dev (>= 11), + libglobus-xio-dev (>= 3), + libglobus-gssapi-error-dev (>= 4) +Suggests: + libglobus-ftp-control-doc (= ${source:Version}) Description: Grid Community Toolkit - GridFTP Control Library Development Files 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 @@ -44,8 +68,10 @@ Section: doc Architecture: all Multi-Arch: foreign -Pre-Depends: dpkg (>= 1.17.5) -Depends: ${misc:Depends} +Pre-Depends: + dpkg (>= 1.17.5) +Depends: + ${misc:Depends} Description: Grid Community Toolkit - GridFTP Control Library Documentation Files 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-ftp-control-9.4/debian/libglobus-ftp-control1.docs globus-ftp-control-9.4/debian/libglobus-ftp-control1.docs --- globus-ftp-control-9.4/debian/libglobus-ftp-control1.docs 1970-01-01 00:00:00.000000000 +0000 +++ globus-ftp-control-9.4/debian/libglobus-ftp-control1.docs 2019-07-11 13:15:01.000000000 +0000 @@ -0,0 +1 @@ +debian/README diff -Nru globus-ftp-control-9.4/debian/README globus-ftp-control-9.4/debian/README --- globus-ftp-control-9.4/debian/README 2018-03-23 15:16:56.000000000 +0000 +++ globus-ftp-control-9.4/debian/README 2019-07-10 14:55:09.000000000 +0000 @@ -1,28 +1,28 @@ This package is part of the GridFTP component of the Grid Community Toolkit. For more information visit: -https://gridcf.org/gct-docs/gridftp/ +https://gridcf.org/gct-docs/latest/gridftp/ Key Concepts: -https://gridcf.org/gct-docs/gridftp/key/ +https://gridcf.org/gct-docs/latest/gridftp/key/ Admin Guide: -https://gridcf.org/gct-docs/gridftp/admin/ +https://gridcf.org/gct-docs/latest/gridftp/admin/ User's Guide: -https://gridcf.org/gct-docs/gridftp/user/ +https://gridcf.org/gct-docs/latest/gridftp/user/ Developer's Guide: -https://gridcf.org/gct-docs/gridftp/developer/ +https://gridcf.org/gct-docs/latest/gridftp/developer/ Release Notes: -https://gridcf.org/gct-docs/gridftp/rn/ +https://gridcf.org/gct-docs/latest/gridftp/rn/ Public Interface Guide: -https://gridcf.org/gct-docs/gridftp/pi/ +https://gridcf.org/gct-docs/latest/gridftp/pi/ Quality Profile: -https://gridcf.org/gct-docs/gridftp/qp/ +https://gridcf.org/gct-docs/latest/gridftp/qp/ Migrating Guide: -https://gridcf.org/gct-docs/gridftp/mig/ +https://gridcf.org/gct-docs/latest/gridftp/mig/ diff -Nru globus-ftp-control-9.4/debian/rules globus-ftp-control-9.4/debian/rules --- globus-ftp-control-9.4/debian/rules 2018-09-20 07:41:00.000000000 +0000 +++ globus-ftp-control-9.4/debian/rules 2019-07-11 16:34:53.000000000 +0000 @@ -1,124 +1,40 @@ #!/usr/bin/make -f # -*- makefile -*- --include /usr/share/dpkg/buildflags.mk - name = globus-ftp-control -_name = globus_ftp_control - -INSTALLDIR = $(CURDIR)/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/lib$(name)-dev -export SOURCE_DATE_EPOCH = \ - $(shell date -d "$$(dpkg-parsechangelog -c 1 -S Date)" +%s) +INSTALLDIR = debian/tmp -configure: configure-stamp +_docdir = /usr/share/doc/lib$(name)-dev -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" \ dh_auto_configure -- \ --disable-static \ - --includedir=$(_includedir)/globus \ - --libexecdir=$(_datadir)/globus \ + --includedir=/usr/include/globus \ + --libexecdir=/usr/share/globus \ --docdir=$(_docdir) - # 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) -ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) - GLOBUS_HOSTNAME=localhost $(MAKE) check VERBOSE=1 -endif +override_dh_auto_test: + GLOBUS_HOSTNAME=localhost dh_auto_test -- VERBOSE=1 - 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 installed license file rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE -binary: binary-arch binary-indep - -binary-arch: install - dh_testdir - dh_testroot - dh_installdocs -a debian/README - dh_installchangelogs -a - dh_install -a - dh_missing -a --fail-missing - dh_installman -a - dh_link -a - dh_strip -a --dbgsym-migration='lib$(name)-dbg (<< 7.7-2~), $(name)-dbg (<< 4.7)' - 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 - 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='lib$(name)-dbg (<< 7.7-2~), $(name)-dbg (<< 4.7)'