added debian-specific directory

debian/changelog

@@ -1,5 +1,5 @@
-daps (2.1.5-1) wily; urgency=low
+daps (4.0.0-1) UNRELEASED; urgency=low
 
   * Initial release.
 
- -- Christoph Berg <[email protected]>  Mon, 14 Dec 2015 15:49:06 +0100
+ -- Tomáš Bažant <[email protected]>  Wed, 22 Nov 2023 17:27:10 +0100

debian/clean-source-tarball.sh

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+rm -rf debian test
+rm -rf .github/ .gitignore .travis*
+

debian/compat

@@ -1 +1 @@
-9
+10

debian/control

@@ -1,67 +1,102 @@
 Source: daps
 Section: text
 Priority: optional
-Maintainer: Haug Bürger <[email protected]>
-Build-Depends: autotools-dev,
-               bash (>=4),
-               debhelper (>=9),
-               dia,
-               dh-autoreconf,
-               docbook,
-               docbook-xml,
-               docbook-xsl (>=1.7.8),
-               ghostscript,
-               imagemagick,
-               libxml2-utils,
-               make,
-               poppler-utils,
-               python-libxml2,
-               python-lxml,
-               xml-core,
-               xmlstarlet,
-               xsltproc
-Standards-Version: 3.9.6
+Maintainer: Filippo Rusconi <[email protected]>
+Build-Depends: 
+ debhelper,
+ dh-python,
+ python3,
+ ditaa,
+ epubcheck,
+ remake,
+ fop,
+ jing,
+ dia,
+ optipng,
+ exiftool,
+ libreoffice-draw,
+ asciidoctor,
+ w3m,
+ trang,
+ libsaxon-java,
+ libsaxonb-java,
+ libsaxonhe-java,
+ docbook-xml,
+ docbook5-xml (>=5.2),
+ docbook-xsl,
+ docbook-xsl-ns,
+ ghostscript,
+ imagemagick,
+ inkscape,
+ libxml2-utils,
+ poppler-utils,
+ python3-libxml2,
+ python3-lxml,
+ xml-core,
+ xmlstarlet,
+ xsltproc,
+ docbook-to-man
+Standards-Version: 4.6.1
 Homepage: http://opensuse.github.io/daps
-Vcs-Git: https://github.com/openSUSE/daps.git
-Vcs-Browser: https://github.com/openSUSE/daps
+Vcs-Browser: https://salsa.debian.org/lopippo/daps
+Vcs-Git: https://salsa.debian.org/lopippo/daps.git
 
 Package: daps
 Architecture: all
 Depends: bash (>=4),
-         bzip2,
-         docbook,
-         docbook-xml,
-         docbook-xsl (>=1.7.8),
-         fop (>= 0.96),
-         imagemagick,
-         inkscape,
-         libxml2-utils,
-         libxml-commons-external-java,
-         libxmlgraphics-commons-java,
-         make,
-         poppler-utils,
-         python-libxml2,
-         python-lxml,
-         sgml-base,
-         sgml-data,
-         w3m,
-         xml-core,
-         xmlstarlet,
-         xsltproc,
-         zip,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Recommends: aspell,
-            docbook5-xml,
-            docbook-xsl-ns,
-            jing
+ bzip2,
+ docbook-xml,
+ docbook5-xml,
+ docbook-xsl,
+ docbook-xsl-ns,
+ ditaa,
+ epubcheck,
+ remake,
+ fop,
+ jing,
+ dia,
+ optipng,
+ exiftool,
+ libsaxon-java,
+ libsaxonb-java,
+ libsaxonhe-java,
+ libavalon-framework-java,
+ ghostscript,
+ imagemagick,
+ inkscape,
+ libxml2-utils,
+ libxml-commons-external-java,
+ libxmlgraphics-commons-java,
+ make,
+ remake,
+ poppler-utils,
+ python3,
+ python3-libxml2,
+ python3-lxml,
+ sgml-base,
+ sgml-data,
+ w3m,
+ xml-core,
+ xmlstarlet,
+ xsltproc,
+ zip,
+ docbook-mathml,
+ libjs-mathjax,
+ fonts-mathjax,
+ fonts-mathjax-extras,
+ libjeuclid-core-java,
+ libjeuclid-fop-java,
+ ${misc:Depends},
+ ${perl:Depends},
+ ${python3:Depends}
+Recommends: aspell
 Suggests: aspell-en,
