diff --git a/debian/changelog b/debian/changelog index 781e885..7738b69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +globus-gsi-cert-utils (10.7-1) unstable; urgency=medium + + * Minor fixes to makefiles (10.4) + * Remove old replace-version.xsl file (10.5) + * Fix format for grid-cert-info -issuer (10.6) + * Use -nameopt sep_multiline to derive certificate subject string (10.7) + * Change to debhelper compat level 13 + * Remove override_dh_missing rule (--fail-missing is default) + * Drop old symlink-to-dir conversion from 2014 + * Drop ancient Replaces/Conflicts/Breaks + + -- Mattias Ellert Tue, 15 Dec 2020 10:11:05 +0100 + globus-gsi-cert-utils (10.3-1) unstable; urgency=medium * Update additional old document references diff --git a/debian/compat b/debian/compat index f599e28..b1bd38b 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -10 +13 diff --git a/debian/control b/debian/control index bc0d1f6..8fd08d2 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Priority: optional Maintainer: Mattias Ellert Build-Depends: - debhelper (>= 10), + debhelper (>= 13), pkg-config, libglobus-common-dev (>= 15), libglobus-openssl-module-dev (>= 3), @@ -10,7 +10,7 @@ libssl-dev, openssl, doxygen -Standards-Version: 4.4.0 +Standards-Version: 4.5.1 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-gsi-cert-utils Vcs-Git: https://salsa.debian.org/ellert/globus-gsi-cert-utils.git @@ -39,12 +39,6 @@ Section: net Architecture: all Multi-Arch: foreign -Replaces: - globus-openssl-progs (<< 6), - globus-openssl-module-progs (<< 4) -Conflicts: - globus-openssl-progs (<< 6), - globus-openssl-module-progs (<< 4) Depends: openssl, ${misc:Depends}, @@ -86,8 +80,6 @@ Section: doc Architecture: all Multi-Arch: foreign -Pre-Depends: - dpkg (>= 1.17.5) Depends: ${misc:Depends} Description: Grid Community Toolkit - Globus GSI Cert Utils Library Documentation Files diff --git a/debian/copyright b/debian/copyright index 6de95d9..09a9552 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,17 +1,17 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: globus_gsi_cert_utils Upstream-Contact: https://github.com/gridcf/gct/ -Source: https://repo.gridcf.org/gct6/sources/globus_gsi_cert_utils-10.3.tar.gz +Source: https://repo.gridcf.org/gct6/sources/globus_gsi_cert_utils-10.7.tar.gz Files: * Copyright: 1999-2017 University of Chicago - 2018-2019 Grid Community Forum + 2018-2020 Grid Community Forum License: Apache-2.0 Files: debian/* Copyright: - 2008-2019 Mattias Ellert + 2008-2020 Mattias Ellert 2010-2013 Initiative for Globus in Europe (IGE), http://www.ige-project.eu/ License: Apache-2.0 diff --git a/debian/globus-gsi-cert-utils-progs.install b/debian/globus-gsi-cert-utils-progs.install index c573343..0658423 100644 --- a/debian/globus-gsi-cert-utils-progs.install +++ b/debian/globus-gsi-cert-utils-progs.install @@ -1,10 +1,10 @@ -debian/tmp/usr/share/man/man1/grid-cert-info.1 -debian/tmp/usr/share/man/man1/grid-cert-request.1 -debian/tmp/usr/share/man/man1/grid-change-pass-phrase.1 -debian/tmp/usr/share/man/man8/globus-update-certificate-dir.8 -debian/tmp/usr/share/man/man8/grid-default-ca.8 -debian/tmp/usr/bin/grid-cert-info -debian/tmp/usr/bin/grid-cert-request -debian/tmp/usr/bin/grid-change-pass-phrase -debian/tmp/usr/sbin/globus-update-certificate-dir -debian/tmp/usr/sbin/grid-default-ca +/usr/share/man/man1/grid-cert-info.1 +/usr/share/man/man1/grid-cert-request.1 +/usr/share/man/man1/grid-change-pass-phrase.1 +/usr/share/man/man8/globus-update-certificate-dir.8 +/usr/share/man/man8/grid-default-ca.8 +/usr/bin/grid-cert-info +/usr/bin/grid-cert-request +/usr/bin/grid-change-pass-phrase +/usr/sbin/globus-update-certificate-dir +/usr/sbin/grid-default-ca diff --git a/debian/libglobus-gsi-cert-utils-dev.install b/debian/libglobus-gsi-cert-utils-dev.install index cacb195..0a65a29 100644 --- a/debian/libglobus-gsi-cert-utils-dev.install +++ b/debian/libglobus-gsi-cert-utils-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/include/globus/* -debian/tmp/usr/lib/*/libglobus_gsi_cert_utils.so -debian/tmp/usr/lib/*/pkgconfig/globus-gsi-cert-utils.pc +/usr/include/globus/* +/usr/lib/*/libglobus_gsi_cert_utils.so +/usr/lib/*/pkgconfig/globus-gsi-cert-utils.pc diff --git a/debian/libglobus-gsi-cert-utils-doc.install b/debian/libglobus-gsi-cert-utils-doc.install index 354c9c5..b7ab95a 100644 --- a/debian/libglobus-gsi-cert-utils-doc.install +++ b/debian/libglobus-gsi-cert-utils-doc.install @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/libglobus-gsi-cert-utils-dev/html -debian/tmp/usr/share/man/man3/* +/usr/share/doc/libglobus-gsi-cert-utils-dev/html +/usr/share/man/man3/* diff --git a/debian/libglobus-gsi-cert-utils-doc.maintscript b/debian/libglobus-gsi-cert-utils-doc.maintscript deleted file mode 100644 index 8dcf420..0000000 --- a/debian/libglobus-gsi-cert-utils-doc.maintscript +++ /dev/null @@ -1 +0,0 @@ -symlink_to_dir /usr/share/doc/libglobus-gsi-cert-utils-doc libglobus-gsi-cert-utils-dev 9.10-2~ libglobus-gsi-cert-utils-doc diff --git a/debian/libglobus-gsi-cert-utils0.install b/debian/libglobus-gsi-cert-utils0.install index 312c994..3d0ce0a 100644 --- a/debian/libglobus-gsi-cert-utils0.install +++ b/debian/libglobus-gsi-cert-utils0.install @@ -1 +1 @@ -debian/tmp/usr/lib/*/libglobus_gsi_cert_utils.so.* +/usr/lib/*/libglobus_gsi_cert_utils.so.* diff --git a/debian/rules b/debian/rules index 790dbcd..8c4edeb 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,8 @@ # -*- makefile -*- name = globus-gsi-cert-utils + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,defs INSTALLDIR = debian/tmp @@ -14,16 +16,12 @@ dh_autoreconf --as-needed override_dh_auto_configure: - LDFLAGS="$(LDFLAGS) -Wl,--as-needed -Wl,-z,defs" \ GLOBUS_VERSION=6.2 \ dh_auto_configure -- \ --disable-static \ --includedir=/usr/include/globus \ --libexecdir=/usr/share/globus \ --docdir=$(_docdir) - -override_dh_auto_test: - dh_auto_test -- VERBOSE=1 override_dh_auto_install: dh_auto_install @@ -34,8 +32,5 @@ # Remove installed license file rm $(INSTALLDIR)$(_docdir)/GLOBUS_LICENSE -override_dh_missing: - dh_missing --fail-missing - override_dh_strip: dh_strip --dbgsym-migration='lib$(name)-dbg (<< 9.16-2~), $(name)-dbg (<< 8.6)'