diff -Nru globus-scheduler-event-generator-6.1/configure globus-scheduler-event-generator-6.3/configure --- globus-scheduler-event-generator-6.1/configure 2019-02-26 15:00:47.369632855 +0000 +++ globus-scheduler-event-generator-6.3/configure 2020-12-12 20:57:42.804897731 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for globus_scheduler_event_generator 6.1. +# Generated by GNU Autoconf 2.69 for globus_scheduler_event_generator 6.3. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='globus_scheduler_event_generator' PACKAGE_TARNAME='globus_scheduler_event_generator' -PACKAGE_VERSION='6.1' -PACKAGE_STRING='globus_scheduler_event_generator 6.1' +PACKAGE_VERSION='6.3' +PACKAGE_STRING='globus_scheduler_event_generator 6.3' PACKAGE_BUGREPORT='https://github.com/gridcf/gct/issues' PACKAGE_URL='' @@ -1340,7 +1340,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures globus_scheduler_event_generator 6.1 to adapt to many kinds of systems. +\`configure' configures globus_scheduler_event_generator 6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1411,7 +1411,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of globus_scheduler_event_generator 6.1:";; + short | recursive ) echo "Configuration of globus_scheduler_event_generator 6.3:";; esac cat <<\_ACEOF @@ -1544,7 +1544,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -globus_scheduler_event_generator configure 6.1 +globus_scheduler_event_generator configure 6.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1822,7 +1822,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by globus_scheduler_event_generator $as_me 6.1, which was +It was created by globus_scheduler_event_generator $as_me 6.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2695,7 +2695,7 @@ # Define the identity of the package. PACKAGE='globus_scheduler_event_generator' - VERSION='6.1' + VERSION='6.3' cat >>confdefs.h <<_ACEOF @@ -11689,7 +11689,7 @@ -DIRT_TIMESTAMP=1550490409 +DIRT_TIMESTAMP=1607703417 DIRT_BRANCH_ID=0 @@ -12640,7 +12640,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by globus_scheduler_event_generator $as_me 6.1, which was +This file was extended by globus_scheduler_event_generator $as_me 6.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12697,7 +12697,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -globus_scheduler_event_generator config.status 6.1 +globus_scheduler_event_generator config.status 6.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru globus-scheduler-event-generator-6.1/configure.ac globus-scheduler-event-generator-6.3/configure.ac --- globus-scheduler-event-generator-6.1/configure.ac 2019-02-26 14:54:28.662822391 +0000 +++ globus-scheduler-event-generator-6.3/configure.ac 2020-12-12 20:52:21.380897731 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([globus_scheduler_event_generator],[6.1],[https://github.com/gridcf/gct/issues]) +AC_INIT([globus_scheduler_event_generator],[6.3],[https://github.com/gridcf/gct/issues]) AC_CONFIG_MACRO_DIR([m4]) AC_SUBST([MAJOR_VERSION], [${PACKAGE_VERSION%%.*}]) AC_SUBST([MINOR_VERSION], [${PACKAGE_VERSION##*.}]) diff -Nru globus-scheduler-event-generator-6.1/debian/changelog globus-scheduler-event-generator-6.3/debian/changelog --- globus-scheduler-event-generator-6.1/debian/changelog 2019-07-12 14:34:49.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/changelog 2020-12-15 15:51:48.000000000 +0000 @@ -1,3 +1,14 @@ +globus-scheduler-event-generator (6.3-1) unstable; urgency=medium + + * Minor fixes to makefiles (6.2) + * Remove unused TESTS.pl script (6.3) + * Change to debhelper compat level 13 + * Remove override_dh_missing rule (--fail-missing is default) + * Drop old symlink-to-dir conversion from 2014 + * Add systemd unit file + + -- Mattias Ellert Tue, 15 Dec 2020 16:51:48 +0100 + globus-scheduler-event-generator (6.1-2) unstable; urgency=medium * Convert debian/rules to dh tool diff -Nru globus-scheduler-event-generator-6.1/debian/compat globus-scheduler-event-generator-6.3/debian/compat --- globus-scheduler-event-generator-6.1/debian/compat 2019-07-11 13:07:02.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/compat 2020-12-12 15:25:07.000000000 +0000 @@ -1 +1 @@ -10 +13 diff -Nru globus-scheduler-event-generator-6.1/debian/control globus-scheduler-event-generator-6.3/debian/control --- globus-scheduler-event-generator-6.1/debian/control 2019-07-11 14:29:27.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/control 2020-12-15 15:51:48.000000000 +0000 @@ -2,7 +2,7 @@ Priority: optional Maintainer: Mattias Ellert Build-Depends: - debhelper (>= 10), + debhelper (>= 13), pkg-config, libglobus-common-dev (>= 15), libglobus-xio-dev (>= 3), @@ -10,7 +10,7 @@ libglobus-xio-gsi-driver-dev (>= 2), libltdl-dev, doxygen -Standards-Version: 4.4.0 +Standards-Version: 4.5.1 Section: net Vcs-Browser: https://salsa.debian.org/ellert/globus-scheduler-event-generator Vcs-Git: https://salsa.debian.org/ellert/globus-scheduler-event-generator.git @@ -40,6 +40,8 @@ Section: net Architecture: any Multi-Arch: foreign +Pre-Depends: + ${misc:Pre-Depends} Depends: libglobus-scheduler-event-generator0 (= ${binary:Version}), ${shlibs:Depends}, @@ -82,8 +84,6 @@ Section: doc Architecture: all Multi-Arch: foreign -Pre-Depends: - dpkg (>= 1.17.5) Depends: ${misc:Depends} Description: Grid Community Toolkit - Scheduler Event Generator Documentation Files diff -Nru globus-scheduler-event-generator-6.1/debian/copyright globus-scheduler-event-generator-6.3/debian/copyright --- globus-scheduler-event-generator-6.1/debian/copyright 2019-02-27 18:30:30.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/copyright 2020-12-12 21:52:21.000000000 +0000 @@ -1,17 +1,17 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: globus_scheduler_event_generator Upstream-Contact: https://github.com/gridcf/gct/ -Source: https://repo.gridcf.org/gct6/sources/globus_scheduler_event_generator-6.1.tar.gz +Source: https://repo.gridcf.org/gct6/sources/globus_scheduler_event_generator-6.3.tar.gz Files: * Copyright: 1999-2016 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 -Nru globus-scheduler-event-generator-6.1/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator.init globus-scheduler-event-generator-6.3/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator.init --- globus-scheduler-event-generator-6.1/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator.init 2018-03-02 17:16:41.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator.init 2020-12-15 15:51:48.000000000 +0000 @@ -35,6 +35,8 @@ # limitations under the License. # +. /lib/lsb/init-functions + sbindir=/usr/sbin localstatedir=/var sysconfdir=/etc @@ -45,7 +47,7 @@ test -f ${prog} || exit 0 -lockfile=/var/lock/${progname} +lockfile=/run/lock/${progname} GLOBUS_SEG_LRM_DIR="${GLOBUS_SEG_LRM_DIR:-/etc/globus/scheduler-event-generator}" @@ -62,7 +64,7 @@ fi done -GLOBUS_SEG_PIDFMT="${GLOBUS_SEG_PIDFMT:-/var/run/${progname}-%s.pid}" +GLOBUS_SEG_PIDFMT="${GLOBUS_SEG_PIDFMT:-/run/${progname}-%s.pid}" GLOBUS_SEG_LOGFMT="${GLOBUS_SEG_LOGFMT:-/var/lib/globus/globus-seg-%s}" start() diff -Nru globus-scheduler-event-generator-6.1/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator@.service globus-scheduler-event-generator-6.3/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator@.service --- globus-scheduler-event-generator-6.1/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator@.service 1970-01-01 00:00:00.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/globus-scheduler-event-generator-progs.globus-scheduler-event-generator@.service 2020-12-14 09:00:49.000000000 +0000 @@ -0,0 +1,18 @@ +[Unit] +Description=Globus Scheduler Event Generator for %I +Documentation=man:globus-scheduler-event-generator(8) man:globus-scheduler-event-generator-admin(8) +After=remote_fs.target +ConditionPathExists=/etc/globus/scheduler-event-generator/%i + +[Service] +Type=forking +PIDFile=/run/globus-scheduler-event-generator-%i.pid +ExecStartPre=/bin/sh -c "[ -d /var/lib/globus/globus-seg-%i ] || (umask 022; mkdir /var/lib/globus/globus-seg-%i)" +ExecStart=/usr/sbin/globus-scheduler-event-generator \ + -s %i \ + -p /run/globus-scheduler-event-generator-%i.pid \ + -d /var/lib/globus/globus-seg-%i \ + -b + +[Install] +RequiredBy=multi-user.target diff -Nru globus-scheduler-event-generator-6.1/debian/globus-scheduler-event-generator-progs.install globus-scheduler-event-generator-6.3/debian/globus-scheduler-event-generator-progs.install --- globus-scheduler-event-generator-6.1/debian/globus-scheduler-event-generator-progs.install 2018-03-02 17:16:41.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/globus-scheduler-event-generator-progs.install 2020-12-12 15:26:26.000000000 +0000 @@ -1,5 +1,5 @@ -debian/tmp/usr/sbin/globus-scheduler-event-generator -debian/tmp/usr/sbin/globus-scheduler-event-generator-admin -debian/tmp/usr/share/man/man8/globus-scheduler-event-generator.8 -debian/tmp/usr/share/man/man8/globus-scheduler-event-generator-admin.8 -debian/tmp/etc/default/globus-scheduler-event-generator +/usr/sbin/globus-scheduler-event-generator +/usr/sbin/globus-scheduler-event-generator-admin +/usr/share/man/man8/globus-scheduler-event-generator.8 +/usr/share/man/man8/globus-scheduler-event-generator-admin.8 +/etc/default/globus-scheduler-event-generator diff -Nru globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator0.install globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator0.install --- globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator0.install 2018-03-02 17:16:41.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator0.install 2020-12-12 15:26:26.000000000 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/*/libglobus_scheduler_event_generator.so.* +/usr/lib/*/libglobus_scheduler_event_generator.so.* diff -Nru globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator-dev.install globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator-dev.install --- globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator-dev.install 2018-03-02 17:16:41.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator-dev.install 2020-12-12 15:26:26.000000000 +0000 @@ -1,3 +1,3 @@ -debian/tmp/usr/include/globus/* -debian/tmp/usr/lib/*/libglobus_scheduler_event_generator.so -debian/tmp/usr/lib/*/pkgconfig/globus-scheduler-event-generator.pc +/usr/include/globus/* +/usr/lib/*/libglobus_scheduler_event_generator.so +/usr/lib/*/pkgconfig/globus-scheduler-event-generator.pc diff -Nru globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator-doc.install globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator-doc.install --- globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator-doc.install 2018-03-02 17:16:41.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator-doc.install 2020-12-12 15:26:26.000000000 +0000 @@ -1,2 +1,2 @@ -debian/tmp/usr/share/doc/libglobus-scheduler-event-generator-dev/html -debian/tmp/usr/share/man/man3/* +/usr/share/doc/libglobus-scheduler-event-generator-dev/html +/usr/share/man/man3/* diff -Nru globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator-doc.maintscript globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator-doc.maintscript --- globus-scheduler-event-generator-6.1/debian/libglobus-scheduler-event-generator-doc.maintscript 2019-02-27 16:39:11.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/libglobus-scheduler-event-generator-doc.maintscript 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -symlink_to_dir /usr/share/doc/libglobus-scheduler-event-generator-doc libglobus-scheduler-event-generator-dev 5.7-2~ libglobus-scheduler-event-generator-doc diff -Nru globus-scheduler-event-generator-6.1/debian/rules globus-scheduler-event-generator-6.3/debian/rules --- globus-scheduler-event-generator-6.1/debian/rules 2019-07-12 14:34:49.000000000 +0000 +++ globus-scheduler-event-generator-6.3/debian/rules 2020-12-15 15:51:48.000000000 +0000 @@ -3,6 +3,8 @@ name = globus-scheduler-event-generator +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,-z,defs + INSTALLDIR = debian/tmp _docdir = /usr/share/doc/lib$(name)-dev @@ -14,17 +16,13 @@ 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) \ --with-initscript-config-path=/etc/default/$(name) \ - --with-lockfile-path=/var/lock/$(name) - -override_dh_auto_test: - dh_auto_test -- VERBOSE=1 + --with-lockfile-path=/run/lock/$(name) override_dh_auto_install: dh_auto_install @@ -41,8 +39,8 @@ override_dh_installinit: dh_installinit -p globus-scheduler-event-generator-progs --name=globus-scheduler-event-generator --no-enable -override_dh_missing: - dh_missing --fail-missing +override_dh_installsystemd: + dh_installsystemd -p globus-scheduler-event-generator-progs --name=globus-scheduler-event-generator@ --no-enable override_dh_strip: dh_strip --dbgsym-migration='lib$(name)-dbg (<< 5.12-2~), $(name)-dbg (<< 5.12-2~)' diff -Nru globus-scheduler-event-generator-6.1/dirt.sh globus-scheduler-event-generator-6.3/dirt.sh --- globus-scheduler-event-generator-6.1/dirt.sh 2019-02-26 14:57:39.516733087 +0000 +++ globus-scheduler-event-generator-6.3/dirt.sh 2020-12-12 20:54:25.944897731 +0000 @@ -1,2 +1,2 @@ -DIRT_TIMESTAMP=1550490409 +DIRT_TIMESTAMP=1607703417 DIRT_BRANCH_ID=0 diff -Nru globus-scheduler-event-generator-6.1/Makefile.am globus-scheduler-event-generator-6.3/Makefile.am --- globus-scheduler-event-generator-6.1/Makefile.am 2019-02-26 14:54:28.662822391 +0000 +++ globus-scheduler-event-generator-6.3/Makefile.am 2020-12-12 20:52:21.380897731 +0000 @@ -58,15 +58,15 @@ install-data-local: $(DOC_STAMPS) if test -d doc/man/man3; then \ - install -d -m 755 $(DESTDIR)$(mandir)/man3; \ - $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ - fi + install -d -m 755 $(DESTDIR)$(mandir)/man3 && \ + $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ + fi if test -d doc/html; then \ - for dir in `(cd doc; find html -type d)`; do \ - install -d -m 755 $(DESTDIR)$(docdir)/$$dir; \ + for dir in `cd doc; find html -type d`; do \ + install -d -m 755 $(DESTDIR)$(docdir)/$$dir || exit 1; \ done ; \ - for f in `(cd doc; find html -type f)`; do \ - $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f ; \ + for f in `cd doc; find html -type f`; do \ + $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f || exit 1; \ done ; \ fi diff -Nru globus-scheduler-event-generator-6.1/Makefile.in globus-scheduler-event-generator-6.3/Makefile.in --- globus-scheduler-event-generator-6.1/Makefile.in 2019-02-26 15:00:47.949634741 +0000 +++ globus-scheduler-event-generator-6.3/Makefile.in 2020-12-12 20:57:43.308897731 +0000 @@ -1262,15 +1262,15 @@ install-data-local: $(DOC_STAMPS) if test -d doc/man/man3; then \ - install -d -m 755 $(DESTDIR)$(mandir)/man3; \ - $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ - fi + install -d -m 755 $(DESTDIR)$(mandir)/man3 && \ + $(INSTALL) -m 644 doc/man/man3/[Gg][Ll][Oo][Bb][Uu][Ss]*.3 $(DESTDIR)$(mandir)/man3 ; \ + fi if test -d doc/html; then \ - for dir in `(cd doc; find html -type d)`; do \ - install -d -m 755 $(DESTDIR)$(docdir)/$$dir; \ + for dir in `cd doc; find html -type d`; do \ + install -d -m 755 $(DESTDIR)$(docdir)/$$dir || exit 1; \ done ; \ - for f in `(cd doc; find html -type f)`; do \ - $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f ; \ + for f in `cd doc; find html -type f`; do \ + $(INSTALL) -m 644 doc/$$f $(DESTDIR)$(docdir)/$$f || exit 1; \ done ; \ fi diff -Nru globus-scheduler-event-generator-6.1/test/Makefile.am globus-scheduler-event-generator-6.3/test/Makefile.am --- globus-scheduler-event-generator-6.1/test/Makefile.am 2019-02-26 14:54:28.666822448 +0000 +++ globus-scheduler-event-generator-6.3/test/Makefile.am 2020-12-12 20:52:21.380897731 +0000 @@ -6,7 +6,6 @@ seg-timestamp-test \ seg-api-test check_SCRIPTS = \ - TESTS.pl \ seg-api-test.pl check_DATA = \ seg_api_test_data.txt \ diff -Nru globus-scheduler-event-generator-6.1/test/Makefile.in globus-scheduler-event-generator-6.3/test/Makefile.in --- globus-scheduler-event-generator-6.1/test/Makefile.in 2019-02-26 15:00:48.057635091 +0000 +++ globus-scheduler-event-generator-6.3/test/Makefile.in 2020-12-12 20:57:43.392897731 +0000 @@ -549,7 +549,6 @@ libglobus_seg_timestamp_test_module.la check_SCRIPTS = \ - TESTS.pl \ seg-api-test.pl check_DATA = \ diff -Nru globus-scheduler-event-generator-6.1/test/TESTS.pl globus-scheduler-event-generator-6.3/test/TESTS.pl --- globus-scheduler-event-generator-6.1/test/TESTS.pl 2019-02-26 14:54:28.666822448 +0000 +++ globus-scheduler-event-generator-6.3/test/TESTS.pl 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -#! /usr/bin/perl - -require 5.8.0; - -use strict; -use File::Basename; -use Getopt::Long; -use Test::Harness; -use lib dirname($0); - -use vars qw(@tests); -sub test_exec -{ - my ($harness, $test_file) = @_; - if ($test_file =~ /.pl$/) { - if (-f dirname($0)."/".$test_file) { - return dirname($0)."/".$test_file; - } else { - return undef; - } - } else { - my @cmd; - my $valgrind=""; - if (exists $ENV{VALGRIND}) - { - push(@cmd, 'valgrind'); - push(@cmd, "--log-file=VALGRIND-$test_file.log"); - if (exists $ENV{VALGRIND_OPTIONS}) - { - for my $opt (split(/\s+/, $ENV{VALGRIND_OPTIONS})) { - if ($opt ne '') { - push(@cmd, $opt); - } - } - } - } - push(@cmd, "./$test_file"); - return \@cmd; - } -} -my $harness_class = "TAP::Harness"; - -if (!GetOptions("harness=s" => \$harness_class)) -{ - print STDERR "Usage: $0 [-harness CLASSNAME]\n"; - exit(1); -} - -eval "use $harness_class"; - -my $harness_args = {'exec' => \&test_exec, 'merge' => 1}; -my $harness = $harness_class->new($harness_args); - -my $test_result = 1; -$|=1; - -@tests = qw( - seg-api-test.pl seg-module-load-test seg-timestamp-test -); -$harness->runtests(@tests)