-          calibre,
-          checkbot,
-          epubcheck,
-          dia,
-          optipng,
-          xmlformat-perl
+ calibre,
+ libreoffice-draw,
+ xfig,
+ xmlformat-perl,
+ asciidoctor,
+ trang
 Description: DocBook Authoring and Publishing Suite (DAPS)
  DAPS contains a set of stylesheets, scripts and makefiles that enable
  you to create HTML, PDF, EPUB and other formats from DocBook XML with a
@@ -71,7 +106,3 @@ Description: DocBook Authoring and Publishing Suite (DAPS)
  DAPS also includes tools that assist you when writing DocBook XML:
  linkchecker, validator, spellchecker, editor macros and stylesheets for
  converting DocBook XML.
- .
- DAPS is the successor of susedoc. See
- /usr/share/doc/packages/daps/README.upgrade_from_susedoc_4.x
- for upgrade instructions.

debian/copyright

@@ -1,29 +1,36 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: daps
 Source: https://github.com/openSUSE/daps
+Comment: From a "cleaning" perspective, I removed a number of files.
+Files-Excluded:
+ debian
+ build
+ .pc
+ autom4te.cache
 
-Files:     *
-Copyright: 2012-2015 SUSE Linux GmbH
+Files: *
+Copyright: 2012-2019 SUSE Linux GmbH
 License:   GPL-2+
 
 Files: debian/*
 Copyright: 2015 Haug Bürger <[email protected]>
            2015 Christoph Berg <[email protected]>
+           2019 Filippo Rusconi <[email protected]>
 License: GPL-2+
 
 License: GPL-2+
- This package is free software; you can redistribute it and/or modify
+ This program is free software: you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation, either version 3 of the License, or
  (at your option) any later version.
  .
- This package is distributed in the hope that it will be useful,
+ This program is distributed in the hope that it will be useful,
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
  .
  You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".

debian/daps.doc-base.quick-guide

@@ -0,0 +1,11 @@
+Document: daps-quick-guide
+Title: DAPS quick guide
+Author: Stefan Knorr, Tanja Roth, Manuel Schnitzer, Christopher-Julian Zwickl
+Abstract: The DAPS Quick Start is a short introduction to DAPS for technical writers. It includes step-by-step instructions for key editing and publishing tasks.
+Section: Typesetting
+
+Format: HTML
+Files: /usr/share/doc/daps/daps-quick
+Index: /usr/share/doc/daps/daps-quick/index.html
+
+

debian/daps.doc-base.user-guide

@@ -0,0 +1,11 @@
+Document: daps-user-guide
+Title: DAPS user guide
+Author: Tanja Roth, Stefan Knorr, Thomas Schraitle, Frank Sundermeyer
+Abstract: The DAPS User Guide is a comprehensive guide for technical writers using DAPS. It guides you through creating, editing, managing and publishing your documents—be it a short article by a single author or a large documentation project written by multiple authors.
+Section: Typesetting
+
+Format: HTML
+Files: /usr/share/doc/daps/daps-user
+Index: /usr/share/doc/daps/daps-user/index.html
+
+

debian/daps.docs

@@ -0,0 +1,2 @@
+doc/build/daps-quick/single-html/daps-quick/
+doc/build/daps-user/single-html/daps-user/

debian/patches/fix-adoc-comparison.patch

@@ -0,0 +1,12 @@
+Fixed comparison sign from == to = which woeks in debian's sh
+--- a/make/adoc2xml.mk
++++ b/make/adoc2xml.mk
+@@ -85,7 +85,7 @@
+
+ _ADOC_VERSION_SORT := $(shell echo "$(_ADOC_VERSION)" | tr " " "\n" | sort -b --version-sort )
+
+-_ADOC_SUPPORTS_FAILURE := $(shell if [ "$(_ADOC_VERSION)" == "$(_ADOC_VERSION_SORT)" ]; then echo "yes"; else echo "no"; fi)
++_ADOC_SUPPORTS_FAILURE := $(shell if [ "$(_ADOC_VERSION)" = "$(_ADOC_VERSION_SORT)" ]; then echo "yes"; else echo "no"; fi)
+
+ ifeq "$(strip $(_ADOC_SUPPORTS_FAILURE))" "yes"
+   ADOC_FAILURE := --failure-level $(ADOC_FAILURE_LEVEL)

debian/patches/fix-parallel-makefile-execution.patch

@@ -0,0 +1,12 @@
+Fix the parallel execution of the install make target.
+Thanks to Santiago Vila <[email protected]> for the report and the fix
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1731,6 +1731,7 @@
+ 	  tar c --mode=u+w,go+r-w,a-s -C $$BOOK . | \
+ 		(cd $(DESTDIR)$(docdir)/html; tar xp); \
+ 	done
++	mkdir -p $(DESTDIR)$(bindir)
+ 	install -m755 autobuild/daps-autobuild $(DESTDIR)$(bindir)
+ 	install -m644 autobuild/daps-autobuild.rnc $(DESTDIR)$(datadir)/xml/$(PACKAGE)/schema/
+ 	install -m644 autobuild/daps-autobuild.xml $(DESTDIR)$(templatedir)

debian/patches/fix-validate.mk-daps-jing-wrapper-call.patch

@@ -0,0 +1,11 @@
+--- a/make/validate.mk
++++ b/make/validate.mk
+@@ -63,7 +63,7 @@
+   ifeq "$(DOCBOOK_VERSION)" "4"
+ 	$(eval FAULTY_XML=$(shell xmllint --noent --postvalid --noout --xinclude $(PROFILED_MAIN) 2>&1 ))
+   else
+-	$(eval FAULTY_XML=$(shell unset VERBOSE && $(JING_WRAPPER) $(JING_FLAGS) $(DOCBOOK5_RNG) $(PROFILED_MAIN) 2>&1))
++	$(eval FAULTY_XML=$($(JING_WRAPPER) $(JING_FLAGS) $(DOCBOOK5_RNG) $(PROFILED_MAIN) 2>&1))
+   endif
+   ifneq "$(strip $(NOT_VALIDATE_TABLES))" "1"
+ 	$(eval FAULTY_TABLES=$(shell $(LIBEXEC_DIR)/validate-tables.py $(PROFILED_MAIN) 2>&1 | sed -r -e 's,^/([^/: ]+/)*,,' -e 's,.http://docbook.org/ns/docbook.,,' | sed -rn '/^- / !p' | awk -v ORS='\\n' '1'))

debian/patches/remove-which-call-flags.patch

@@ -0,0 +1,14 @@
+This patch remove the --skip-alias --skip-functions flags to the which command
+call because the Debian which program does not support them.
+
+--- a/bin/daps-xmlformat.in
++++ b/bin/daps-xmlformat.in
+@@ -20,7 +20,7 @@
+ # take the first one that exists
+ #
+ for _BINARY in xmlformat xmlformat.pl xmlformat.rb; do
+-    XMLFORMAT_CMD="$(which --skip-alias --skip-functions "$_BINARY" 2>/dev/null)" && break
++    XMLFORMAT_CMD="$(which "$_BINARY" 2>/dev/null)" && break
+ done
+
+ _XMLF_VERSION=$($XMLFORMAT_CMD --version 2>/dev/null | head -n1 | cut -d' ' -f2)

debian/patches/series

@@ -1 +1,5 @@
-fix-xmlcatalog-output.patch
+fix-parallel-makefile-execution.patch
+fix-validate.mk-daps-jing-wrapper-call.patch
+remove-which-call-flags.patch
+
+fix-adoc-comparison.patch

debian/rules

@@ -4,18 +4,17 @@
 
 override_dh_auto_configure:
 	dh_auto_configure -- --sysconfdir=/etc --disable-edit-rootcatalog
+	dh_python3
+
+override_dh_auto_install:
+	dh_auto_install
 
 override_dh_install:
 	dh_installxmlcatalogs
 
-	# Remove obsolete catalog file
-	rm debian/daps/etc/xml/for-catalog-daps.xml
-
-	# Remove obsolete licenceses and documentation
+	# Remove obsolete licences and documentation
 	rm debian/daps/usr/share/doc/daps/COPYING \
-	   debian/daps/usr/share/doc/daps/COPYING-2.0 \
-	   debian/daps/usr/share/doc/daps/COPYING-3.0 \
-	   debian/daps/usr/share/doc/daps/INSTALL.adoc
+		 debian/daps/usr/share/doc/daps/COPYING-2.0 \
+		 debian/daps/usr/share/doc/daps/COPYING-3.0 \
+		 debian/daps/usr/share/doc/daps/INSTALL.adoc
 
-	# Remove the language extension of the Perl script
-	mv debian/daps/usr/bin/daps-auto.pl debian/daps/usr/bin/daps-auto