Separate slides package.

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 3afea347c1b676e920c5a978c383618a817645e8..ae7d3ae3784cd811e40c6692953b7515772cd9b1 100644 (file)
--- a/releasetools/Targets.mk
+++ b/releasetools/Targets.mk
@@ -171,30 +171,34 @@ endif
 # -----------------------------------------------------------------
 ifneq ($(DISTRIB_PACKAGES),)
        for part in $(DISTRIB_PACKAGES); do \
-       rm -rf $(TMP)/docbook-$(DISTRO)-$(ZIPVER); \
-       $(RM)  $(TMP)/tar.exclude; \
-       $(RM)  $(TMP)/docbook-$(DISTRO)-$$part-$(ZIPVER).tar.gz; \
-       $(RM)  $(TMP)/docbook-$(DISTRO)-$$part-$(ZIPVER).tar.bz2; \
-       $(RM)  $(TMP)/docbook-$(DISTRO)-$$part-$(ZIPVER).zip; \
-       umask 022; mkdir -p $(TMP)/docbook-$(DISTRO)-$(ZIPVER); \
-       touch $(TMP)/tar.exclude; \
-       if [ -n "$(DISTRIB_EXCLUDES)" ]; then \
-       for file in $(DISTRIB_EXCLUDES); do \
-         find . -print  | grep $$file   | cut -c3- >> $(TMP)/tar.exclude; \
-       done; \
-       fi; \
-       for file in $(ZIP_EXCLUDES); do \
-         find . -print  | grep $$file   | cut -c3- >> $(TMP)/tar.exclude; \
-       done; \
-       $(TAR) cf$(TARFLAGS) - -X $(TMP)/tar.exclude --ignore-failed-read $$part images | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); $(TAR) xf$(TARFLAGS) -); \
-       umask 022; (cd $(TMP) && \
-       if [ -d docbook-$(DISTRO)-$(ZIPVER)/images ]; \
-         then mv docbook-$(DISTRO)-$(ZIPVER)/images docbook-$(DISTRO)-$(ZIPVER)/doc/; \
-       fi) ; \
-       umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | gzip > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.gz); \
-       umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > docbook-$(DISTRO)-$$part-$(ZIPVER).tar.bz2); \
-       umask 022; (cd $(TMP) && $(ZIP) $(ZIPFLAGS) docbook-$(DISTRO)-$$part-$(ZIPVER).zip docbook-$(DISTRO)-$(ZIPVER)); \
-       $(RM) $(TMP)/tar.exclude; \
+          package_name=docbook-$(DISTRO)-$$part-$(ZIPVER) \
+          if [ "$$part" = slides ]; then \
+            package_name=docbook-$(DISTRO)-slides-ns-$(ZIPVER) \
+          fi \
+         rm -rf $(TMP)/docbook-$(DISTRO)-$(ZIPVER); \
+         $(RM)  $(TMP)/tar.exclude; \
+         $(RM)  $(TMP)/$$package_name.tar.gz; \
+         $(RM)  $(TMP)/$$package_name.tar.bz2; \
+         $(RM)  $(TMP)/$$package_name.zip; \
+         umask 022; mkdir -p $(TMP)/docbook-$(DISTRO)-$(ZIPVER); \
+         touch $(TMP)/tar.exclude; \
+         if [ -n "$(DISTRIB_EXCLUDES)" ]; then \
+           for file in $(DISTRIB_EXCLUDES); do \
+             find . -print  | grep $$file   | cut -c3- >> $(TMP)/tar.exclude; \
+           done; \
+         fi; \
+         for file in $(ZIP_EXCLUDES); do \
+           find . -print  | grep $$file   | cut -c3- >> $(TMP)/tar.exclude; \
+         done; \
+         $(TAR) cf$(TARFLAGS) - -X $(TMP)/tar.exclude --ignore-failed-read $$part images | (cd $(TMP)/docbook-$(DISTRO)-$(ZIPVER); $(TAR) xf$(TARFLAGS) -); \
+         umask 022; (cd $(TMP) && \
+         if [ -d docbook-$(DISTRO)-$(ZIPVER)/images ]; \
+           then mv docbook-$(DISTRO)-$(ZIPVER)/images docbook-$(DISTRO)-$(ZIPVER)/doc/; \
+         fi) ; \
+         umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | gzip > $$package_name.tar.gz); \
+         umask 022; (cd $(TMP) && $(TAR) cf$(TARFLAGS) - docbook-$(DISTRO)-$(ZIPVER) | bzip2 > $$package_name.tar.bz2); \
+         umask 022; (cd $(TMP) && $(ZIP) $(ZIPFLAGS) $$package_name.zip docbook-$(DISTRO)-$(ZIPVER)); \
+         $(RM) $(TMP)/tar.exclude; \
        done
 endif
 endif

