From 0d795f938a800833ca17b42047db10c20671ba71 Mon Sep 17 00:00:00 2001 From: Frank Ueberschar Date: Wed, 22 May 2019 14:10:44 +0200 Subject: [PATCH] docs: removed unneeded files and directories - removed original Makefile - removed unneeded shell script --- docs/debian/compat | 1 - docs/debian/control | 25 ---- docs/debian/copyright | 9 -- docs/debian/docs | 2 - docs/debian/rules | 16 --- docs/manuals/Makefile | 112 ------------------ .../scripts/generate-resoure-descriptions.sh | 17 --- docs/packaging/bareos-docs.changes | 5 - docs/packaging/bareos-docs.dsc | 9 -- docs/packaging/bareos-docs.spec | 61 ---------- docs/packaging/debian.debtransform | 1 - 11 files changed, 258 deletions(-) delete mode 100644 docs/debian/compat delete mode 100644 docs/debian/control delete mode 100644 docs/debian/copyright delete mode 100644 docs/debian/docs delete mode 100644 docs/debian/rules delete mode 100644 docs/manuals/Makefile delete mode 100755 docs/manuals/scripts/generate-resoure-descriptions.sh delete mode 100644 docs/packaging/bareos-docs.changes delete mode 100644 docs/packaging/bareos-docs.dsc delete mode 100644 docs/packaging/bareos-docs.spec delete mode 100644 docs/packaging/debian.debtransform diff --git a/docs/debian/compat b/docs/debian/compat deleted file mode 100644 index 7f8f011eb73..00000000000 --- a/docs/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/docs/debian/control b/docs/debian/control deleted file mode 100644 index 5e23640b360..00000000000 --- a/docs/debian/control +++ /dev/null @@ -1,25 +0,0 @@ -Source: bareos-docs -Priority: extra -Maintainer: Joerg Steffens -Build-Depends: bareos-director, bareos-database-sqlite3, bareos-storage, bareos-filedaemon, bareos-bconsole, bareos-traymonitor, debhelper, ghostscript, imagemagick, librsvg2-bin, pandoc, python, texlive-fonts-recommended, texlive-latex-recommended, tex4ht, perl -Standards-Version: 3.8.4 -Section: doc -Vcs-Git: https://github.com/bareos/bareos-docs.git -Vcs-Browser: https://github.com/bareos/bareos-docs -Homepage: http://www.bareos.org/ - - -Package: bareos-docs -Section: doc -Architecture: all -Depends: ${misc:Depends} -Description: Backup Archiving Recovery Open Sourced - documentation - Bareos is a set of programs to manage backup, recovery and verification - of computer data across a network of computers of different kinds. - . - It is efficient and relatively easy to use, while offering many advanced - storage management features that make it easy to find and recover lost or - damaged files. Due to its modular design, Bareos is scalable from small - single computer systems to networks of hundreds of machines. - . - This package contains the Bareos documentation. diff --git a/docs/debian/copyright b/docs/debian/copyright deleted file mode 100644 index 8386af167d1..00000000000 --- a/docs/debian/copyright +++ /dev/null @@ -1,9 +0,0 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ -Upstream-Name: bareos-docs -Upstream-Contact: Jörg Steffens -Source: https://github.com/bareos/bareos-docs - -Files: * -Copyright: see documents -License: GFDL - diff --git a/docs/debian/docs b/docs/debian/docs deleted file mode 100644 index a8e37b18e84..00000000000 --- a/docs/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -manuals/en/main/bareos-manual-main-reference.pdf -manuals/en/main/html/ diff --git a/docs/debian/rules b/docs/debian/rules deleted file mode 100644 index d6138cba8a0..00000000000 --- a/docs/debian/rules +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -%: - dh $@ - -override_dh_auto_clean: - diff --git a/docs/manuals/Makefile b/docs/manuals/Makefile deleted file mode 100644 index 82cc72d61f8..00000000000 --- a/docs/manuals/Makefile +++ /dev/null @@ -1,112 +0,0 @@ -# -# manuals makefile -# - -BAREOS_DIR=../../../bareos-master/b/systemtests/sbin/bareos-dir -BAREOS_SD=../../../bareos-master/b/systemtests/sbin/bareos-sd -BAREOS_FD=../../../bareos-master/b/systemtests/sbin/bareos-fd -BCONSOLE=../../../bareos-master/b/systemtests/bin/bconsole -BAREOS_TRAY_MONITOR=../../../bareos-master/b/core/src/qt-tray-monitor/bareos-tray-monitor - -AUTOGENERATED_RESOURCE_DESCRIPTION_RST_FILES = include/autogenerated/bareos-dir-*.rst.inc \ - include/autogenerated/bareos-sd-*.rst.inc \ - include/autogenerated/bareos-fd-*.rst.inc \ - include/autogenerated/bconsole-*.rst.inc \ - include/autogenerated/bareos-tray-monitor-*.rst.inc - -AUTOGENERATED_RESOURCE_DESCRIPTION_JSON_FILES = autogenerated/bareos-dir-config-schema.json \ - autogenerated/bareos-sd-config-schema.json \ - autogenerated/bareos-fd-config-schema.json \ - autogenerated/bconsole-config-schema.json \ - autogenerated/bareos-tray-monitor-config-schema.json - -GENERATE_RESOURCE_DESCRIPTIONS_FROM_JSON_FILES=./scripts/generate-resoure-descriptions.py --sphinx --quiet - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -SPHINXPROJ = BareosMainReference -SOURCEDIR = source -BUILDDIR = BareosMainReference - -all: $(AUTOGENERATED_RESOURCE_DESCRIPTION_RST_FILES) - make sphinx - make check-json-files-for-changes - -all-rebuild-json: - make clean clean-json-files - make all - -include/autogenerated/bareos-dir-*.rst.inc: autogenerated/bareos-dir-config-schema.json - @# generates all director-resource files - $(GENERATE_RESOURCE_DESCRIPTIONS_FROM_JSON_FILES) autogenerated/bareos-dir-config-schema.json - -include/autogenerated/bareos-sd-*.rst.inc: autogenerated/bareos-sd-config-schema.json - @# generates all storage daemon resource files - $(GENERATE_RESOURCE_DESCRIPTIONS_FROM_JSON_FILES) autogenerated/bareos-sd-config-schema.json - -include/autogenerated/bareos-fd-*.rst.inc: autogenerated/bareos-fd-config-schema.json - @# generates all file daemon resource files - $(GENERATE_RESOURCE_DESCRIPTIONS_FROM_JSON_FILES) autogenerated/bareos-fd-config-schema.json - -include/autogenerated/bconsole-*.rst.inc: autogenerated/bconsole-config-schema.json - @# generates all bconsole resource files - $(GENERATE_RESOURCE_DESCRIPTIONS_FROM_JSON_FILES) autogenerated/bconsole-config-schema.json - -include/autogenerated/bareos-tray-monitor-*.rst.inc: autogenerated/bareos-tray-monitor-config-schema.json - @# generates all tray-monitor resource files - $(GENERATE_RESOURCE_DESCRIPTIONS_FROM_JSON_FILES) autogenerated/bareos-tray-monitor-config-schema.json - -autogenerated/bareos-dir-config-schema.json: - @# generate config-schema file. - @# Test if creation succeeded, if yes, redirect output to a json file. - @test -f "$(BAREOS_DIR)" || (echo "\"$(BAREOS_DIR)\" does not exist"; exit 1) - $(BAREOS_DIR) -xs >/dev/null && \ - $(BAREOS_DIR) -xs > autogenerated/bareos-dir-config-schema.json; - -autogenerated/bareos-sd-config-schema.json: - @# generate config-schema file. - @# Test if creation succeeded, if yes, redirect output to a json file. - @test -f "$(BAREOS_SD)" || (echo "\"$(BAREOS_SD)\" does not exist"; exit 1) - $(BAREOS_SD) -xs >/dev/null && \ - $(BAREOS_SD) -xs > autogenerated/bareos-sd-config-schema.json; - -autogenerated/bareos-fd-config-schema.json: - @# generate config-schema file. - @# Test if creation succeeded, if yes, redirect output to a json file. - @test -f "$(BAREOS_FD)" || (echo "\"$(BAREOS_FD)\" does not exist"; exit 1) - $(BAREOS_FD) -xs >/dev/null && \ - $(BAREOS_FD) -xs > autogenerated/bareos-fd-config-schema.json; - -autogenerated/bconsole-config-schema.json: - @# generate config-schema file. - @# Test if creation succeeded, if yes, redirect output to a json file. - @test -f "$(BCONSOLE)" || (echo "\"$(BCONSOLE)\" does not exist"; exit 1) - $(BCONSOLE) -xs >/dev/null && \ - $(BCONSOLE) -xs > autogenerated/bconsole-config-schema.json; - -autogenerated/bareos-tray-monitor-config-schema.json: - @# generate config-schema file. - @# Test if creation succeeded, if yes, redirect output to a json file. - @test -f "$(BAREOS_TRAY_MONITOR)" || (echo "\"$(BAREOS_TRAY_MONITOR)\" does not exist"; exit 1) - $(BAREOS_TRAY_MONITOR) -xs >/dev/null && \ - $(BAREOS_TRAY_MONITOR) -xs > autogenerated/bareos-tray-monitor-config-schema.json; - -sphinx: - @$(SPHINXBUILD) -M html "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) - -check-json-files-for-changes: - @git diff --quiet source/include/autogenerated/ || echo "!!! *** Attention, config directive has changed *** !!!" - -clean: - rm -rf BareosMainReference - rm -rf autogenerated/*.rst.inc #this does not reset the json files - -clean-json-files: - rm -rf autogenerated/*.json - -distclean: - make clean - rm -f source/_extensions/*.pyc - git checkout -f source/include/autogenerated #this will reset the json files - diff --git a/docs/manuals/scripts/generate-resoure-descriptions.sh b/docs/manuals/scripts/generate-resoure-descriptions.sh deleted file mode 100755 index e7ea4a2f7d8..00000000000 --- a/docs/manuals/scripts/generate-resoure-descriptions.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -e -set -u - -BASEDIR=`dirname $0` -TARGETDIR="${BASEDIR}" -# relative from TARGETDIR -SCRIPTDIR="../../scripts" -DATADIR="../autogenerated" - -cd ${TARGETDIR} - -for i in ${DATADIR}/*-config-schema.json; do - printf "%s:\n" "`basename $i`" - ${SCRIPTDIR}/generate-resoure-descriptions.py -d $i -done diff --git a/docs/packaging/bareos-docs.changes b/docs/packaging/bareos-docs.changes deleted file mode 100644 index bbfa65f1a81..00000000000 --- a/docs/packaging/bareos-docs.changes +++ /dev/null @@ -1,5 +0,0 @@ -bareos-docs (15.2.0-1) unstable; urgency=low - - * Initial release - - -- Joerg Steffens Wed, 20 May 2015 10:00:00 +0200 diff --git a/docs/packaging/bareos-docs.dsc b/docs/packaging/bareos-docs.dsc deleted file mode 100644 index c42fee0eaea..00000000000 --- a/docs/packaging/bareos-docs.dsc +++ /dev/null @@ -1,9 +0,0 @@ -Format: 1.0 -Source: bareos-docs -Binary: bareos-docs -Architecture: all -Version: 16.2 -Maintainer: Joerg Steffens -Standards-Version: 3.8.4 -Build-Depends: bareos-director, bareos-database-sqlite3, bareos-storage, bareos-filedaemon, bareos-bconsole, bareos-traymonitor, debhelper, dvipng, ghostscript, graphviz, imagemagick, librsvg2-bin, pandoc, python, texlive-fonts-recommended, texlive-latex-extra, tex4ht, python-sphinx, python-sphinx-rtd-theme, texlive-generic-extra, python-sphinxcontrib.plantuml, plantuml, python-sphinxcontrib.blockdiag, python-sphinxcontrib.seqdiag, python-sphinxcontrib.actdiag, python-sphinxcontrib.nwdiag, python-sphinx-issues -DEBTRANSFORM-RELEASE: unstable; urgency=low diff --git a/docs/packaging/bareos-docs.spec b/docs/packaging/bareos-docs.spec deleted file mode 100644 index fe8007b5b0d..00000000000 --- a/docs/packaging/bareos-docs.spec +++ /dev/null @@ -1,61 +0,0 @@ -#!BuildIgnore: post-build-checks -# -# spec file for package bareos-docs -# -# Copyright (c) 2013-2018 Bareos GmbH & Co. KG -# - -Name: bareos-docs -Version: 0.0.0 -Release: 0 -License: GFDL-1.3 -Summary: Documentation -Url: http://www.bareos.org -Group: Productivity/Archiving/Backup -Source: %{name}-%version.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch -# bareos-database-sqlite3 is the database backend -# that has minimal additional dependencies -BuildRequires: bareos-common >= 14.3.0 -BuildRequires: bareos-director bareos-database-sqlite3 -BuildRequires: bareos-storage bareos-filedaemon bareos-bconsole bareos-traymonitor -BuildRequires: python -BuildRequires: texlive-latex -BuildRequires: texlive-tex4ht ImageMagick -BuildRequires: graphviz graphviz-gnome -BuildRequires: pandoc python-Sphinx -%if ( 0%{?rhel_version} || 0%{?fedora_version} ) -BuildRequires: texlive-collection-latexrecommended texlive-moreverb texlive-ifmtarg texlive-xifthen -%endif - - -%description -Bareos - Backup Archiving Recovery Open Sourced. -Bareos is a set of computer programs that permit you (or the system -administrator) to manage backup, recovery, and verification of computer -data across a network of computers of different kinds. In technical terms, -it is a network client/server based backup program. Bareos is relatively -easy to use and efficient, while offering many advanced storage management -features that make it easy to find and recover lost or damaged files. - -This package contains the Bareos documentation. - - -%prep -%setup -q - -%build -cd manuals/en/new_main_reference -make - -find - -%install - - - -%files -%defattr(-,root,root) -%doc manuals/en/new_main_reference/BareosMainReference -%changelog diff --git a/docs/packaging/debian.debtransform b/docs/packaging/debian.debtransform deleted file mode 100644 index b90c561dd03..00000000000 --- a/docs/packaging/debian.debtransform +++ /dev/null @@ -1 +0,0 @@ -# this file is only required to activate debtransform from Open Build Service (OBS)