From 7cf8a3734ea35df0c88db59f34f7ab9b9759f5b4 Mon Sep 17 00:00:00 2001
From: Sven Neumann <sven@gimp.org>
Date: Sun, 26 Jun 2005 23:47:13 +0000
Subject: [PATCH] menus/Makefile.am menus/menus.xsl readded the Debug menu but
 changed the

2005-06-27  Sven Neumann  <sven@gimp.org>

	* menus/Makefile.am
	* menus/menus.xsl
	* menus/toolbox-menu.xml.in: readded the Debug menu but changed
	the XSLT and the build rules so that it is only included in the
	development versions.
---
 ChangeLog                 | 10 +++++++++-
 menus/Makefile.am         |  6 +++++-
 menus/menus.xsl           |  8 ++++++++
 menus/toolbox-menu.xml.in |  5 +----
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3e5ef56e74..e2c09679f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-27  Sven Neumann  <sven@gimp.org>
+
+	* menus/Makefile.am
+	* menus/menus.xsl
+	* menus/toolbox-menu.xml.in: readded the Debug menu but changed
+	the XSLT and the build rules so that it is only included in the
+	development versions.
+
 2005-06-26  Manish Singh  <yosh@gimp.org>
 
 	* app/core/gimpenvirontable.c: feed environment values through
@@ -13,7 +21,7 @@
 2005-06-27  Sven Neumann  <sven@gimp.org>
 
 	* app/config/gimpconfig-dump.c (dump_gimprc_manpage): don't dump
-	properties that have the GIMP_CONFIG_PARAM_IGNORE flag set.
+	properties that have the GIMP_PARAM_IGNORE flag set.
 
 2005-06-26  Sven Neumann  <sven@gimp.org>
 
diff --git a/menus/Makefile.am b/menus/Makefile.am
index 11e83a4e69..0ef8c76f99 100644
--- a/menus/Makefile.am
+++ b/menus/Makefile.am
@@ -44,9 +44,13 @@ EXTRA_DIST = \
 MAINTAINERCLEAN_FILES = $(menudata_built_files)
 
 
+if GIMP_UNSTABLE
+XSLTPARAMS = --stringparam debug-menu yes
+endif
+
 %.xml: %.xml.in menus.xsl dialogs-menuitems.xml
 if HAVE_XSLTPROC
-	$(XSLTPROC) --xinclude menus.xsl $< > $(@) || rm -f $(@)
+	$(XSLTPROC) --xinclude $(XSLTPARAMS) menus.xsl $< > $(@) || rm -f $(@)
 else
 	@echo "xsltproc is needed to build the menus XML files"; exit 1;
 endif
diff --git a/menus/menus.xsl b/menus/menus.xsl
index ae533ba512..9d80a33258 100644
--- a/menus/menus.xsl
+++ b/menus/menus.xsl
@@ -8,6 +8,8 @@
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
+  <xsl:param name="debug-menu" />
+
   <xsl:output method="xml"
               version="1.0"
               encoding="utf-8"
@@ -37,6 +39,12 @@
     <xsl:apply-templates />
   </xsl:template>
 
+  <xsl:template match="menu[@action='debug-menu']">
+    <xsl:if test="$debug-menu='yes'">
+      <xsl:call-template name="identity" />
+    </xsl:if>
+  </xsl:template>
+
   <!-- need to strip the XInclude namespace declaration from the ui element -->
   <xsl:template match="ui">
     <ui>
diff --git a/menus/toolbox-menu.xml.in b/menus/toolbox-menu.xml.in
index 00d6ed94e2..60cfc99eac 100644
--- a/menus/toolbox-menu.xml.in
+++ b/menus/toolbox-menu.xml.in
@@ -31,16 +31,13 @@
         <xi:include href="dialogs-menuitems.xml" />
       </menu>
 
-<!-- FIXME solve this as param to xsltproc
-
+<!--  The debug-menu is automatically excluded for stable releases  -->
       <menu action="debug-menu" name="Debug">
         <menuitem action="debug-mem-profile" />
         <menuitem action="debug-dump-items" />
         <menuitem action="debug-dump-managers" />
       </menu>
 
--->
-
       <separator />
       <menuitem action="file-quit" />
     </menu>