diff --git a/releasetools/xslns.mk b/releasetools/xslns.mk
index 897a8f5326a832e276e3fda5329f7207d15dff34..49713bfe22de21d5c35c4b0bc9cf8dfb42a2abce 100644 (file)
--- a/releasetools/xslns.mk
+++ b/releasetools/xslns.mk
@@ -26,8 +26,6 @@ zip-ns: zip
          docbook-$(DISTRO)-$(ZIPVER) \
          docbook-$(DISTRO)-ns-$(ZIPVER)); 
 
-# Remove Slides from non-ns version
-       $(RM) -r $(TMP)/docbook-$(DISTRO)-$(ZIPVER)/slides/
 
 # Run xslt on xsl/webhelp/docsrc/readme.xml
        $(XSLT) \

diff --git a/xsl/slides/fo/Makefile b/xsl/slides/fo/Makefile
index e553a42dc8c82ff1386fb65754390c1694e499ed..93e129c75b2c9655f97d5bec383c199c64e031a9 100644 (file)
--- a/xsl/slides/fo/Makefile
+++ b/xsl/slides/fo/Makefile
@@ -16,5 +16,3 @@ include ../../Makefile.incl
 titlepage-clean:
        $(RM) plain-titlepage.xsl
 
-clean: titlepage-clean
-       rm -f .param.xmlid param.xml param.xsl

diff --git a/xsl/slides/fo/param.xweb b/xsl/slides/fo/param.xweb
index f94ee03fc9e44ea04d4d795714775b316ce3f4c6..f3018afcab975b2031e733e6ccb1ad5f0ac0ee8e 100644 (file)
--- a/xsl/slides/fo/param.xweb
+++ b/xsl/slides/fo/param.xweb
@@ -14,13 +14,13 @@ $Id: param.xweb 6633 2007-02-21 18:33:33Z xmldoc $
 </releaseinfo>
 <author>
   <personname>
-    <surname>Kovesdan</surname>
-    <firstname>Gabor</firstname>
+    <surname>Kövesdán</surname>
+    <firstname>Gábor</firstname>
   </personname>
 </author>
 <copyright>
   <year>2012</year>
-  <holder>Gabor Kovesdan</holder>
+  <holder>Gábor Kövesdán</holder>
 </copyright>
 <abstract>
   <para>This is reference documentation for all user-configurable

diff --git a/xsl/slides/xhtml/Makefile b/xsl/slides/xhtml/Makefile
index c96eda061cb8002aa5af42568202041222b7d1a6..5b8d54dee571d8910a73194b37633e590e2238c6 100644 (file)
--- a/xsl/slides/xhtml/Makefile
+++ b/xsl/slides/xhtml/Makefile
@@ -16,5 +16,3 @@ include ../../Makefile.incl
 titlepage-clean:
        $(RM) plain-titlepage.xsl
 
-clean: titlepage-clean
-       rm -f .param.xmlid param.xml param.xsl

diff --git a/xsl/slides/xhtml/param.xweb b/xsl/slides/xhtml/param.xweb
index e2162ae7bfa51f9b3ad89b113becedae947b09a6..a0d5c6391ca1367b0e59ef1d4151df64e5a0bfd6 100644 (file)
--- a/xsl/slides/xhtml/param.xweb
+++ b/xsl/slides/xhtml/param.xweb
@@ -14,13 +14,13 @@ $Id$
 </releaseinfo>
 <author>
   <personname>
-    <surname>Kovesdan</surname>
-    <firstname>Gabor</firstname>
+    <surname>Kövesdán</surname>
+    <firstname>Gábor</firstname>
   </personname>
 </author>
 <copyright>
   <year>2012</year>
-  <holder>Gabor Kovesdan</holder>
+  <holder>Gábor Kövesdán</holder>
 </copyright>
 <abstract>
   <para>This is reference documentation for all user-configurable