commit susedoc for openSUSE:Factory
Hello community, here is the log from the commit of package susedoc for openSUSE:Factory checked in at Wed Nov 10 20:09:50 CET 2010. -------- --- susedoc/susedoc.changes 2010-10-04 15:54:31.000000000 +0200 +++ susedoc/susedoc.changes 2010-11-10 16:08:52.000000000 +0100 @@ -1,0 +2,15 @@ +Wed Nov 10 14:53:26 UTC 2010 - toms@suse.de + +- Bugfix release (2) + +------------------------------------------------------------------- +Wed Nov 10 14:23:39 UTC 2010 - toms@suse.de + +- Bugfix release + +------------------------------------------------------------------- +Mon Nov 8 13:26:38 UTC 2010 - coolo@novell.com + +- remove support for pre-9.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- susedoc-4.2_20101004.tar.bz2 New: ---- susedoc-4.2_20101110.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ susedoc.spec ++++++ --- /var/tmp/diff_new_pack.SQJpp4/_old 2010-11-10 20:08:42.000000000 +0100 +++ /var/tmp/diff_new_pack.SQJpp4/_new 2010-11-10 20:08:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package susedoc (Version 4.2.20101004) +# spec file for package susedoc (Version 4.2.20101110) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ %define docbuilddir /usr/share/susedoc # Do not change the following name, as it is used by the # buildsusedoc4osc.sh script: -%define _version 20101004 +%define _version 20101110 %define _name susedoc %define regcat /usr/bin/sgml-register-catalog @@ -83,11 +83,7 @@ #Recommends: agfa-fonts ttf-founder unfonts sazanami-fonts %endif -%if "%(xft-config --prefix)" == "/usr" %define fontdir /usr/share/fonts/truetype -%else -%define fontdir /usr/X11R6/lib/X11/fonts/truetype -%endif %description This RPM consists of a set of stylesheets, scripts and makefiles that ++++++ susedoc-4.2_20101004.tar.bz2 -> susedoc-4.2_20101110.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/INSTALL new/susedoc/INSTALL --- old/susedoc/INSTALL 2010-01-22 10:47:46.000000000 +0100 +++ new/susedoc/INSTALL 2010-01-22 10:47:46.000000000 +0100 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- INSTALL ---------------------------------------------------------------------------- -$Id: INSTALL 236 2010-01-22 09:47:46Z toms $ +$Id: INSTALL 358 2010-01-22 09:47:46Z toms $ * Use autogen/configure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/README new/susedoc/README --- old/susedoc/README 2010-08-26 08:36:32.000000000 +0200 +++ new/susedoc/README 2010-10-18 15:56:26.000000000 +0200 @@ -1,7 +1,7 @@ ---------------------------------------------------------------------------- -README + README ---------------------------------------------------------------------------- -$Id: README 501 2010-08-26 06:36:32Z toms $ +$Id: README 1548 2010-10-18 13:56:26Z toms $ This project contains the following parts: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/TODO new/susedoc/TODO --- old/susedoc/TODO 2010-04-08 15:53:51.000000000 +0200 +++ new/susedoc/TODO 2010-04-08 15:53:51.000000000 +0200 @@ -1,6 +1,6 @@ ------------------------------------------ TODO -$Id: TODO 385 2010-04-08 13:53:51Z toms $ +$Id: TODO 484 2010-04-08 13:53:51Z toms $ ------------------------------------------ General: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/bin/buildsusedoc4osc.sh new/susedoc/bin/buildsusedoc4osc.sh --- old/susedoc/bin/buildsusedoc4osc.sh 2010-03-26 10:12:14.000000000 +0100 +++ new/susedoc/bin/buildsusedoc4osc.sh 2010-10-15 13:54:17.000000000 +0200 @@ -5,7 +5,7 @@ # (C) 2010, suse-doc-team, Novell Inc. # Distributable under GPLv2 or GPLv3 # -# upstream patches to https://svn.berlios.de/svnroot/repos/opensuse-docmaker/trunk/bin/buildsusedo... +# upstream patches to https://svn.berlios.de/svnroot/repos/opensuse-doc/tools/docmaker/bin/buildsu... # Default values: # TODO: Maybe we should move it into a config file: @@ -20,7 +20,7 @@ OBS_VERSION="" DATE=$(date +%Y%m%d) -BERLIOS_URL="https://svn.berlios.de/svnroot/repos/opensuse-docmaker" +BERLIOS_URL="https://svn.berlios.de/svnroot/repos/opensuse-doc/trunk/tools/docmaker" PACKAGEVERSION="4.2" MESSAGE="" COMMIT=0 @@ -174,7 +174,7 @@ # We don't want to get .svn directories, therefor we use export: debug "INFO: Exporting URL '$BERLIOS_URL'..." debug "INFO: Using temp directory '$TEMPDIR'" -svn export --quiet $BERLIOS_URL/trunk ${OBS_PACKAGE} +svn export --quiet $BERLIOS_URL ${OBS_PACKAGE} ## Step 2: debug "INFO: Creating archive ..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/bin/dm/propinit.py new/susedoc/bin/dm/propinit.py --- old/susedoc/bin/dm/propinit.py 2010-01-26 09:55:09.000000000 +0100 +++ new/susedoc/bin/dm/propinit.py 2010-10-06 17:17:19.000000000 +0200 @@ -21,8 +21,8 @@ Parameters: * option: Additional options - * filenames: List filenames your interested filenames or leave it out. - You can't leave that out. + * filenames: List filenames you are interested in. + This argument is mandatory. """ __exampledoc__="""Examples: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/bin/initdoc.py new/susedoc/bin/initdoc.py --- old/susedoc/bin/initdoc.py 2010-05-27 23:25:34.000000000 +0200 +++ new/susedoc/bin/initdoc.py 2010-05-27 23:25:34.000000000 +0200 @@ -12,7 +12,7 @@ __author__="Thomas Schraitle <thomas DOT schraitle AT suse DOT de>" __doc__="Creates directory structure for SUSE books." -__version__="$Id: initdoc.py 423 2010-05-27 21:25:34Z jnweiger $" +__version__="$Id: initdoc.py 514 2010-05-27 21:25:34Z jnweiger $" # Possible repository URLs SVN="svn+ssh://forgesvn1.novell.com/svn/novdoc/" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/bin/trunkcopy.sh new/susedoc/bin/trunkcopy.sh --- old/susedoc/bin/trunkcopy.sh 2010-01-14 13:21:11.000000000 +0100 +++ new/susedoc/bin/trunkcopy.sh 2010-10-18 16:48:24.000000000 +0200 @@ -539,7 +539,7 @@ if [ "$SUBMIT" = "y" ]; then echo "Please enter a submit message!" read MESSAGE - svn ci -m \"$MESSAGE\" $CHECKOUTDIR/$LOCAL_CHECKOUT_DIR >&/dev/null || exit_on_error "Failed to submit $CHECKOUTDIR/$LOCAL_CHECKOUT_DIR" + svn ci -m "$MESSAGE" $CHECKOUTDIR/$LOCAL_CHECKOUT_DIR >&/dev/null || exit_on_error "Failed to submit $CHECKOUTDIR/$LOCAL_CHECKOUT_DIR" echo echo "Successfully submitted to $SVNROOT/$TARGET" echo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/doc/xml/susemakedoc.xml new/susedoc/doc/xml/susemakedoc.xml --- old/susedoc/doc/xml/susemakedoc.xml 2010-10-01 09:46:39.000000000 +0200 +++ new/susedoc/doc/xml/susemakedoc.xml 2010-10-01 09:46:39.000000000 +0200 @@ -23,7 +23,7 @@ <surname>Schraitle</surname><email>thomas DOT schraitle AT suse DOT de</email> </author> </authorgroup> - <releaseinfo>$Id: susemakedoc.xml 548 2010-10-01 07:46:39Z toms $</releaseinfo> + <releaseinfo>$Id: susemakedoc.xml 618 2010-10-01 07:46:39Z toms $</releaseinfo> <revhistory> <revision><revnumber>1.0</revnumber><date>2005-05</date> <revdescription> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/doc/xml/svndoc.xml new/susedoc/doc/xml/svndoc.xml --- old/susedoc/doc/xml/svndoc.xml 2010-09-09 08:41:23.000000000 +0200 +++ new/susedoc/doc/xml/svndoc.xml 2010-09-09 08:41:23.000000000 +0200 @@ -23,7 +23,7 @@ <email>thomas.schraitle AT suse DOT de</email> </author> </authorgroup> - <releaseinfo>$Id: svndoc.xml 517 2010-09-09 06:41:23Z toms $</releaseinfo> + <releaseinfo>$Id: svndoc.xml 594 2010-09-09 06:41:23Z toms $</releaseinfo> </articleinfo> <sect1 id="sec.svn.quickstart"> <title>Quick Start</title> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/make/package.mk new/susedoc/make/package.mk --- old/susedoc/make/package.mk 2010-03-24 17:19:17.000000000 +0100 +++ new/susedoc/make/package.mk 2010-11-04 15:00:32.000000000 +0100 @@ -1,5 +1,5 @@ -.PHONY: document-files-html -document-files-html: $(PROFILES) +.PHONY: unpacked-document-files-html +unpacked-document-files-html: $(PROFILES) # if $ROOTSTRINGS is empty, it is a set and writes contents to files ifeq ($(ROOTSTRINGS),) xsltproc $(DESKSTRINGS) $(ROOTSTRINGS) --nonet \ @@ -9,40 +9,51 @@ --xinclude $(STYLE_DOCUMENT) \ profiled/$(PROFILEDIR)/$(MAIN) else - mkdir yelp + mkdir -p yelp-html/yelp xsltproc $(DESKSTRINGS) $(ROOTSTRINGS) --nonet \ --stringparam projectfile PROJECTFILE.$(BOOK) \ --stringparam outformat html \ --stringparam docid com.novell.$(BOOK)$(subst _,,$(LL)) \ --xinclude $(STYLE_DOCUMENT) \ profiled/$(PROFILEDIR)/$(MAIN) \ - >yelp/$(BOOK)_$(LL).document + >yelp-html/yelp/$(BOOK)_$(LL).document endif - test -d yelp \ - && BZIP2=--best tar cjf $(TMP_BOOK)_$(LL)-yelp.tar.bz2 yelp \ + +.PHONY: document-files-html +document-files-html: unpacked-document-files-html + test -d yelp-html/yelp \ + && BZIP2=--best tar cjf $(TMP_BOOK)_$(LL)-yelp.tar.bz2 \ + -C yelp-html yelp \ || echo "No document files available" - rm -rf yelp + rm -rf yelp-html -.PHONY: document-files-pdf -document-files-pdf: $(PROFILES) - mkdir yelp +.PHONY: unpacked-document-files-pdf +unpacked-document-files-pdf: $(PROFILES) + mkdir -p yelp-pdf/yelp xsltproc $(DESKSTRINGS) $(ROOTSTRINGS) --nonet \ --stringparam projectfile PROJECTFILE.$(BOOK) \ --stringparam outformat pdf \ --stringparam docid com.novell.$(BOOK)$(subst _,,$(LL))pdf \ --xinclude $(STYLE_DOCUMENT) \ profiled/$(PROFILEDIR)/$(MAIN) \ - >yelp/$(BOOK)_$(LL)-pdf.document - test -d yelp \ - && BZIP2=--best tar cjf $(TMP_BOOK)_$(LL)-pdf-yelp.tar.bz2 yelp \ + >yelp-pdf/yelp/$(BOOK)_$(LL)-pdf.document + +.PHONY: document-files-pdf +document-files-pdf: unpacked-document-files-pdf + test -d yelp-pdf/yelp \ + && BZIP2=--best tar cjf $(TMP_BOOK)_$(LL)-pdf-yelp.tar.bz2 \ + -C yelp-pdf yelp \ || echo "No document files available" - rm -rf yelp + rm -rf yelp-pdf -.PHONY: desktop-files -desktop-files: $(PROFILES) +.PHONY: unpacked-desktop-files +unpacked-desktop-files: $(PROFILES) xsltproc $(DESKSTRINGS) $(ROOTSTRINGS) --nonet \ --stringparam projectfile PROJECTFILE.$(BOOK) \ --xinclude $(STYLEDESK) profiled/$(PROFILEDIR)/$(MAIN) + +.PHONY: desktop-files +desktop-files: unpacked-desktop-files test -d desktop && BZIP2=--best tar cjf $(TMP_BOOK)_$(LL)-desktop.tar.bz2 desktop || echo "No desktop files available" rm -rf desktop diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/schema/novdocx.dtd new/susedoc/schema/novdocx.dtd --- old/susedoc/schema/novdocx.dtd 2010-08-06 08:29:08.000000000 +0200 +++ new/susedoc/schema/novdocx.dtd 2010-10-25 08:30:53.000000000 +0200 @@ -485,6 +485,7 @@ <!-- change added role and spacing --> <!ATTLIST itemizedlist + id ID #IMPLIED mark (bullet|dash|box|check) "bullet" role CDATA #IMPLIED spacing (compact|normal) "normal" @@ -557,6 +558,7 @@ <!-- change added spacing --> <!ATTLIST orderedlist + id ID #IMPLIED spacing (compact|normal) "normal" %profiling.attributes; %xmlbase;> @@ -829,6 +831,7 @@ %xmlbase;> <!ATTLIST variablelist + id ID #IMPLIED %profiling.attributes; %xmlbase;> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/xslt/README new/susedoc/xslt/README --- old/susedoc/xslt/README 2009-12-17 17:02:32.000000000 +0100 +++ new/susedoc/xslt/README 2009-12-17 17:02:32.000000000 +0100 @@ -2,7 +2,7 @@ Novdoc XSLT Stylesheets ------------------------------------------------------------ -$Id: README 227 2009-12-17 16:02:32Z toms $ +$Id: README 349 2009-12-17 16:02:32Z toms $ The novdoc/xslt directory contains stylesheets. They help to transform XML instances of Novdoc DTD into mainly HTML or FO. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/xslt/flyer/attributesets.xsl new/susedoc/xslt/flyer/attributesets.xsl --- old/susedoc/xslt/flyer/attributesets.xsl 2010-02-22 15:24:30.000000000 +0100 +++ new/susedoc/xslt/flyer/attributesets.xsl 2010-10-05 13:39:09.000000000 +0200 @@ -56,6 +56,7 @@ <xsl:value-of select="$body.font.master *1.2"/> <xsl:text>pt</xsl:text> </xsl:attribute> + <xsl:attribute name="font-variant">small-caps</xsl:attribute> <xsl:attribute name="space-after.optimum">0.25em</xsl:attribute> <xsl:attribute name="space-after.precedence">1</xsl:attribute> </xsl:attribute-set> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/xslt/flyer/component.xsl new/susedoc/xslt/flyer/component.xsl --- old/susedoc/xslt/flyer/component.xsl 2010-09-20 15:18:58.000000000 +0200 +++ new/susedoc/xslt/flyer/component.xsl 2010-10-05 13:45:21.000000000 +0200 @@ -142,16 +142,56 @@ </fo:block> </xsl:when> <xsl:otherwise> + <fo:block span="all" margin-top="9pt"> + <fo:table color="white" space-after="1em"> + <fo:table-column + column-width="proportional-column-width(1.97)"/><!-- 124mm --> + <fo:table-column column-width="4mm"/> + <fo:table-column + column-width="proportional-column-width(1.00)"/><!-- 63mm --> + <fo:table-body> + <fo:table-cell background-color="{$flyer.color}" > + <fo:block-container height="41mm" left="-10pt"> + <fo:block margin="1.75em" hyphenate="false" + space-after="-25pt"> + <xsl:apply-templates select="title" + mode="article.titlepage.recto.auto.mode"/> + </fo:block> + <fo:block margin="1.5em" hyphenate="false" + font-size="12pt"> + <xsl:apply-templates + select="articleinfo/date"/> + </fo:block> + </fo:block-container> + </fo:table-cell> + <fo:table-cell> + <fo:block/> + </fo:table-cell> + <fo:table-cell background-color="#E4E5E6" + color="#FF1A00"> + <fo:block-container height="41mm" right="10pt"> + <fo:block font-size="14pt" + margin-top="32.5mm" + text-align="right" + margin-right=".5em" + >Novell<fo:inline font-size="7.5pt">®</fo:inline> + </fo:block> + </fo:block-container> + </fo:table-cell> + </fo:table-body> + </fo:table> + <!--</fo:block>--> +<!-- <fo:block-container left="5mm" top="9mm" right="5mm" absolute-position="fixed" span="all" height="41mm + 1em" id="{$id}"> <fo:table color="white"> <fo:table-column - column-width="proportional-column-width(1.97)"/><!-- 124mm --> + column-width="proportional-column-width(1.97)"/><!-\- 124mm -\-> <fo:table-column column-width="4mm"/> <fo:table-column - column-width="proportional-column-width(1.00)"/><!-- 63mm --> + column-width="proportional-column-width(1.00)"/><!-\- 63mm -\-> <fo:table-body> <fo:table-cell background-color="{$flyer.color}"> <fo:block-container height="41mm"> @@ -179,8 +219,8 @@ </fo:table> </fo:block-container> <fo:block space-after="41mm + 2em"> </fo:block> - - <fo:block span="all" > +--> + <!--<fo:block span="all" >--> <xsl:if test="$fop1.extensions != 0"> <xsl:attribute name="margin-bottom">2em</xsl:attribute> </xsl:if> @@ -253,6 +293,7 @@ <xsl:with-param name="master-reference" select="$master-reference"/> </xsl:call-template> <xsl:apply-templates select="*[@role='legal']"/> + <xsl:if test="false()"> <fo:block span="all"> <fo:footnote> <fo:inline/> @@ -263,11 +304,11 @@ content-width="scale-to-fit" content-height="scale-to-fit" src="url("{$dtdroot}/xslt/images/svg/novell-logo.svg")"/> - <fo:external-graphic width="3.5cm" + <!--<fo:external-graphic width="3.5cm" content-width="scale-to-fit" content-height="scale-to-fit" src="url("{$dtdroot}/xslt/images/svg/suse-logo.svg")" - /> + />--> </fo:block> <fo:block xsl:use-attribute-sets="copyright.flyer.properties"> @@ -281,6 +322,7 @@ </fo:footnote-body> </fo:footnote> </fo:block> + </xsl:if> </fo:flow> </fo:page-sequence> </xsl:when> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/xslt/flyer/param.xsl new/susedoc/xslt/flyer/param.xsl --- old/susedoc/xslt/flyer/param.xsl 2010-09-20 14:30:28.000000000 +0200 +++ new/susedoc/xslt/flyer/param.xsl 2010-10-05 13:58:01.000000000 +0200 @@ -78,7 +78,7 @@ <xsl:param name="page.margin.outer">1cm</xsl:param> <xsl:param name="page.margin.inner">1cm</xsl:param> -<xsl:param name="page.margin.top">7mm</xsl:param> +<xsl:param name="page.margin.top">10mm</xsl:param> <xsl:param name="page.margin.bottom">5mm</xsl:param> <xsl:param name="region.before.extent">0pt</xsl:param> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/xslt/html/susebooks.css new/susedoc/xslt/html/susebooks.css --- old/susedoc/xslt/html/susebooks.css 2010-09-17 08:52:02.000000000 +0200 +++ new/susedoc/xslt/html/susebooks.css 2010-10-07 11:13:50.000000000 +0200 @@ -72,6 +72,11 @@ margin-bottom:-.75em; } +div.toc div.set-toc-title +{ + margin-bottom:1em; +} + div.set div.toc dt >.book *,div.set div.toc dt >.book em,div.set div.toc dt >.article * { display:block; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/susedoc/xslt/misc/sort-glossary.xsl new/susedoc/xslt/misc/sort-glossary.xsl --- old/susedoc/xslt/misc/sort-glossary.xsl 2010-06-11 15:43:14.000000000 +0200 +++ new/susedoc/xslt/misc/sort-glossary.xsl 2010-06-11 15:43:14.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!-- $Id: sort-glossary.xsl 452 2010-06-11 13:43:14Z jnweiger $ --> +<!-- $Id: sort-glossary.xsl 542 2010-06-11 13:43:14Z jnweiger $ --> <!DOCTYPE xsl:stylesheet [ <!ENTITY lowercase "'abcdefghijklmnopqrstuvwxyz'"> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de