diff --git a/debian/changelog b/debian/changelog index 0f6c853..b353e15 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +globus-gsi-openssl-error (4.2-1) unstable; urgency=medium + + * Minor fixes to makefiles + * Change to debhelper compat level 13 + * Remove override_dh_missing rule (--fail-missing is default) + * Drop old symlink-to-dir conversion from 2014 + + -- Mattias Ellert Tue, 15 Dec 2020 10:45:07 +0100 + globus-gsi-openssl-error (4.1-2) unstable; urgency=medium * Convert debian/rules to dh tool 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 e57c770..4bc7ae0 100644 --- a/debian/control +++ b/debian/control @@ -2,12 +2,12 @@ Priority: optional Maintainer: Mattias Ellert Build-Depends: - debhelper (>= 10), + debhelper (>= 13), pkg-config, libglobus-common-dev (>= 15), libssl-dev, doxygen -Standards-Version: 4.4.0 +Standards-Version: 4.5.1 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-gsi-openssl-error Vcs-Git: https://salsa.debian.org/ellert/globus-gsi-openssl-error.git @@ -57,8 +57,6 @@ Section: doc Architecture: all Multi-Arch: foreign -Pre-Depends: - dpkg (>= 1.17.5) Depends: ${misc:Depends} Description: Grid Community Toolkit - Globus OpenSSL Error Handling Documentation Files diff --git a/debian/copyright b/debian/copyright index cfcc76e..83fb8b7 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_openssl_error Upstream-Contact: https://github.com/gridcf/gct/ -Source: https://repo.gridcf.org/gct6/sources/globus_gsi_openssl_error-4.1.tar.gz +Source: https://repo.gridcf.org/gct6/sources/globus_gsi_openssl_error-4.2.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/libglobus-gsi-openssl-error-dev.install b/debian/libglobus-gsi-openssl-error-dev.install index b09696c..2ffc7a9 100644 --- a/debian/libglobus-gsi-openssl-error-dev.install +++ b/debian/libglobus-gsi-openssl-error-dev.install @@ -1,3 +1,3 @@ -debian/tmp/usr/include/globus/* -debian/tmp/usr/lib/*/libglobus_openssl_error.so -debian/tmp/usr/lib/*/pkgconfig/globus-gsi-openssl-error.pc +/usr/include/globus/* +/usr/lib/*/libglobus_openssl_error.so +/usr/lib/*/pkgconfig/globus-gsi-openssl-error.pc diff --git a/debian/libglobus-gsi-openssl-error-doc.install b/debian/libglobus-gsi-openssl-error-doc.install index 4649b21..385862f 100644 --- a/debian/libglobus-gsi-openssl-error-doc.install +++ b/debian/libglobus-gsi-openssl-error-doc.install @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/libglobus-gsi-openssl-error-dev/html -debian/tmp/usr/share/man/man3/* +/usr/share/doc/libglobus-gsi-openssl-error-dev/html +/usr/share/man/man3/* diff --git a/debian/libglobus-gsi-openssl-error-doc.maintscript b/debian/libglobus-gsi-openssl-error-doc.maintscript deleted file mode 100644 index 4ed9c44..0000000 --- a/debian/libglobus-gsi-openssl-error-doc.maintscript +++ /dev/null @@ -1 +0,0 @@ -symlink_to_dir /usr/share/doc/libglobus-gsi-openssl-error-doc libglobus-gsi-openssl-error-dev 3.5-2~ libglobus-gsi-openssl-error-doc diff --git a/debian/libglobus-gsi-openssl-error0.install b/debian/libglobus-gsi-openssl-error0.install index cda7e91..c23d509 100644 --- a/debian/libglobus-gsi-openssl-error0.install +++ b/debian/libglobus-gsi-openssl-error0.install @@ -1 +1 @@ -debian/tmp/usr/lib/*/libglobus_openssl_error.so.* +/usr/lib/*/libglobus_openssl_error.so.* diff --git a/debian/rules b/debian/rules index 237c96b..591cd42 100755 --- a/debian/rules +++ b/debian/rules @@ -2,6 +2,8 @@ # -*- makefile -*- name = globus-gsi-openssl-error + +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,defs INSTALLDIR = debian/tmp @@ -14,15 +16,11 @@ dh_autoreconf --as-needed override_dh_auto_configure: - LDFLAGS="$(LDFLAGS) -Wl,--as-needed -Wl,-z,defs" \ 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 @@ -33,8 +31,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 (<< 3.8-2~), $(name)-dbg (<< 2.1-4~)'