Author: paul
Date: 2009-11-20 16:46:33 +0100 (Fri, 20 Nov 2009)
New Revision: 17747
Log:
r28035@arctic: paul | 2009-11-20 09:42:39 -0600
Update dependencies
Modified:
trunk/refman-5.5/Makefile.depends
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27809
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:46712
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:28035
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:46712
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends 2009-11-20 15:45:37 UTC (rev 17746)
+++ trunk/refman-5.5/Makefile.depends 2009-11-20 15:46:33 UTC (rev 17747)
Changed blocks: 5, Lines Added: 45, Lines Deleted: 0; 4003 bytes
@@ -2065,6 +2065,34 @@
dynxml-local-news-5.5-manprepped.xml: $(dynxml_local_news_5_5_SOURCES) $(dynxml_local_news_5_5_IDMAPS)
dynxml-local-news-5.5-remprepped.xml: $(dynxml_local_news_5_5_SOURCES) $(dynxml_local_news_5_5_IDMAPS)
dynxml-local-news-5.5.xml: $(dynxml_local_news_5_5_INCLUDES)
+dynxml_local_news_5_6_INCLUDES = \
+ ../../mysqldoc/dynamic-docs/changelog/mysqld-1.xml \
+ ../../mysqldoc/dynamic-docs/changelog/mysqld-versions.xml \
+ ../../mysqldoc/dynamic-docs/changelog/mysqld.xml \
+ ../../mysqldoc/dynamic-docs/metadata-titles.en.xml \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../gui-common/gui-common.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ all-entities.ent \
+ news-5.6-core.xml \
+ versions.ent
+dynxml_local_news_5_6_IMAGES =
+dynxml_local_news_5_6_SOURCES = dynxml-local-news-5.6.xml $(dynxml_local_news_5_6_INCLUDES)
+dynxml_local_news_5_6_IDMAPS = \
+ metadata/installing-updowngrade.idmap \
+ metadata/introduction.idmap
+dynxml-local-news-5.6.validpure: $(dynxml_local_news_5_6_SOURCES)
+dynxml-local-news-5.6.titles: $(dynxml_local_news_5_6_SOURCES)
+dynxml-local-news-5.6.useless: $(dynxml_local_news_5_6_SOURCES)
+dynxml-local-news-5.6.valid: $(dynxml_local_news_5_6_SOURCES) $(dynxml_local_news_5_6_IDMAPS)
+dynxml-local-news-5.6.validwarn: $(dynxml_local_news_5_6_SOURCES) $(dynxml_local_news_5_6_IDMAPS)
+dynxml-local-news-5.6-prepped.xml: $(dynxml_local_news_5_6_SOURCES) $(dynxml_local_news_5_6_IDMAPS)
+dynxml-local-news-5.6-manprepped.xml: $(dynxml_local_news_5_6_SOURCES) $(dynxml_local_news_5_6_IDMAPS)
+dynxml-local-news-5.6-remprepped.xml: $(dynxml_local_news_5_6_SOURCES) $(dynxml_local_news_5_6_IDMAPS)
+dynxml-local-news-5.6.xml: $(dynxml_local_news_5_6_INCLUDES)
dynxml_local_programs_admin_util_INCLUDES = \
../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
@@ -3492,6 +3520,7 @@
dynxml-local-manual-index-sysvar.xml \
dynxml-local-manual-index.xml \
dynxml-local-news-5.5.xml \
+ dynxml-local-news-5.6.xml \
dynxml-local-programs-admin-util.xml \
dynxml-local-programs-client.xml \
dynxml-local-programs-server.xml \
@@ -3546,6 +3575,7 @@
monitor-refman-chapter-aspec.xml.mem-replication.none.section.xml \
monitor-refman-chapter-base.xml \
news-5.5-core.xml \
+ news-5.6-core.xml \
news-monitor-2.0-arbitrary.xml \
news-monitor-2.0-aspec.xml \
news-monitor-2.0-aspec.xml.mem-news.none.section.xml \
@@ -4392,6 +4422,19 @@
news-5.5-core-manprepped.xml: $(news_5_5_core_SOURCES) $(news_5_5_core_IDMAPS)
news-5.5-core-remprepped.xml: $(news_5_5_core_SOURCES) $(news_5_5_core_IDMAPS)
+news_5_6_core_INCLUDES =
+news_5_6_core_IMAGES =
+news_5_6_core_SOURCES = news-5.6-core.xml $(news_5_6_core_INCLUDES)
+news_5_6_core_IDMAPS =
+news-5.6-core.validpure: $(news_5_6_core_SOURCES)
+news-5.6-core.titles: $(news_5_6_core_SOURCES)
+news-5.6-core.useless: $(news_5_6_core_SOURCES)
+news-5.6-core.valid: $(news_5_6_core_SOURCES) $(news_5_6_core_IDMAPS)
+news-5.6-core.validwarn: $(news_5_6_core_SOURCES) $(news_5_6_core_IDMAPS)
+news-5.6-core-prepped.xml: $(news_5_6_core_SOURCES) $(news_5_6_core_IDMAPS)
+news-5.6-core-manprepped.xml: $(news_5_6_core_SOURCES) $(news_5_6_core_IDMAPS)
+news-5.6-core-remprepped.xml: $(news_5_6_core_SOURCES) $(news_5_6_core_IDMAPS)
+
news_monitor_2_0_arbitrary_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -4508,7 +4551,9 @@
dynxml-common-news-mysql-proxy.xml \
dynxml-common-news-vstudioplugin.xml \
dynxml-local-news-5.5.xml \
+ dynxml-local-news-5.6.xml \
news-5.5-core.xml \
+ news-5.6-core.xml \
news-monitor-2.0-arbitrary.xml \
news-monitor-2.0-aspec.xml \
news-monitor-2.0-aspec.xml.mem-news.none.section.xml \
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r17747 - in trunk: . refman-5.5 | paul.dubois | 20 Nov |
