From: Stefan Seefeld <stefan@seefeld.name>
Date: Sun, 21 Oct 2012 21:41:48 +0000 (+0000)
Subject: Separate slides package.
X-Git-Tag: release/1.79.1~6^2~318
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5f7002f9c141ad9f9a2a1b043ab40db30104b45b;p=docbook-dsssl

Separate slides package.
---

diff --git a/releasetools/Targets.mk b/releasetools/Targets.mk
index 3afea347c..ae7d3ae37 100644
--- 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 897a8f532..49713bfe2 100644
--- 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 e553a42dc..93e129c75 100644
--- 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 f94ee03fc..f3018afca 100644
--- 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 c96eda061..5b8d54dee 100644
--- 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 e2162ae7b..a0d5c6391 100644
--- 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