From fc2e98f6b1dcdd93d4627222e2448731af1afd9066cf2b55a580132a1e3da193 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 8 Mar 2012 11:17:04 +0000 Subject: [PATCH 01/20] Version 1.0beta1: * Rebuild large parts to make DAPS distribution-independent. - rewrote Makefile for automake/autoconf => configure; make; make install is now supported - thorough cross-distribution testing is still needed, basic tests have been run on RedHat, Debian and Ubuntu * removal of custom stylesheets DAPS no longer uses the SUSE stylesheets as a default. It even no longer contains the SUSE stylesheets - they are now available as a separate package (suse-xsl-stylesheets in Documentation:Tools). - By default DAPS uses the generic DocBook stylesheets now - Custom stylesheets such as the SUSE stylesheets can be used by specifying up to four parameters on the command line/the config files: * Styleroot: Directory containing the custom stylesheets. Must have the same directory structure as the original DocBook stylesheet root directory. Does _not_ need to contain stylesheets for all output formats. If stylesheets are not found, DAPS will automatically fall back to the DocBook stylesheets. - Variable: STYLEROOT - Parameter: --styleroot - Value: absolute path to directory * Fallback styleroot Custom fallback styleroot. If DAPS cannot find styles for the given output format, it will automatically fall back to the DocBook stylesheets. This config option will add a custom fallback directory with higher priority. The DocBook stylesheets will remain as a last resort, however. - Variable: FALLBACK_STYLEROOT OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=79 --- daps-0.9.2.tar.bz2 | 3 - daps-1.0beta1.tar.bz2 | 3 + daps-fetch-source | 12 +-- daps.changes | 121 ++++++++++++++++++++++++++++++ daps.rpmlintrc | 7 +- daps.spec | 170 ++++++++++++++---------------------------- 6 files changed, 192 insertions(+), 124 deletions(-) delete mode 100644 daps-0.9.2.tar.bz2 create mode 100644 daps-1.0beta1.tar.bz2 diff --git a/daps-0.9.2.tar.bz2 b/daps-0.9.2.tar.bz2 deleted file mode 100644 index c511420..0000000 --- a/daps-0.9.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2186e65dfa4b0fca2804861e7222b180771672ecd1a2248129502b2f548c8525 -size 788920 diff --git a/daps-1.0beta1.tar.bz2 b/daps-1.0beta1.tar.bz2 new file mode 100644 index 0000000..81c0190 --- /dev/null +++ b/daps-1.0beta1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d125d1d3a6dd41c2a8dda81580a13bb244e53bebb61d103a8b1e1aabed3cb9ba +size 863196 diff --git a/daps-fetch-source b/daps-fetch-source index 16c5735..c459cbe 100644 --- a/daps-fetch-source +++ b/daps-fetch-source @@ -9,7 +9,7 @@ # Frank Sundermeyer # -set -x +#set -x NAME=daps VERSION= @@ -47,7 +47,7 @@ fi # # Export daps from SVN # -svn export $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed" +svn export -q $SVNPATH ${TMPDIR}/${NAME} || exit_on_error "SVN export failed" # # Get the version number @@ -62,11 +62,13 @@ fi # Create the tarball # export BZIP2=--best -tar cvjhf ${NAME}-${VERSION}.tar.bz2 -C ${TMPDIR} \ +tar chf ${NAME}-${VERSION}.tar -C ${TMPDIR} \ --exclude-from=$EXCLUDES ${NAME} || exit_on_error "Failed to create the tarball." +tar rhf ${NAME}-${VERSION}.tar -C ${TMPDIR} ${NAME}/suse/xslt \ + || exit_on_error "Failed to add suse/xslt to the tarball." +bzip2 -9f ${NAME}-${VERSION}.tar -echo "Successfully created ${NAME}-${VERSION}.tar.bz2" - +echo "Successfully wrote source tarball ${NAME}-${VERSION}.tar.bz2" # # Copy the spec file if necessary # diff --git a/daps.changes b/daps.changes index ccf96b7..2828e54 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,124 @@ +------------------------------------------------------------------- +Wed Mar 7 15:54:22 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0beta1: + +* Rebuild large parts to make DAPS distribution-independent. + - rewrote Makefile for automake/autoconf + => configure; make; make install is now supported + - thorough cross-distribution testing is still needed, basic tests + have been run on RedHat, Debian and Ubuntu + +* removal of custom stylesheets + DAPS no longer uses the SUSE stylesheets as a default. It even no + longer contains the SUSE stylesheets - they are now available as a + separate package (suse-xsl-stylesheets in Documentation:Tools). + + - By default DAPS uses the generic DocBook stylesheets now + - Custom stylesheets such as the SUSE stylesheets can be used by + specifying up to four parameters on the command line/the config + files: + * Styleroot: + Directory containing the custom stylesheets. Must have the same + directory structure as the original DocBook stylesheet root + directory. Does _not_ need to contain stylesheets for all output + formats. If stylesheets are not found, DAPS will automatically + fall back to the DocBook stylesheets. + - Variable: STYLEROOT + - Parameter: --styleroot + - Value: absolute path to directory + * Fallback styleroot + Custom fallback styleroot. If DAPS cannot find styles for the + given output format, it will automatically fall back to the + DocBook stylesheets. This config option will add a custom + fallback directory with higher priority. The DocBook stylesheets + will remain as a last resort, however. + - Variable: FALLBACK_STYLEROOT + - Parameter: --fb_styleroot + - Value: absolute path to directory + * CSS files: + Specify CSS files for HTML and/or CSS. By default no CSS file + will be used. + - Variables: HTML_CSS, EPUB_CSS + - Parameter: --css for html and epub targets + (daps -d html--css ) + - Value: absolute path to file + +* rewrote FOP formatter handling - both supported formatters (FOP/XEP) are + now controlled by the following variables: + *_WRAPPER (wrapper script, libexec/daps-fop, libexec/daps-xep by default) + *_CONFIG (xml config file, etc/daps/xep/xep-daps.xml and + etc/daps/fop/fop-daps.xml by default. A specific fop-daps.xml + is installed for RedHat and SUSE by default) + *_OPTIONS (Command line options) + + +* renaming of parameters and variables + In order to make parameters and variables "self-speaking" the + following has been renamed: + + - File ENV-file to DC-file (doc config file) + - Variable BASE_DIR to DOC_DIR (doc dir) => Terminology! + - Variable DTDROOT to DAPSROOT (daps installation directory) + - Variable FOP_TYPE to FORMATTER + + - command line switch --fop to --formatter + - command line switch -e/--envfile has been renamed to + -d/--docconfig (-e/--envfile will still be supported) + + +* global parameter --base_dir no longer supported + + Instead of specifying --base_dir with daps, you now need to specify a + full path (either relative or absolute) to the DC-file. However, the + "magic" that automatically tries to determine the path to a DC-file + when you do not specify a path or not even a DC file, still applies. + Therefore you only need to specify a valid path to the DC-file in + cases where you would have used --base_dir with previous DAPS + versions. + +* --main parameter / MAIN + + Instead of calling daps with -d/--docconfig you can also directly + specify a MAIN with --main=. You need to specify a valid + relative or absolute path. If you just specify a + file name, ./xml/$MAIN is automatically assumed. + +* packaging + + The former DAPS version has been split into two packages: + - daps + - suse-xsl-stylesheets (SUSE stylesheets, NovDOC DTD, SUSE aspell + wordlist) + +* other DAPS changes since 0.9.2 in brief: + - stylesheet images have been moved to fit the directory structure used + in the original stylesheets + - new variable STYLEDEVEL which can be used when developing stylesheets. + STYLEDEVEL _always_ takes precedence over STYLEROOT and can be set in + $USER_CONFIG + - Rewrote handling of profiling variables PROFARCH, PROFCONDITION, + PROFVENDOR, PROFOS - all 4 are now fully supported (formerly only + PROFOS and PROFARCH were fully supported) + - created catalog entry to resolve stylesheets in daps_xslt + - daps init has been moved to a separate script bin/daps-init + - each SUSE stylesheet file now contains a short overview of purpose + and parameters + - lots of stylesheet bugfixes + - license: GPL 2.0 or 3.0 at your choice + - fixed target man for man-page generation; man pages are not gzip'ed + by default (unless you specify --nogzip); manpage subdirectories + (man1, man2,...) are no longer created by default, but can rather be + enabled via the --subdirs switch + - new parameter --check for target epub checks build with epubcheck + - added very basic DocBook5 support (with xslt 1.0 stylesheets only) + still a lot to do on this front + - Default HTML format is now XHTML 1.0 (instead of HTML 4.01). Use + --html4 to generate HTML 4.01 + - auto generate SUSE HTML4 stylesheets from XHTML stylesheets + - binaries that are only called from withion make have been moved to + libexec/ + ------------------------------------------------------------------- Mon Jan 9 15:30:47 UTC 2012 - toms@suse.de diff --git a/daps.rpmlintrc b/daps.rpmlintrc index 4d89dab..fb3f1cd 100644 --- a/daps.rpmlintrc +++ b/daps.rpmlintrc @@ -1,5 +1,8 @@ addFilter("explicit-lib-dependency libxml2") addFilter("explicit-lib-dependency libxslt") addFilter("explicit-lib-dependency liberation-fonts") -#addFilter("non-executable-script .*/bin/create_dm_docu.py") -#addFilter("non-executable-script .*/bin/dm/test_dm.py") +addFilter("non-executable-script .*/bin/dm/test_dm.py") +# migration script for old susedoc projects, no man page needed +addFilter("no-manual-page-for-binary env_convert") +# internally used only, no man page needed +addFilter("no-manual-page-for-binary daps-xmlformat") diff --git a/daps.spec b/daps.spec index 88c80c5..ca9025c 100644 --- a/daps.spec +++ b/daps.spec @@ -1,163 +1,151 @@ # # spec file for package daps # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# + Name: daps -Version: 0.9.2 +Version: 1.0beta1 +Release: 0 -%define dtdversion 1.0 -%define dtdname novdoc %define docbuilddir %{_datadir}/daps %define regcat %{_bindir}/sgml-register-catalog %define fontdir %{_datadir}/fonts/truetype %define dbstyles %{_datadir}/xml/docbook/stylesheet/nwalsh/current -%define root_catalog for-catalog-%{dtdname}-%{dtdversion}.xml -%define daps_catalog for-catalog-%{name}-%{version}.xml +%define daps_catalog for-catalog-%{name}.xml -Release: 1 Summary: DocBook Authoring and Publishing Suite License: GPL-2.0 or GPL-3.0 Group: Productivity/Publishing/XML -URL: http://sourceforge.net/p/daps +Url: http://sourceforge.net/p/daps Source0: %{name}-%{version}.tar.bz2 Source1: %{name}.rpmlintrc Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: bash >= 4.0 BuildRequires: dia -BuildRequires: docbook_4 BuildRequires: docbook-xsl-stylesheets >= 1.75 -BuildRequires: python-xml +BuildRequires: docbook_4 %if 0%{?suse_version} > 1140 BuildRequires: perl-Image-ExifTool %else BuildRequires: exiftool %endif +%if 0%{?suse_version} >= 1220 +BuildRequires: libxml2-tools +%endif +BuildRequires: ImageMagick BuildRequires: fam BuildRequires: fdupes -BuildRequires: ImageMagick BuildRequires: inkscape BuildRequires: libxslt +BuildRequires: openSUSE-release BuildRequires: optipng +BuildRequires: python-xml BuildRequires: sgml-skel +BuildRequires: suse-xsl-stylesheets BuildRequires: svg-dtd -BuildRequires: trang BuildRequires: transfig -BuildRequires: unzip -BuildRequires: xorg-x11-devel # the following requirements are not really needed for building, but we add # them nevertheless in order to see if the build target is able to fullfill # the requirements for installation +BuildRequires: LinuxLibertine BuildRequires: dejavu BuildRequires: freefont BuildRequires: ghostscript-library -BuildRequires: java BuildRequires: liberation-fonts -BuildRequires: LinuxLibertine BuildRequires: mplus-fonts -BuildRequires: opensp BuildRequires: poppler-tools -BuildRequires: xalan-j2 -BuildRequires: xml-commons-resolver BuildRequires: xmlformat -BuildRequires: xmlstarlet -BuildRequires: zip %if 0%{?suse_version} >= 1140 BuildRequires: perl-checkbot BuildRequires: xmlgraphics-fop >= 0.94 %else +BuildRequires: fop >= 0.94 %if %{undefined sles_version} BuildRequires: checkbot %endif -BuildRequires: fop >= 0.94 -BuildRequires: xerces-j2 -%if 0%{?suse_version} == 1130 -BuildRequires: xml-commons-jaxp-1.3-apis -%endif -%if 0%{?suse_version} < 1130 -BuildRequires: xml-commons-apis-bootstrap -%endif %endif + %if 0%{?suse_version} < 1120 BuildRequires: python-xml %endif - PreReq: libxml2 PreReq: sgml-skel +Requires: ImageMagick +Requires: LinuxLibertine +Requires: bash >= 4.0 Requires: dejavu Requires: dia -Requires: docbook_4 Requires: docbook-xsl-stylesheets >= 1.75 +Requires: docbook_4 Requires: exiftool Requires: fam Requires: freefont Requires: ghostscript-library -Requires: ImageMagick Requires: inkscape -Requires: java -Requires: libxslt Requires: liberation-fonts -Requires: LinuxLibertine +Requires: libxslt Requires: make Requires: mplus-fonts -Requires: opensp Requires: optipng Requires: poppler-tools Requires: sgml-skel Requires: svg-dtd Requires: transfig -Requires: unzip -Requires: xalan-j2 -Requires: xml-commons-resolver -Requires: xmlformat -Requires: xmlstarlet -Requires: zip %if 0%{?suse_version} >= 1140 Requires: perl-checkbot Requires: xmlgraphics-fop >= 0.94 %else +Requires: fop >= 0.94 %if %{undefined sles_version} -Requires: checkbot +Requires: checkbot %else Recommends: checkbot %endif -Requires: fop >= 0.94 -Requires: xerces-j2 -%if 0%{?suse_version} == 1130 -Requires: xml-commons-jaxp-1.3-apis -%endif -%if 0%{?suse_version} < 1130 -Requires: xml-commons-apis-bootstrap -%endif %endif %if 0%{?suse_version} < 1120 -BuildRequires: python-xml +Requires: python-xml %endif Recommends: agfa-fonts -Recommends: aspell aspell-en aspell-en-huge +Recommends: aspell aspell-en +# Only works only for openSUSE 11.4 and below +%if 0%{?suse_version} < 1210 +Recommends: aspell-en-huge +%endif Recommends: daps-docmanager +Recommends: docbook_5 Recommends: emacs psgml +Recommends: epubcheck # Split of ttf-founder-simplified and ttf-founder-traditional Recommends: FZFangSong FZHeiTi FZSongTi Recommends: fifth-leg-font +Recommends: jing Recommends: remake # needed to create ePUBs Recommends: ruby # Japanese Fonts: Recommends: sazanami-fonts +Recommends: suse-xsl-stxlesheets # Chinese Recommends: ttf-arphic # Korean Fonts: @@ -168,7 +156,6 @@ Recommends: xep #Obsoletes: susedoc <= 4.3.27 Provides: susedoc < 4.4 - %description DocBook Authoring and Publishing Suite (DAPS) @@ -193,51 +180,28 @@ for upgrade instructions. #-------------------------------------------------------------------------- %build -# specifying VERSION is manadatory!! -%__make %{?_smp_mflags} VERSION=%{version} +%configure --docdir=%{_defaultdocdir}/%{name} --disable-edit-rootcatalog +%__make %{?_smp_mflags} #-------------------------------------------------------------------------- %install -# specifying VERSION is manadatory!! -make install DESTDIR=$RPM_BUILD_ROOT VERSION=%{version} - -# make_install macro does not have a DESTDIR in 11.1/SLE 11 !! -#%#make_install VERSION=%{version} +make install DESTDIR=$RPM_BUILD_ROOT # create symlinks: %fdupes -s $RPM_BUILD_ROOT/%{_datadir} #---------------------- %post -# SGM CATALOG # -if [ -x %{regcat} ]; then - for CATALOG in CATALOG.%{dtdname}-%{dtdversion}; do - %{regcat} -a %{_datadir}/sgml/$CATALOG >/dev/null 2>&1 || true - done -fi -# XML Catalog +# XML Catalog entries for daps profiling # # remove existing entries first (if existing) - needed for # zypper in, since it does not call postun # -# The first two ones are only there for campatibility reasons and -# can be removed in the future -# +# delete ... edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{version} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}xslt-%{version} -# -# These two entries need to stay -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{dtdversion} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version} -# -# now add new entries -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add /etc/xml/%{root_catalog} + --del %{name} +# ... and add it again edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --add /etc/xml/%{daps_catalog} @@ -246,44 +210,24 @@ exit 0 #---------------------- %postun -if [ ! -f %{_sysconfdir}/xml/%{root_catalog} -a -x /usr/bin/edit-xml-catalog ] ; then - for c in CATALOG.%{dtdname}-%{dtdversion}; do - %{regcat} -r %{_datadir}/sgml/$c >/dev/null 2>&1 - done -# XML Catalog # -# The first two ones are only there for campatibility reasons and -# can be removed in the future -# -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{version} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}xslt-%{version} -# -# These two entries need to stay -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{dtdname}-%{dtdversion} -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version} +# delete catalog entry for daps profiling +if [ -x /usr/bin/edit-xml-catalog ] ; then + edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --del %{name} fi %run_suseconfig_fonts exit 0 - #---------------------- %files %defattr(-,root,root) %dir %{fontdir} %dir %{_sysconfdir}/%{name} -%dir %{_datadir}/xml/%{dtdname} -%dir %{_datadir}/xml/%{dtdname}/schema -%dir %{_datadir}/xml/%{dtdname}/schema/* -%dir %{_datadir}/xml/%{dtdname}/schema/*/1.0 %dir %{_defaultdocdir}/%{name} -%config /var/lib/sgml/CATALOG.* %config %{_sysconfdir}/xml/*.xml %config %{_sysconfdir}/%{name}/* @@ -291,12 +235,10 @@ exit 0 %doc %{_defaultdocdir}/%{name}/* %{_bindir}/* -%{_datadir}/sgml/CATALOG.* %{_datadir}/emacs/site-lisp/docbook_macros.el %{fontdir}/* %{docbuilddir} -%{_datadir}/xml/%{dtdname}/schema/dtd/%{dtdversion}/* -%{_datadir}/xml/%{dtdname}/schema/rng/%{dtdversion}/* #---------------------- + %changelog From c23bccfb66beea1173e09baf6b02159e4613a192ca3722949ae95fc9f9fe7d25 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 15 Mar 2012 10:17:42 +0000 Subject: [PATCH 02/20] Version 1.0beta2: * Bugfix: Finally found the correct solution for adding/removing catalog entries in the spec file * Enhancement: webhelp suppport OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=80 --- daps-1.0beta1.tar.bz2 | 3 --- daps-1.0beta2.tar.bz2 | 3 +++ daps-fetch-source | 2 +- daps.changes | 10 ++++++++++ daps.spec | 7 ++++++- 5 files changed, 20 insertions(+), 5 deletions(-) delete mode 100644 daps-1.0beta1.tar.bz2 create mode 100644 daps-1.0beta2.tar.bz2 diff --git a/daps-1.0beta1.tar.bz2 b/daps-1.0beta1.tar.bz2 deleted file mode 100644 index 81c0190..0000000 --- a/daps-1.0beta1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d125d1d3a6dd41c2a8dda81580a13bb244e53bebb61d103a8b1e1aabed3cb9ba -size 863196 diff --git a/daps-1.0beta2.tar.bz2 b/daps-1.0beta2.tar.bz2 new file mode 100644 index 0000000..5bd31fb --- /dev/null +++ b/daps-1.0beta2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33c0d9edcf15d3bba24a65da62ba9d2ae35c4f2dd80b96614f15d47ad2315790 +size 1308579 diff --git a/daps-fetch-source b/daps-fetch-source index c459cbe..684f668 100644 --- a/daps-fetch-source +++ b/daps-fetch-source @@ -14,7 +14,7 @@ NAME=daps VERSION= SPECFILE=${NAME}.spec -SVNPATH=https://svn.code.sf.net/p/daps/svn/trunk/daps +SVNPATH=svn://svn.code.sf.net/p/daps/svn/trunk/daps TMPDIR=$(mktemp -q -d --tmpdir daps_XXXXXXXX) EXCLUDES=${TMPDIR}/${NAME}/packaging/exclude-files_for_daps_package.txt diff --git a/daps.changes b/daps.changes index 2828e54..94fd6e5 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 15 10:12:39 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0beta2: + +* Bugfix: + Finally found the correct solution for adding/removing catalog + entries in the spec file +* Enhancement: webhelp suppport + ------------------------------------------------------------------- Wed Mar 7 15:54:22 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index ca9025c..0e1f14c 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0beta1 +Version: 1.0beta2 Release: 0 %define docbuilddir %{_datadir}/daps @@ -212,12 +212,17 @@ exit 0 %postun # # delete catalog entry for daps profiling +# only run if package is really uninstalled ($1 = 0) and not +# in case of an update +# +if [ 0 = $1 ]; then if [ -x /usr/bin/edit-xml-catalog ] ; then edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --del %{name} fi %run_suseconfig_fonts +fi exit 0 #---------------------- From 744748f839e80aa2ad02b7006dec9b866bf4d3c08d621fdf148aa7c79efa15ae Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 15 Mar 2012 15:38:56 +0000 Subject: [PATCH 03/20] * showvariable now only shows the result to make it better suited for script usage OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=81 --- daps-1.0beta2.tar.bz2 | 4 ++-- daps.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/daps-1.0beta2.tar.bz2 b/daps-1.0beta2.tar.bz2 index 5bd31fb..fa4667b 100644 --- a/daps-1.0beta2.tar.bz2 +++ b/daps-1.0beta2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:33c0d9edcf15d3bba24a65da62ba9d2ae35c4f2dd80b96614f15d47ad2315790 -size 1308579 +oid sha256:0907f3397efa0bedc5670bc4353b9ce9a67134b2f2124e4e132c55f9264c8685 +size 1308640 diff --git a/daps.changes b/daps.changes index 94fd6e5..15d053e 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Mar 15 15:38:26 UTC 2012 - fsundermeyer@opensuse.org + +* showvariable now only shows the result to make it better suited + for script usage + ------------------------------------------------------------------- Thu Mar 15 10:12:39 UTC 2012 - fsundermeyer@opensuse.org From baf2dea131a42aca2c7869f8f86dac5be76c6a8044a4844ebba3dd96fda74770 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 16 Mar 2012 16:02:48 +0000 Subject: [PATCH 04/20] * Bugfix: Typo in Makefile caused wrong catalog entries OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=82 --- daps-1.0beta2.tar.bz2 | 4 ++-- daps.changes | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/daps-1.0beta2.tar.bz2 b/daps-1.0beta2.tar.bz2 index fa4667b..1be7ef2 100644 --- a/daps-1.0beta2.tar.bz2 +++ b/daps-1.0beta2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0907f3397efa0bedc5670bc4353b9ce9a67134b2f2124e4e132c55f9264c8685 -size 1308640 +oid sha256:6d4963133063d13887bb1f53ff3fa74cf30e3fdc314d390a191b99e5de119289 +size 1306641 diff --git a/daps.changes b/daps.changes index 15d053e..6a5b17c 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Mar 16 16:01:26 UTC 2012 - fsundermeyer@opensuse.org + +* Bugfix: Typo in Makefile caused wrong catalog entries + ------------------------------------------------------------------- Thu Mar 15 15:38:26 UTC 2012 - fsundermeyer@opensuse.org From 27c5ae0e8820257b5771cb678c8d8f59051fe2271dcc32c6663aafdc554deab1 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Tue, 20 Mar 2012 13:15:28 +0000 Subject: [PATCH 05/20] Bugfix: Typo in Makefile caused catalog error OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=83 --- daps-1.0beta2.tar.bz2 | 4 ++-- daps.changes | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/daps-1.0beta2.tar.bz2 b/daps-1.0beta2.tar.bz2 index 1be7ef2..7721cf4 100644 --- a/daps-1.0beta2.tar.bz2 +++ b/daps-1.0beta2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d4963133063d13887bb1f53ff3fa74cf30e3fdc314d390a191b99e5de119289 -size 1306641 +oid sha256:d9d7efa83a42004603d3e33814df628de856cb41a4d10ba2e6030b4124287a49 +size 1342588 diff --git a/daps.changes b/daps.changes index 6a5b17c..afb4f2e 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 20 13:14:16 UTC 2012 - fsundermeyer@opensuse.org + +* Bugfix: Target for index generation had wrong ending + (.idx instead of .ind) + ------------------------------------------------------------------- Fri Mar 16 16:01:26 UTC 2012 - fsundermeyer@opensuse.org From bb5ba667ea8f958fe3b6462de5d1bf1c118295db8af8c34b9c748b86d5675589 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Wed, 28 Mar 2012 09:00:47 +0000 Subject: [PATCH 06/20] Version 1.0 RC1 * Bugfixes: - fixed minor package building issues - inkscape always returns 0, even in case of an error. Added a workaround, so daps now exits when an image conversion with inkscape fails - --main option should work now - Fixed errors on setting the fallback stylesheets - comments and remarks did not show up in the docs when requested (again ;-(( ) - this is fixed now * much better error handling - daps will now exit when wrong paths or a non existing ROOTID are entered in the user config file or the DC file * significant enhancements to the Documentation (Reference & Quickstart) OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=84 --- daps-1.0RC1.tar.bz2 | 3 +++ daps-1.0beta2.tar.bz2 | 3 --- daps.changes | 20 ++++++++++++++++++++ daps.spec | 2 +- 4 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 daps-1.0RC1.tar.bz2 delete mode 100644 daps-1.0beta2.tar.bz2 diff --git a/daps-1.0RC1.tar.bz2 b/daps-1.0RC1.tar.bz2 new file mode 100644 index 0000000..fa80dd7 --- /dev/null +++ b/daps-1.0RC1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6087fcc3a56704a8a36bcd9b6dd1c2e38a13e15b24ace6050db4a464af26c26e +size 1349155 diff --git a/daps-1.0beta2.tar.bz2 b/daps-1.0beta2.tar.bz2 deleted file mode 100644 index 7721cf4..0000000 --- a/daps-1.0beta2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d9d7efa83a42004603d3e33814df628de856cb41a4d10ba2e6030b4124287a49 -size 1342588 diff --git a/daps.changes b/daps.changes index afb4f2e..53be422 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Mar 28 08:44:22 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0 RC1 + +* Bugfixes: + - fixed minor package building issues + - inkscape always returns 0, even in case of an error. Added + a workaround, so daps now exits when an image conversion with + inkscape fails + - --main option should work now + - Fixed errors on setting the fallback stylesheets + - comments and remarks did not show up in the docs when requested + (again ;-(( ) - this is fixed now +* much better error handling - daps will now exit when wrong paths + or a non existing ROOTID are entered in the user config file + or the DC file +* significant enhancements to the Documentation + (Reference & Quickstart) + ------------------------------------------------------------------- Tue Mar 20 13:14:16 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 0e1f14c..5dc2dc9 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0beta2 +Version: 1.0RC1 Release: 0 %define docbuilddir %{_datadir}/daps From e364ec5ef6fa7b621ed35ddc5e4d488ef55b82e3bda90d4d55b165ec97ef6027 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Wed, 28 Mar 2012 10:43:48 +0000 Subject: [PATCH 07/20] * Bugfix: Only issue a hint when XEP/FOP_WRAPPER do not exist OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=85 --- daps-1.0RC1.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daps-1.0RC1.tar.bz2 b/daps-1.0RC1.tar.bz2 index fa80dd7..c5a5ed5 100644 --- a/daps-1.0RC1.tar.bz2 +++ b/daps-1.0RC1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6087fcc3a56704a8a36bcd9b6dd1c2e38a13e15b24ace6050db4a464af26c26e -size 1349155 +oid sha256:6af09f665092826c0de8021261f15cc06fb593445972f6db87aa78b4dadd0134 +size 1349239 From 197dc706bbfa9522dfcdced64af1f2b2e7582c7c9cdc08a1c6ff60c75d895cd4 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 29 Mar 2012 09:16:02 +0000 Subject: [PATCH 08/20] Version 1.0 RC2 * Bugfixes: - issue a hint rather than exiting when XEP/FOP_WRAPPER do not exist - daps_xslt/yelp/*.xsl was not installed by make install OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=86 --- daps-1.0RC1.tar.bz2 | 3 --- daps-1.0RC2.tar.bz2 | 3 +++ daps.changes | 10 ++++++++++ daps.spec | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 daps-1.0RC1.tar.bz2 create mode 100644 daps-1.0RC2.tar.bz2 diff --git a/daps-1.0RC1.tar.bz2 b/daps-1.0RC1.tar.bz2 deleted file mode 100644 index c5a5ed5..0000000 --- a/daps-1.0RC1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6af09f665092826c0de8021261f15cc06fb593445972f6db87aa78b4dadd0134 -size 1349239 diff --git a/daps-1.0RC2.tar.bz2 b/daps-1.0RC2.tar.bz2 new file mode 100644 index 0000000..d80de55 --- /dev/null +++ b/daps-1.0RC2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9439a237cada39ee19156804fd90e947adecc48a705ced33f29adc151beb837 +size 1299774 diff --git a/daps.changes b/daps.changes index 53be422..cce0976 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 29 09:12:37 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0 RC2 + +* Bugfixes: + - issue a hint rather than exiting when XEP/FOP_WRAPPER do not + exist + - daps_xslt/yelp/*.xsl was not installed by make install + ------------------------------------------------------------------- Wed Mar 28 08:44:22 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 5dc2dc9..1c1a6ae 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0RC1 +Version: 1.0RC2 Release: 0 %define docbuilddir %{_datadir}/daps From ce3e2ebbc32cb7cb7cd7a9f8c94a4b5dbf362ce86a99d1daef0b1a114345798e Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 29 Mar 2012 12:57:03 +0000 Subject: [PATCH 09/20] Issuing hint on missing formatter scripts only when verbosity is >= 1 OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=87 --- daps-1.0RC2.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daps-1.0RC2.tar.bz2 b/daps-1.0RC2.tar.bz2 index d80de55..a08a4c6 100644 --- a/daps-1.0RC2.tar.bz2 +++ b/daps-1.0RC2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e9439a237cada39ee19156804fd90e947adecc48a705ced33f29adc151beb837 -size 1299774 +oid sha256:d398809c21318b6ddddcdf998fc00f34244c4a1002313ef0ad229292fd57f883 +size 1300149 From 21ff33f6005bb190f4e0c416bf55ceb480c9b6456a9f8cb5430b61820b67e337 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 30 Mar 2012 19:43:56 +0000 Subject: [PATCH 10/20] Version 1.0 RC3 * Bugfixes: - Issuing hint on missing formatter scripts only when verbosity is >= 1 - spec-file: Fixed typo on suse-xsl-stylesheet recommends python-xml needs to be a general requirement - fixed path to callouts and style images for FO * Lots of minor documentation fixes/enhancements OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=88 --- daps-1.0RC2.tar.bz2 | 3 --- daps-1.0RC3.tar.bz2 | 3 +++ daps.changes | 15 +++++++++++++++ daps.spec | 10 ++-------- 4 files changed, 20 insertions(+), 11 deletions(-) delete mode 100644 daps-1.0RC2.tar.bz2 create mode 100644 daps-1.0RC3.tar.bz2 diff --git a/daps-1.0RC2.tar.bz2 b/daps-1.0RC2.tar.bz2 deleted file mode 100644 index a08a4c6..0000000 --- a/daps-1.0RC2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d398809c21318b6ddddcdf998fc00f34244c4a1002313ef0ad229292fd57f883 -size 1300149 diff --git a/daps-1.0RC3.tar.bz2 b/daps-1.0RC3.tar.bz2 new file mode 100644 index 0000000..81df29b --- /dev/null +++ b/daps-1.0RC3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:852f7c3679555f483d86c9bb8e05071f31c14dca7fbf0cc648a3d266e819bfa9 +size 1298367 diff --git a/daps.changes b/daps.changes index cce0976..1b2fe2c 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Mar 30 19:37:13 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0 RC3 + +* Bugfixes: + - Issuing hint on missing formatter scripts only when verbosity + is >= 1 + - spec-file: Fixed typo on suse-xsl-stylesheet recommends + python-xml needs to be a general requirement + - fixed path to callouts and style images for FO + + +* Lots of minor documentation fixes/enhancements + ------------------------------------------------------------------- Thu Mar 29 09:12:37 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 1c1a6ae..92f21ee 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0RC2 +Version: 1.0RC3 Release: 0 %define docbuilddir %{_datadir}/daps @@ -83,10 +83,6 @@ BuildRequires: checkbot %endif %endif -%if 0%{?suse_version} < 1120 -BuildRequires: python-xml -%endif - PreReq: libxml2 PreReq: sgml-skel @@ -122,9 +118,7 @@ Requires: checkbot Recommends: checkbot %endif %endif -%if 0%{?suse_version} < 1120 Requires: python-xml -%endif Recommends: agfa-fonts Recommends: aspell aspell-en @@ -145,7 +139,7 @@ Recommends: remake Recommends: ruby # Japanese Fonts: Recommends: sazanami-fonts -Recommends: suse-xsl-stxlesheets +Recommends: suse-xsl-stylesheets # Chinese Recommends: ttf-arphic # Korean Fonts: From 318cdb879868c58126d45b2446e8ca1819e0480970934b66e413eeac9d7c9c85 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 30 Mar 2012 19:56:01 +0000 Subject: [PATCH 11/20] New configure script due to version upgrade OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=89 --- daps-1.0RC3.tar.bz2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/daps-1.0RC3.tar.bz2 b/daps-1.0RC3.tar.bz2 index 81df29b..bf4e188 100644 --- a/daps-1.0RC3.tar.bz2 +++ b/daps-1.0RC3.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:852f7c3679555f483d86c9bb8e05071f31c14dca7fbf0cc648a3d266e819bfa9 -size 1298367 +oid sha256:fd330f40e6ab28b072edef53b454a6169c95dde71e61fa0e25e096d3dff8808e +size 1298413 From 5f2f00bb67ff1dabcce9279279987a713d2ab9b74d20f956b406ca299c069a68 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Mon, 2 Apr 2012 12:29:36 +0000 Subject: [PATCH 12/20] Version 1.0 RC4 * Bugfix: - Not all links were dereferenced with --static OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=90 --- daps-1.0RC3.tar.bz2 | 3 --- daps-1.0RC4.tar.bz2 | 3 +++ daps.changes | 9 +++++++++ daps.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 daps-1.0RC3.tar.bz2 create mode 100644 daps-1.0RC4.tar.bz2 diff --git a/daps-1.0RC3.tar.bz2 b/daps-1.0RC3.tar.bz2 deleted file mode 100644 index bf4e188..0000000 --- a/daps-1.0RC3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd330f40e6ab28b072edef53b454a6169c95dde71e61fa0e25e096d3dff8808e -size 1298413 diff --git a/daps-1.0RC4.tar.bz2 b/daps-1.0RC4.tar.bz2 new file mode 100644 index 0000000..7728a29 --- /dev/null +++ b/daps-1.0RC4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:21cc2938f01edb29870120c73b8633f03957591b99ded78be089562a464187df +size 1361829 diff --git a/daps.changes b/daps.changes index 1b2fe2c..43d74be 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Apr 2 12:28:49 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0 RC4 + +* Bugfix: + - Not all links were dereferenced with --static + + ------------------------------------------------------------------- Fri Mar 30 19:37:13 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 92f21ee..25df075 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0RC3 +Version: 1.0RC4 Release: 0 %define docbuilddir %{_datadir}/daps From 4a93471795894e711be700f297e0ee9e02b6153663f12ed14efa7928b701db4b Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Mon, 2 Apr 2012 14:23:39 +0000 Subject: [PATCH 13/20] version 1.0 RC5: * Bugfix: - Setting stack size for FOP to 512k in wrapper script, otherwise builds on i586 fail during hyphenation OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=91 --- daps-1.0RC4.tar.bz2 | 3 --- daps-1.0RC5.tar.bz2 | 3 +++ daps.changes | 9 +++++++++ daps.spec | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 daps-1.0RC4.tar.bz2 create mode 100644 daps-1.0RC5.tar.bz2 diff --git a/daps-1.0RC4.tar.bz2 b/daps-1.0RC4.tar.bz2 deleted file mode 100644 index 7728a29..0000000 --- a/daps-1.0RC4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:21cc2938f01edb29870120c73b8633f03957591b99ded78be089562a464187df -size 1361829 diff --git a/daps-1.0RC5.tar.bz2 b/daps-1.0RC5.tar.bz2 new file mode 100644 index 0000000..bc1cd3e --- /dev/null +++ b/daps-1.0RC5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d1622acff9d7172e25e254c8c0f8512020535297c255d18fa1ead86a302abee1 +size 1361824 diff --git a/daps.changes b/daps.changes index 43d74be..18aef0e 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Apr 2 14:22:05 UTC 2012 - fsundermeyer@opensuse.org + +version 1.0 RC5: + +* Bugfix: + - Setting stack size for FOP to 512k in wrapper script, otherwise + builds on i586 fail during hyphenation + ------------------------------------------------------------------- Mon Apr 2 12:28:49 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index 25df075..d01017a 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0RC4 +Version: 1.0RC5 Release: 0 %define docbuilddir %{_datadir}/daps From c9354eb921a0272611cafbf03b572c35e4aeed3078a6d9837cbde89d179b7324 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Tue, 3 Apr 2012 10:07:02 +0000 Subject: [PATCH 14/20] Version 1.0: Bugfix: - Use XEP/FOP wrapper scripts by default OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=92 --- daps-1.0.tar.bz2 | 3 +++ daps-1.0RC5.tar.bz2 | 3 --- daps.changes | 8 ++++++++ daps.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 daps-1.0.tar.bz2 delete mode 100644 daps-1.0RC5.tar.bz2 diff --git a/daps-1.0.tar.bz2 b/daps-1.0.tar.bz2 new file mode 100644 index 0000000..9432fcf --- /dev/null +++ b/daps-1.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9f90102e71146ea14b772c081becf71d4088a1ead4406f26c4a469a3999416a5 +size 1298358 diff --git a/daps-1.0RC5.tar.bz2 b/daps-1.0RC5.tar.bz2 deleted file mode 100644 index bc1cd3e..0000000 --- a/daps-1.0RC5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d1622acff9d7172e25e254c8c0f8512020535297c255d18fa1ead86a302abee1 -size 1361824 diff --git a/daps.changes b/daps.changes index 18aef0e..90b862c 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Apr 3 10:04:42 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0: + +Bugfix: + - Use XEP/FOP wrapper scripts by default + ------------------------------------------------------------------- Mon Apr 2 14:22:05 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.spec b/daps.spec index d01017a..a51fbc8 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0RC5 +Version: 1.0 Release: 0 %define docbuilddir %{_datadir}/daps From fe5eaee973c47d44465c21845f8784df7fb0afd4da752bb739a447c74173aaf5 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Tue, 24 Apr 2012 13:07:06 +0000 Subject: [PATCH 15/20] Version 1.0.1 (Bugfix Release): * Important: - in order to avoid confusion with short options for daps itself (such as -d for --docconfig and --draft), the subcommands only support long options now. The following short options for subcommands are no longer supported: -c (use --comments) -d (use --draft) -f (use --file) -m (use --meta) -n (use --name) -p (use --pretty) -r (use --remarks) -s (use --show) - the only short option that will remain is -h (help) * Bugfixes: - target warn-images did not work - target missinggraphics did not show all missing images - daps failed with a useless error message when $MAIN was not well-formed. The fix produces a useful error message now - --remarks option did not work with DocBook stylesheets - paths specified on the command line or the config file had to be absolute. The fix now allows to also specify relative paths for all configurable directories and files - COMMENTS_STR, DRAFT_STR and REMARK_STR were not correctly unset when one of these modes was not set on the command line but implied by another mode (e.g. --meta). The result was a wrong filename - target webhelp-dir-name was missing - draft.png was not shown in PDF/HTML draft builds when using the OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=93 --- daps-1.0.1.tar.bz2 | 3 +++ daps-1.0.tar.bz2 | 3 --- daps.changes | 51 ++++++++++++++++++++++++++++++++++++++++++++++ daps.rpmlintrc | 5 +++-- daps.spec | 5 +++-- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 daps-1.0.1.tar.bz2 delete mode 100644 daps-1.0.tar.bz2 diff --git a/daps-1.0.1.tar.bz2 b/daps-1.0.1.tar.bz2 new file mode 100644 index 0000000..56ae6c0 --- /dev/null +++ b/daps-1.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84fd327c23d967aa29fd714c75e789ef2d8047e4afc5fa74581d9a538afe8efe +size 1366714 diff --git a/daps-1.0.tar.bz2 b/daps-1.0.tar.bz2 deleted file mode 100644 index 9432fcf..0000000 --- a/daps-1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9f90102e71146ea14b772c081becf71d4088a1ead4406f26c4a469a3999416a5 -size 1298358 diff --git a/daps.changes b/daps.changes index 90b862c..b4aee83 100644 --- a/daps.changes +++ b/daps.changes @@ -1,3 +1,54 @@ +------------------------------------------------------------------- +Tue Apr 24 12:58:25 UTC 2012 - fsundermeyer@opensuse.org + +Version 1.0.1 (Bugfix Release): + +* Important: + - in order to avoid confusion with short options for daps itself + (such as -d for --docconfig and --draft), + the subcommands only support long options now. The following + short options for subcommands are no longer supported: + -c (use --comments) + -d (use --draft) + -f (use --file) + -m (use --meta) + -n (use --name) + -p (use --pretty) + -r (use --remarks) + -s (use --show) + - the only short option that will remain is -h (help) + +* Bugfixes: + - target warn-images did not work + - target missinggraphics did not show all missing images + - daps failed with a useless error message when $MAIN was not + well-formed. The fix produces a useful error message now + - --remarks option did not work with DocBook stylesheets + - paths specified on the command line or the config file had to + be absolute. The fix now allows to also specify relative paths + for all configurable directories and files + - COMMENTS_STR, DRAFT_STR and REMARK_STR were not correctly unset + when one of these modes was not set on the command line but + implied by another mode (e.g. --meta). The result was a wrong + filename + - target webhelp-dir-name was missing + - draft.png was not shown in PDF/HTML draft builds when using the + DocBook Stylesheets + - Due to a variable name mismatch, the --name option did not work + properly + - target showvariable exited with an error if requested variable was + empty + - config options FOP_CONFIG and XEP_CONFIG were not used. The fix + renames them to FOP_CONFIG_FILE and XEP_CONFIG_FILE - these + variables are used in the wrapper scripts + - FOP_WRAPPER and XEP_WRAPPER were not set correctly when + DAPSROOT was set + +* Documentation: + - Quickstart Guide: Finished + - User Guide: Significant additions, but still work in progress + + ------------------------------------------------------------------- Tue Apr 3 10:04:42 UTC 2012 - fsundermeyer@opensuse.org diff --git a/daps.rpmlintrc b/daps.rpmlintrc index fb3f1cd..1e6ae67 100644 --- a/daps.rpmlintrc +++ b/daps.rpmlintrc @@ -1,8 +1,9 @@ addFilter("explicit-lib-dependency libxml2") addFilter("explicit-lib-dependency libxslt") addFilter("explicit-lib-dependency liberation-fonts") -addFilter("non-executable-script .*/bin/dm/test_dm.py") +addFilter("non-executable-script .*/daps/lib/daps_functions") # migration script for old susedoc projects, no man page needed -addFilter("no-manual-page-for-binary env_convert") +addFilter("no-manual-page-for-binary daps-envconvert") # internally used only, no man page needed +addFilter("no-manual-page-for-binary daps-susespell") addFilter("no-manual-page-for-binary daps-xmlformat") diff --git a/daps.spec b/daps.spec index a51fbc8..683203e 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0 +Version: 1.0.1 Release: 0 %define docbuilddir %{_datadir}/daps @@ -36,7 +36,7 @@ Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: bash >= 4.0 +BuildRequires: bash >= 3.0 BuildRequires: dia BuildRequires: docbook-xsl-stylesheets >= 1.75 BuildRequires: docbook_4 @@ -238,6 +238,7 @@ exit 0 %{fontdir}/* %{docbuilddir} +%exclude %{_defaultdocdir}/%{name}/INSTALL #---------------------- %changelog From 1b1ec4dfa6db424fd9eff375fc9f4a3be6014867c59d3045a24c7e1cb4839618 Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Wed, 25 Apr 2012 14:10:35 +0000 Subject: [PATCH 16/20] Bugfixing the bugfix release OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=94 --- daps-1.0.1.tar.bz2 | 3 --- daps-1.0.11.tar.bz2 | 3 +++ daps.spec | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 daps-1.0.1.tar.bz2 create mode 100644 daps-1.0.11.tar.bz2 diff --git a/daps-1.0.1.tar.bz2 b/daps-1.0.1.tar.bz2 deleted file mode 100644 index 56ae6c0..0000000 --- a/daps-1.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84fd327c23d967aa29fd714c75e789ef2d8047e4afc5fa74581d9a538afe8efe -size 1366714 diff --git a/daps-1.0.11.tar.bz2 b/daps-1.0.11.tar.bz2 new file mode 100644 index 0000000..1dd2f31 --- /dev/null +++ b/daps-1.0.11.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aebfbd917334dad237810676c8203f75b4d935b816ff7be3c2f20cc7c0ff7f9b +size 1408803 diff --git a/daps.spec b/daps.spec index 683203e..9e49f82 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0.1 +Version: 1.0.11 Release: 0 %define docbuilddir %{_datadir}/daps @@ -239,6 +239,7 @@ exit 0 %{docbuilddir} %exclude %{_defaultdocdir}/%{name}/INSTALL + #---------------------- %changelog From 8535a6454bdf2999324882894e5331ff58de098359ab51c15260d5111d09632f Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 26 Apr 2012 10:46:37 +0000 Subject: [PATCH 17/20] Corrected typo OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=95 --- daps-1.0.11.tar.bz2 | 3 --- daps-1.0.12.tar.bz2 | 3 +++ daps.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 daps-1.0.11.tar.bz2 create mode 100644 daps-1.0.12.tar.bz2 diff --git a/daps-1.0.11.tar.bz2 b/daps-1.0.11.tar.bz2 deleted file mode 100644 index 1dd2f31..0000000 --- a/daps-1.0.11.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:aebfbd917334dad237810676c8203f75b4d935b816ff7be3c2f20cc7c0ff7f9b -size 1408803 diff --git a/daps-1.0.12.tar.bz2 b/daps-1.0.12.tar.bz2 new file mode 100644 index 0000000..2af8f4b --- /dev/null +++ b/daps-1.0.12.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:942630578c1aa0efcd53946e674faa43fb2180c3ddf499cb3e4bf020ac372f3f +size 1331768 diff --git a/daps.spec b/daps.spec index 9e49f82..44b83f7 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0.11 +Version: 1.0.12 Release: 0 %define docbuilddir %{_datadir}/daps From 0729a2a9863c7b5a237a6078cad45fbfb4aeaa4f3c9873534781b5036cb1d28f Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Wed, 2 May 2012 15:23:50 +0000 Subject: [PATCH 18/20] Version 1.0.2 (Bugfix Release): - target showvariable exited with an error if requested variable was empty - disabled Permalink generation for PDFs (this is an HTML-only feature) - images were not cerrectly references for target jsp - the DEF file was not correctly packaged in target locdrop - fixed webhelp target. Wildcards do not work in classpath expression, resolved them with $(wildcard $(firstword()) - Warning message "DEF file is missing" was issued for targets that do not have a --def-file option - targets package-html and package-pdf failed with an error on desktop files generation - target remaininggraphics always returned an empty list - SVG to SVG conversions generated useless error messages * Stylesheets: - removed obsolete stuff for @role=productname, productnumber, or productnameref - Quick Start Guide: Finished - Updated README.upgrade_from_susedoc_4.x OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=96 --- daps-1.0.12.tar.bz2 | 3 --- daps-1.0.2.tar.bz2 | 3 +++ daps.changes | 27 ++++++++++++++++++++++----- daps.spec | 2 +- 4 files changed, 26 insertions(+), 9 deletions(-) delete mode 100644 daps-1.0.12.tar.bz2 create mode 100644 daps-1.0.2.tar.bz2 diff --git a/daps-1.0.12.tar.bz2 b/daps-1.0.12.tar.bz2 deleted file mode 100644 index 2af8f4b..0000000 --- a/daps-1.0.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:942630578c1aa0efcd53946e674faa43fb2180c3ddf499cb3e4bf020ac372f3f -size 1331768 diff --git a/daps-1.0.2.tar.bz2 b/daps-1.0.2.tar.bz2 new file mode 100644 index 0000000..4d98ae4 --- /dev/null +++ b/daps-1.0.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8cc08090194535f84c731d1705f55d5494f8476e94870f4e053faf57115c39df +size 1408909 diff --git a/daps.changes b/daps.changes index b4aee83..8232deb 100644 --- a/daps.changes +++ b/daps.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Tue Apr 24 12:58:25 UTC 2012 - fsundermeyer@opensuse.org +Wed May 2 13:01:28 UTC 2012 - fsundermeyer@opensuse.org -Version 1.0.1 (Bugfix Release): +Version 1.0.2 (Bugfix Release): * Important: - in order to avoid confusion with short options for daps itself @@ -36,17 +36,34 @@ Version 1.0.1 (Bugfix Release): DocBook Stylesheets - Due to a variable name mismatch, the --name option did not work properly - - target showvariable exited with an error if requested variable was - empty + - target showvariable exited with an error if requested variable + was empty - config options FOP_CONFIG and XEP_CONFIG were not used. The fix renames them to FOP_CONFIG_FILE and XEP_CONFIG_FILE - these variables are used in the wrapper scripts - FOP_WRAPPER and XEP_WRAPPER were not set correctly when DAPSROOT was set + - disabled Permalink generation for PDFs (this is an HTML-only + feature) + - images were not cerrectly references for target jsp + - the DEF file was not correctly packaged in target locdrop + - fixed webhelp target. Wildcards do not work in classpath + expression, resolved them with $(wildcard $(firstword()) + - Warning message "DEF file is missing" was issued for targets + that do not have a --def-file option + - targets package-html and package-pdf failed with an error on + desktop files generation + - target remaininggraphics always returned an empty list + - SVG to SVG conversions generated useless error messages +* Stylesheets: + - removed obsolete stuff for @role=productname, + productnumber, or productnameref + * Documentation: - - Quickstart Guide: Finished + - Quick Start Guide: Finished - User Guide: Significant additions, but still work in progress + - Updated README.upgrade_from_susedoc_4.x ------------------------------------------------------------------- diff --git a/daps.spec b/daps.spec index 44b83f7..7bcc61e 100644 --- a/daps.spec +++ b/daps.spec @@ -17,7 +17,7 @@ Name: daps -Version: 1.0.12 +Version: 1.0.2 Release: 0 %define docbuilddir %{_datadir}/daps From d65b483b487f432ece75d4f66afdf565b7d2f5133a27509cd6b26ffccd5f5ece Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Thu, 3 May 2012 20:27:48 +0000 Subject: [PATCH 19/20] Added proper help texts for sub commands OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=97 --- daps-1.0.2.tar.bz2 | 4 ++-- daps.changes | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/daps-1.0.2.tar.bz2 b/daps-1.0.2.tar.bz2 index 4d98ae4..480ec15 100644 --- a/daps-1.0.2.tar.bz2 +++ b/daps-1.0.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8cc08090194535f84c731d1705f55d5494f8476e94870f4e053faf57115c39df -size 1408909 +oid sha256:8fd4e658cc76e57b480cf31f6c7cb4c52400e9434010a085c94ab1d110bef480 +size 1411834 diff --git a/daps.changes b/daps.changes index 8232deb..babd302 100644 --- a/daps.changes +++ b/daps.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Wed May 2 13:01:28 UTC 2012 - fsundermeyer@opensuse.org +Thu May 3 20:24:49 UTC 2012 - fsundermeyer@opensuse.org Version 1.0.2 (Bugfix Release): @@ -19,6 +19,7 @@ Version 1.0.2 (Bugfix Release): - the only short option that will remain is -h (help) * Bugfixes: + - added proper help texts for subcommands - target warn-images did not work - target missinggraphics did not show all missing images - daps failed with a useless error message when $MAIN was not From 136312271f4cbbf088080acc2322197085f42e36c0cbfdcb2d99444f1629c9ff Mon Sep 17 00:00:00 2001 From: Frank Sundermeyer Date: Fri, 4 May 2012 08:37:03 +0000 Subject: [PATCH 20/20] Bugfix: /etc/daps/docbook-xmlformat.conf was not installed OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=98 --- daps-1.0.2.tar.bz2 | 4 ++-- daps.spec | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daps-1.0.2.tar.bz2 b/daps-1.0.2.tar.bz2 index 480ec15..dab1453 100644 --- a/daps-1.0.2.tar.bz2 +++ b/daps-1.0.2.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fd4e658cc76e57b480cf31f6c7cb4c52400e9434010a085c94ab1d110bef480 -size 1411834 +oid sha256:265f9ae423971ce22aa635247dfe7d4614252be28aad1f86f5a23a45b100dc1a +size 1411777 diff --git a/daps.spec b/daps.spec index 7bcc61e..369b62a 100644 --- a/daps.spec +++ b/daps.spec @@ -36,7 +36,7 @@ Source2: %{name}-fetch-source BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -BuildRequires: bash >= 3.0 +BuildRequires: bash >= 4.0 BuildRequires: dia BuildRequires: docbook-xsl-stylesheets >= 1.75 BuildRequires: docbook_4