From 41f5c0f3ecafa9079e3492c14efbd7cf1854bc16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Fri, 6 Nov 2015 23:40:38 +0000 Subject: [PATCH] updated author woth new homepage --- AUTHORS | 2 +- backup-generic.spec.in | 2 +- configure.ac | 6 ++++++ debian/control.in | 2 +- ...up-generic.texi => backup-generic.texi.in} | 7 +++---- scripts/makefile.am | 21 +++++++------------ 6 files changed, 19 insertions(+), 21 deletions(-) rename scripts/{backup-generic.texi => backup-generic.texi.in} (99%) diff --git a/AUTHORS b/AUTHORS index bd79912..86ccdef 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1 @@ -Marc Wäckerlin (http://marc.waeckerlin.org) +Marc Wäckerlin (https://marc.wäckerlin.ch) diff --git a/backup-generic.spec.in b/backup-generic.spec.in index 4a3e174..b1fb5a0 100644 --- a/backup-generic.spec.in +++ b/backup-generic.spec.in @@ -6,7 +6,7 @@ License: LGPL Group: Applications/... Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: gnupg, subversion, automake, autoconf, doxygen +BuildRequires: gnupg, subversion, automake, autoconf, doxygen, texinfo %if 0%{?fedora} != 20 BuildRequires: graphviz %endif diff --git a/configure.ac b/configure.ac index 846d8a5..7201e40 100644 --- a/configure.ac +++ b/configure.ac @@ -33,5 +33,11 @@ AX_USE_RPM_PACKAGING #AX_REQUIRE_QT([QT], [QtCore QtGui QtNetwork], [QtWidgets]) #AX_QT_NO_KEYWORDS +# create scripts from in-files +AC_CONFIG_FILES([scripts/backup-generic scripts/check_backup + scripts/backup-generic.texi scripts/variables.texi + scripts/check_backup.cfg scripts/escalate-backup + scripts/setup-backup]) + # create output AC_OUTPUT diff --git a/debian/control.in b/debian/control.in index 273bbad..5ab370f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -1,7 +1,7 @@ Source: @PACKAGE_NAME@ Priority: extra Maintainer: @AUTHOR@ -Build-Depends: debhelper, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen +Build-Depends: debhelper, subversion, svn2cl, pkg-config, automake, libtool, autotools-dev, lsb-release , doxygen, graphviz, mscgen, texinfo Package: @PACKAGE_NAME@ Section: diff --git a/scripts/backup-generic.texi b/scripts/backup-generic.texi.in similarity index 99% rename from scripts/backup-generic.texi rename to scripts/backup-generic.texi.in index 7a75788..e8f2af4 100644 --- a/scripts/backup-generic.texi +++ b/scripts/backup-generic.texi.in @@ -10,7 +10,7 @@ @c %**end of header @copying -Copyright @copyright{} 2012 @verbatiminclude AUTHORS +Copyright @copyright{} 2012 @verbatiminclude @top_srcdir@/AUTHORS @end copying @titlepage @@ -48,7 +48,7 @@ This manual is for @value{PACKAGE}, version @value{VERSION}. @node Introduction @chapter Introduction -@include README +@include @top_srcdir@/README @@ -475,8 +475,7 @@ parameter. In case of an error, the backup is executed immediately. @chapter Copying @cindex copying @cindex license -@verbatiminclude COPYING - +@verbatiminclude @top_srcdir@/COPYING @node Index @unnumbered Index diff --git a/scripts/makefile.am b/scripts/makefile.am index 9327da1..fff3b95 100644 --- a/scripts/makefile.am +++ b/scripts/makefile.am @@ -3,9 +3,10 @@ ## 1 2 3 4 5 6 7 8 ## 45678901234567890123456789012345678901234567890123456789012345678901234567890 -EXTRA_DIST = debian bootstrap.sh backup-generic.in setup-backup.in \ - check_backup.in check_backup.cfg.in escalate-backup.in \ - icinga-monitoring.png variables.texi.in +EXTRA_DIST = backup-generic.in setup-backup.in check_backup.in \ + check_backup.cfg.in escalate-backup.in \ + icinga-monitoring.png variables.texi.in \ + backup-generic.texi.in sbin_SCRIPTS = backup-generic setup-backup escalate-backup dist_sysconf_DATA = backup.conf @@ -16,15 +17,7 @@ icingaplugin_SCRIPTS = check_backup icingapluginnrpeconfigdir = ${sysconfdir}/nagios/nrpe.d icingapluginnrpeconfig_DATA = check_backup.cfg -info_TEXINFOS = backup-generic.texi -backup_generic_TEXINFOS = variables.texi +info_TEXINFOS = +backup_generic_TEXINFOS = backup-generic.texi variables.texi -deb: distdir - cd ${distdir} && dpkg-buildpackage - -distclean-local: - -rm -rf ${distdir} - -MAINTAINERCLEANFILES = configure ltmain.sh INSTALL COPYING aclocal.m4 \ - install-sh missing makefile.in @PACKAGE@_@VERSION@* \ - debian/changelog debian/control mdate-sh texinfo.tex +MAINTAINERCLEANFILES = makefile.in texinfo.tex