Author: paul
Date: 2007-08-22 06:21:32 +0200 (Wed, 22 Aug 2007)
New Revision: 7502
Log:
r29095@polar: paul | 2007-08-21 21:18:35 -0500
Update dependencies
Modified:
trunk/gui-common/Makefile
trunk/gui-common/Makefile.depends
trunk/refman-5.1/Makefile.depends
trunk/refman-5.2/Makefile.depends
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29054
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23922
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29095
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:23922
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
Modified: trunk/gui-common/Makefile
===================================================================
--- trunk/gui-common/Makefile 2007-08-21 23:14:47 UTC (rev 7501)
+++ trunk/gui-common/Makefile 2007-08-22 04:21:32 UTC (rev 7502)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 679 bytes
@@ -17,7 +17,7 @@
IDMAP_MAIN = gui-common
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
-IDMAP_REFS = . $(REPO_ROOT)/workbench $(REPO_ROOT)/query-browser $(REPO_ROOT)/administrator $(REPO_ROOT)/migration-toolkit $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common
+IDMAP_REFS = . $(REPO_ROOT)/administrator $(REPO_ROOT)/migration-toolkit $(REPO_ROOT)/refman-5.1 $(REPO_ROOT)/refman-common
IDMAP_SRCS = $(call base_xml_files)
# Import standard variables
Modified: trunk/gui-common/Makefile.depends
===================================================================
--- trunk/gui-common/Makefile.depends 2007-08-21 23:14:47 UTC (rev 7501)
+++ trunk/gui-common/Makefile.depends 2007-08-22 04:21:32 UTC (rev 7502)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1182 bytes
@@ -2,7 +2,7 @@
appendix_common_files_IMAGES =
appendix_common_files_SOURCES = appendix-common-files.xml $(appendix_common_files_INCLUDES)
appendix_common_files_IDMAPS = \
- ../query-browser/metadata/options.idmap \
+ ../administrator/metadata/administrator.idmap \
metadata/appendix-connection-storage.idmap
appendix-common-files.validpure: $(appendix_common_files_SOURCES)
appendix-common-files.titles: $(appendix_common_files_SOURCES)
@@ -17,7 +17,7 @@
appendix_connection_storage_IMAGES =
appendix_connection_storage_SOURCES = appendix-connection-storage.xml $(appendix_connection_storage_INCLUDES)
appendix_connection_storage_IDMAPS = \
- ../query-browser/metadata/options.idmap \
+ ../administrator/metadata/administrator.idmap \
metadata/chapter-options-connections.idmap
appendix-connection-storage.validpure: $(appendix_connection_storage_SOURCES)
appendix-connection-storage.titles: $(appendix_connection_storage_SOURCES)
Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends 2007-08-21 23:14:47 UTC (rev 7501)
+++ trunk/refman-5.1/Makefile.depends 2007-08-22 04:21:32 UTC (rev 7502)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 2; 863 bytes
@@ -1117,7 +1117,6 @@
../ndbapi/metadata/ndb-classes.idmap \
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
- ../refman-5.0/metadata/mysql-cluster.idmap \
../refman-common/metadata/gpl-license.idmap \
metadata/functions-core.idmap \
metadata/mysql-cluster-ccsg-merge-temp.idmap \
@@ -1165,7 +1164,6 @@
../ndbapi/metadata/errors.idmap \
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
- ../refman-5.0/metadata/mysql-cluster.idmap \
../refman-common/metadata/bug-reports.idmap \
metadata/client-utility-programs.idmap \
metadata/data-types.idmap \
Modified: trunk/refman-5.2/Makefile.depends
===================================================================
--- trunk/refman-5.2/Makefile.depends 2007-08-21 23:14:47 UTC (rev 7501)
+++ trunk/refman-5.2/Makefile.depends 2007-08-22 04:21:32 UTC (rev 7502)
Changed blocks: 4, Lines Added: 1, Lines Deleted: 4; 1435 bytes
@@ -748,7 +748,6 @@
installing_IMAGES =
installing_SOURCES = installing.xml $(installing_INCLUDES)
installing_IDMAPS = \
- ../refman-5.0/metadata/sql-syntax.idmap \
../refman-5.1/metadata/news-5.1.idmap \
../refman-common/metadata/bug-reports.idmap \
../refman-common/metadata/information-sources.idmap \
@@ -760,6 +759,7 @@
metadata/errors-problems.idmap \
metadata/extending-mysql.idmap \
metadata/faqs.idmap \
+ metadata/ha.idmap \
metadata/language-structure.idmap \
metadata/mysql-cluster.idmap \
metadata/news.idmap \
@@ -1112,8 +1112,6 @@
../ndbapi/metadata/errors.idmap \
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
- ../refman-5.0/metadata/mysql-cluster.idmap \
- ../refman-5.0/metadata/sql-syntax.idmap \
../refman-5.1/metadata/news-5.1.idmap \
../refman-common/metadata/gpl-license.idmap \
metadata/functions-core.idmap \
@@ -1161,7 +1159,6 @@
../ndbapi/metadata/errors.idmap \
../ndbapi/metadata/ndb-internals.idmap \
../ndbapi/metadata/ndbapi.idmap \
- ../refman-5.0/metadata/mysql-cluster.idmap \
../refman-5.1/metadata/news-5.1.idmap \
../refman-common/metadata/bug-reports.idmap \
metadata/client-utility-programs.idmap \
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7502 - in trunk: . gui-common refman-5.1 refman-5.2 | paul | 22 Aug |
