List:Internals« Previous MessageNext Message »
From:lenz Date:April 13 2005 11:27am
Subject:bk commit into 4.1 tree (lenz:1.2173)
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of lenz. When lenz does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2173 05/04/13 13:27:06 lenz@stripped +399 -0
  Manual merge of the ChangeSet to remove the dependency on manual.texi from the source tree (from 4.0)

  support-files/mysql.spec.sh
    1.90 05/04/13 13:26:57 lenz@stripped +0 -0
    Manual merge

  scripts/make_win_src_distribution.sh
    1.32 05/04/13 13:26:57 lenz@stripped +0 -1
    Manual merge

  Docs/Makefile.am
    1.52 05/04/13 13:26:57 lenz@stripped +0 -0
    Manual merge

  BitKeeper/deleted/.del-zimbabwe.gif~478cfbaa6f5b066a
    1.4 05/04/13 12:25:14 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-zambia.gif~3b2580f7d11759ec
    1.4 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-zaire.gif~52dbed02848edb31
    1.4 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.txt~cd146d758c75e6ab
    1.3 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.pdf~978eeff094d4a57e
    1.3 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.gif~d58992747df26331
    1.4 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.gif~532010647f1c98f7
    1.4 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-yugoslavia.eps~b9bab90d98a3de45
    1.4 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-yemen.gif~f0d4b9daecbbab9
    1.4 05/04/13 12:25:13 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-vincent-and-grenadines.gif~f5ab7e413d8f1d5
    1.4 05/04/13 12:25:12 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-vietnam.gif~b8a7befce71994b1
    1.4 05/04/13 12:25:12 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-venezuela.gif~8b00719028184b0d
    1.4 05/04/13 12:25:12 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-vanuatu.gif~e66deb3569e8c9a1
    1.4 05/04/13 12:25:12 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-uzbekistan.gif~ca70f72fc4bca763
    1.4 05/04/13 12:25:11 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.txt~2792ba8db79f0a39
    1.5 05/04/13 12:25:11 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.pdf~ed44efa3b0c6f6ed
    1.3 05/04/13 12:25:11 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.gif~7c94951adc03bf9a
    1.4 05/04/13 12:25:11 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.gif~278102a819343b97
    1.5 05/04/13 12:25:11 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-usa.eps~64e6c5fe46d1929d
    1.6 05/04/13 12:25:11 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-uruguay.gif~17d468a8b3affba4
    1.4 05/04/13 12:25:11 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-united-states-of-america.gif~3817309e55e1f332
    1.4 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-united-arab-emirates.gif~2a6d03565d6ae748
    1.4 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.txt~e4c1066096a8b1b3
    1.4 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.pdf~d3b480f6acf3b56a
    1.3 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.gif~d167f4bf9179141d
    1.5 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.gif~847cd0f7333e72ac
    1.4 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ukraine.eps~f450a951bf5c4dc9
    1.5 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-uganda.gif~45b3e3b539f02aee
    1.4 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-tuvalu.gif~3f85331ac0890213
    1.4 05/04/13 12:25:10 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkmenistan.gif~7679a96df08d950a
    1.4 05/04/13 12:25:09 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.txt~bc65755bf8a2a21
    1.3 05/04/13 12:25:09 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.pdf~287742544b50b431
    1.3 05/04/13 12:25:09 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.gif~cb55d42965e9f824
    1.6 05/04/13 12:25:09 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.gif~b0bd57ef44dee47a
    1.4 05/04/13 12:25:09 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-turkey.eps~6e9ebd6992e53d70
    1.6 05/04/13 12:25:09 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-tunisia.gif~f7b1ad0569613f36
    1.4 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-trinidad-and-tobago.gif~dfa47192f1bc025
    1.4 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-tonga.gif~87fef29eef8c57fd
    1.4 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-togo.gif~485e7cec93f5410a
    1.4 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-thailand.gif~263675b09165b835
    1.4 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-texi2html~74632fe370dcec73
    1.12 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-tanzania.gif~3fbe0bc01bcc3247
    1.4 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-tajikistan.gif~4e42abdd2be16ed8
    1.4 05/04/13 12:25:08 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.txt~d0a19c41a1ed3861
    1.5 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.pdf~5ff5a019d8237d3c
    1.3 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.gif~b5f1796ed3c458e4
    1.5 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.gif~295c56859e5f5e
    1.4 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-taiwan.eps~cc2ecaf6122443f
    1.6 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-syria.gif~5a910d0a3a57701
    1.4 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.txt~e09c851d69c407a6
    1.4 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.pdf~ec02533fefb5071d
    1.3 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.gif~dabb711999e3126d
    1.5 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.gif~37312e2f4537a7e3
    1.4 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-switzerland.eps~7811f8473ff72b6e
    1.5 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden2.gif~51ee64f83a448b5
    1.4 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.txt~b6d9f06fa227065d
    1.5 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.pdf~4afd5afe76bd9172
    1.3 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.gif~dc755f14f1dc3c49
    1.4 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.gif~8653c24f7bac88dc
    1.5 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sweden.eps~4c24b952feb3ab
    1.6 05/04/13 12:25:07 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-swaziland.gif~88decc065b4034b5
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-suriname.gif~54de84a4ef71a82
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sudan.gif~6c5d2540c31b8c27
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sri-lanka.gif~ef59edd8115e2afa
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.txt~4b3da48f41bfa958
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.pdf~a25de45d2ded91ed
    1.3 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.gif~7217c59c507d153c
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.gif~345db1228c3a5477
    1.5 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-spain.eps~a798dd1293a30b7c
    1.5 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.txt~93c9adabe5ac3339
    1.5 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.pdf~24496add674f1d6
    1.3 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.gif~f0fe17a9495664c9
    1.5 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.gif~1311c2eada860e9d
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-korea.eps~9c944ac52a247665
    1.6 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.txt~4674c3b1a39d79c9
    1.4 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.pdf~ef7f63c8153ef8d5
    1.3 05/04/13 12:25:06 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.gif~8ef88d69ba7c794
    1.5 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.gif~2aaea35c3bdd90b6
    1.4 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-south-africa.eps~4f647997f3f26988
    1.5 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-somalia.gif~7c09bce9340f39ca
    1.4 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-solomon-islands.gif~b4de58f666ff31c7
    1.4 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.txt~21996e7d83808d0f
    1.3 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.pdf~349905c733fcc8a
    1.3 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.gif~405038776bc7f2a1
    1.4 05/04/13 12:25:05 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.gif~353783f82c89c7c8
    1.4 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovenia.eps~f73ea56aafc02828
    1.4 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-slovakia.gif~c3d054b17f9c8997
    1.4 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.txt~21978a833ace2d2
    1.4 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.pdf~77019ac12b0d44b0
    1.3 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.gif~e18bf77765b76d2f
    1.4 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.gif~78f227e1f0129a
    1.5 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-singapore.eps~1efd8578def570d8
    1.5 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sierra-leone.gif~5c446a27d7e98d59
    1.4 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-seychelles.gif~f0b489c8e84fef71
    1.4 05/04/13 12:25:04 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-senegal.gif~944633605d3a29ff
    1.4 05/04/13 12:25:03 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-section.Users.texi~41da5f4c
    1.3 05/04/13 12:25:03 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-section.Testimonials.texi~418f3f63
    1.3 05/04/13 12:25:03 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-section.Infolinks.texi~c237f2f9
    1.3 05/04/13 12:25:03 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-saudi-arabia.gif~af90b0627e4ae9d8
    1.4 05/04/13 12:25:02 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-sao-tome-and-principe.gif~94b3095157b80615
    1.4 05/04/13 12:25:02 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-samoa.gif~7f7fab6fab145abb
    1.4 05/04/13 12:25:02 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-saint-lucia.gif~a43f5b43c241e500
    1.4 05/04/13 12:25:02 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-saint-kitts-and-nevis.gif~485d911ee10ee2da
    1.4 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-rwanda.gif~ba3a28fb5edc29f5
    1.4 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.txt~91dea186f11d7fdc
    1.5 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.pdf~7fe386a4e48f013
    1.3 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.gif~403a87b38ae5c91f
    1.4 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.gif~300890a87b30d01e
    1.5 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-russia.eps~653c84cd2a80b954
    1.6 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.txt~c716fe6568110738
    1.4 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.pdf~322c2e57ce6ceed
    1.3 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.gif~8c5ad831482c31e3
    1.5 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.gif~325d2f16f9f78167
    1.4 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-romania.eps~d197860bb0edbd64
    1.5 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-qatar.gif~9fb4afe3352b17
    1.4 05/04/13 12:25:01 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.txt~b3286118e0bfcc3
    1.4 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.pdf~24587f586bc7534b
    1.3 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.gif~c7cc13bb1c6dfe9d
    1.5 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.gif~b6ec9ce2c88220f6
    1.4 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-portugal.eps~98b9150ce6a649b8
    1.5 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.txt~e484ca6c9feb9080
    1.4 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.pdf~e71f4eaa53f33cd
    1.3 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.gif~bcbc9ed9b75fcd3c
    1.5 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.gif~9d9673f2ea9d5129
    1.4 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-poland.eps~8be27a5447e3a146
    1.5 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.txt~f42e0270d8e22325
    1.3 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.pdf~b7977a895a0f6a76
    1.3 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.gif~c80b5315738462af
    1.4 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.gif~6cf82c24f6baef53
    1.5 05/04/13 12:25:00 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-philippines.eps~64beb8e0853db8b2
    1.6 05/04/13 12:24:59 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-peru.gif~323d2810b25bcab3
    1.4 05/04/13 12:24:59 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-paraguay.gif~e7b5dd73d7727a1d
    1.4 05/04/13 12:24:59 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-papua-new-guinea.gif~884e9e27b55e51b9
    1.4 05/04/13 12:24:58 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-panama.gif~99595dd051a094f
    1.4 05/04/13 12:24:58 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-pakistan.gif~5ef5cc6b162666b8
    1.4 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-oman.gif~3a84654e80950b30
    1.4 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.txt~2844906ae717ea7a
    1.3 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.pdf~980b935627182fb9
    1.3 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.gif~752c4b4d29375874
    1.4 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.gif~1d881d2af6c4e413
    1.5 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-norway.eps~b37c98d87edd8de
    1.5 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-north-korea.gif~770fd51d9360ae18
    1.4 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-nigeria.gif~f157c385bd632a48
    1.4 05/04/13 12:24:57 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-niger.gif~c26adaadb8150cee
    1.4 05/04/13 12:24:56 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-nicaragua.gif~37b8f7764ac4aea
    1.4 05/04/13 12:24:56 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.txt~f52fdd9690b63ac0
    1.3 05/04/13 12:24:56 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.pdf~ceb107c0ae812a14
    1.3 05/04/13 12:24:56 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.gif~77ea426c11bb3ab
    1.3 05/04/13 12:24:56 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.gif~1fbc54ab63225de7
    1.4 05/04/13 12:24:55 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-new-zealand.eps~861b5316178fcb08
    1.3 05/04/13 12:24:55 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.txt~214c2cbb9ac7db0a
    1.4 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.pdf~4833162b30912e1
    1.3 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.gif~d788dc4e9afd2f8a
    1.5 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.gif~a1bee178928be339
    1.4 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-netherlands.eps~2012cff48c4d9368
    1.5 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-nepal.gif~ae565b396d09e9db
    1.4 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-nauru.gif~1e08a1188c8ba0a5
    1.4 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-namibia.gif~f3b3b2c233c9031f
    1.4 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d
    1.11 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mozambique.gif~41991b5a9df37691
    1.4 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-morocco.gif~45858306e12988e9
    1.4 05/04/13 12:24:54 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mongolia.gif~41633d1ced991c78
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-monaco.gif~d2a99ae34527d133
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-moldova.gif~34a9fa58f5674048
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-micronesia.gif~c46715026d7efe8e
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.txt~a776cf3478c85e68
    1.3 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.pdf~a0b20871c2e61325
    1.3 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.gif~a749e257ffeb6588
    1.5 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.gif~8effa1ca4d73071e
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mexico.eps~9186bd67f1a25a3f
    1.6 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mauritius.gif~498d6d0e323d7ef9
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mauritania.gif~b6d97b5076bb603a
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-marshall.gif~38fc2b1073ceb166
    1.4 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41
    1.5 05/04/13 12:24:53 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual.texi~af95f3e233925495
    1.882 05/04/13 12:24:51 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual.ja.texi~bdf63728a7b03acf
    1.8 05/04/13 12:24:46 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-malta.gif~d0d470d7dbb963ea
    1.4 05/04/13 12:24:45 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-mali.gif~845a23a66aaaef5
    1.4 05/04/13 12:24:45 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-maldives.gif~941bf5a2381b904c
    1.4 05/04/13 12:24:45 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-malaysia.gif~6f7c73227da2ed6
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-malawi.gif~329ccd19b35bd1e2
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-madagascar.gif~e95bd0c2aabb8ab8
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-macedonia.gif~bce0e1455919f41b
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-luxembourg.gif~7e4660faa840e7
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-lithuania.gif~88cec9a9fe920632
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-liechtenstein.gif~8d068c686c4c6e8
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-libya.gif~98259878434e0df2
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-liberia.gif~1dd584598bfe881b
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-lesotho.gif~c42ad927ffe83db7
    1.4 05/04/13 12:24:44 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-lebanon.gif~2d27883e8fe0c647
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.txt~193a3991e0eddaf9
    1.3 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.pdf~25516993d39fa760
    1.3 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.gif~abbe57eb4438c6e8
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.gif~2d1469d626431b5a
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-latvia.eps~6a6307d66a0cb07
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-laos.gif~f686f38cbff73598
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-kyrgyzstan.gif~6cbe9f09a93ea9e0
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-kuwait.gif~2d03e81edda025d0
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-kiribati.gif~7f5bc99e8b7a6db
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-kenya.gif~d170c4f48b6635d3
    1.4 05/04/13 12:24:43 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-kazakhstan.gif~9bbe9c6ac8b42277
    1.4 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-jordan.gif~4381349560430e61
    1.4 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.txt~114edadc3ac11a71
    1.5 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.pdf~40532606f6053145
    1.3 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.gif~4c6a663ab9a32af2
    1.4 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.gif~1c6f45454aa378b3
    1.5 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-japan.eps~fe89aea87d627e85
    1.6 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-jamaica.gif~48999b84247ad492
    1.4 05/04/13 12:24:41 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.txt~428bb945a2576671
    1.5 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.pdf~ae8671649b09cb96
    1.3 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.gif~c1d1d4c51841d831
    1.4 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.gif~43074800bb72a037
    1.5 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-italy.eps~4c8a4d9f1e6fe897
    1.6 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.txt~4430c078ea12b98e
    1.5 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.gif~f503ea92490b42da
    1.4 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.gif~60af491676720a39
    1.4 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-israel.eps~43ecb6f31dcfe2f3
    1.5 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.txt~c8a9f56f150f1008
    1.4 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.pdf~e459dd3a1de0f8c7
    1.3 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.gif~5e4633333643bee2
    1.4 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.gif~3a5ffafd74c67fe
    1.5 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ireland.eps~9c52bfd977d47d1a
    1.5 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-iraq.gif~a1646e6d65515d76
    1.4 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-iran.gif~2cb4e9c4657b5b33
    1.4 05/04/13 12:24:40 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.txt~cae5c380959a5460
    1.3 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.pdf~f14b2f53c85a43d
    1.3 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.gif~a096242096a7c7a
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.gif~2137016b86bc5d07
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-indonesia.eps~ca7ee0a66154d34d
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-india.gif~c93c8f6fff86f765
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.txt~dd6b3c03d0e35936
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.pdf~da00f08b9f794a92
    1.3 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.gif~aa7253cb1838978e
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.gif~902645739e3c6b75
    1.5 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-iceland.eps~9cc02c4e666e803
    1.5 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.txt~c65c28ecc13cee38
    1.5 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.pdf~918baeb6bf07fa97
    1.3 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.gif~74e09a15557c20e4
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.gif~373325ba9bcbdc72
    1.5 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-hungary.eps~a7d682f15e7be0ea
    1.6 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-honduras.gif~f0715e39e5b80529
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-haiti.gif~5831a1b51a9b0d3d
    1.4 05/04/13 12:24:39 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-guyana.gif~3eca6d667b6fcb36
    1.4 05/04/13 12:24:38 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-guinea.gif~89df2e995fbc90d1
    1.4 05/04/13 12:24:38 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-guinea-bissau.gif~dc000cb5bd0eb40e
    1.4 05/04/13 12:24:38 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-guatemala.gif~4d43cb1c1dbeddc7
    1.4 05/04/13 12:24:38 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-grenada.gif~db9d209340558224
    1.4 05/04/13 12:24:38 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-greenland.gif~44310f9e9180e0b
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.txt~5c5b5ddbb62811c9
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.pdf~e61ed027c4d629
    1.3 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.gif~d2a46be5950e4784
    1.5 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.gif~c8fbf8252cc56212
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-greece.eps~30dd253c6047f42f
    1.5 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.txt~c1362455ef389db2
    1.5 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.pdf~b425328dc4073027
    1.3 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.gif~d4ec21a021252ce5
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.gif~94507aceb6ea0298
    1.5 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-great-britain.eps~69bd9bdc60b3b71b
    1.6 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ghana.gif~9d71585fa3b223c0
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.txt~d73791b0314d5343
    1.5 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.pdf~aca678db2fc30f2f
    1.3 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.gif~97dfeb0eb82cac6d
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.gif~7c2750867600a157
    1.5 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-germany.eps~8ec02ead1a75bbfb
    1.6 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-georgia.gif~3a9c93fa982b8c06
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-gambia.gif~8525f1597465137d
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-gabon.gif~5e5c7c8dc0902328
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.txt~fe93e7e98b8daec0
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.pdf~2f143b49353abb46
    1.3 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.gif~64aa78ca3e77be37
    1.4 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.gif~31e0b62070c6d14f
    1.5 05/04/13 12:24:37 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-france.eps~54769290ec25c3f8
    1.5 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.txt~de31f3046646f95
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.pdf~aab3e414da9754ab
    1.3 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.gif~3856b7c47a822250
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.gif~31a9c03ceac484df
    1.5 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-finland.eps~ababe64096bc701e
    1.5 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-fiji.gif~3a082d54c888db61
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ethiopia.gif~67458ef685bd46ca
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.txt~fbabf17caf23c74
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.pdf~152b980e58ddfe95
    1.3 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.gif~d5dbe214eadc22f9
    1.5 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.gif~95d6213246c5d512
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-estonia.eps~476ee9951ed567a6
    1.5 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-eritrea.gif~d27f5468ecf168a
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-equatorial-guinea.gif~e3d315d4eaf28a41
    1.4 05/04/13 12:24:36 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-el-salvador.gif~87bfdc4a1b16ca67
    1.4 05/04/13 12:24:35 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-egypt.gif~1abbeb9541c45762
    1.4 05/04/13 12:24:35 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-ecuador.gif~da0b80de595301f5
    1.4 05/04/13 12:24:35 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-dominican-republic.gif~a05fa19ee59566f
    1.4 05/04/13 12:24:35 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-dominica.gif~91c8fddd58385d66
    1.4 05/04/13 12:24:34 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-djibouti.gif~3a11d87bfdc7ca6a
    1.4 05/04/13 12:24:34 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.txt~9467854a287a11d3
    1.4 05/04/13 12:24:34 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.pdf~772f1f647f6675b4
    1.3 05/04/13 12:24:34 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.gif~794733445761c7d9
    1.5 05/04/13 12:24:34 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.gif~56d1cc99f435d046
    1.4 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark.eps~67c559554779943c
    1.5 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-denmark-original-incorrect.gif~5d85710fb55de2c2
    1.4 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.txt~f35c3417f35bb917
    1.5 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.pdf~6185b7b29cf21c20
    1.3 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.gif~3cdfb4447c89fb7a
    1.5 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.gif~12957b374194bb89
    1.4 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-czech-republic.eps~3a16711ce569e4f7
    1.6 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-cyprus.gif~fecfaf77f8153607
    1.4 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-cuba.gif~16838c96e8195f08
    1.4 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.txt~55d9c2aaec850113
    1.4 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.gif~d48555c97fa6e7b0
    1.4 05/04/13 12:24:33 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.gif~7b7a7e5c76dbc1
    1.4 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-croatia.eps~621866ebf8db9526
    1.4 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-cote-d-ivoire.gif~9adcb3eb5599012e
    1.4 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.txt~fc47cc5846cde0c1
    1.3 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.pdf~ad1185a29a583cff
    1.3 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.gif~f10605fdf2aea8a
    1.4 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.gif~e4f609b46043b612
    1.3 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-costa-rica.eps~3999b27ab2e876c5
    1.3 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-congo.gif~7737656d9939a718
    1.4 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-comoros.gif~a045ba2590ad8204
    1.4 05/04/13 12:24:32 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-colombia.gif~e0eaca8dffd0e137
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.txt~f2c436ae8409252
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.pdf~b3524c4313aeb4f4
    1.3 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.gif~f2aa06d0635b653f
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.gif~a6df3c22685c50fd
    1.5 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-china.eps~e27e42602de3ded7
    1.5 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.txt~c143167238e9db34
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.pdf~3ccf0b62c48e0eb8
    1.3 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.gif~9e2cb4d54d82d046
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.gif~5f7700a1414fba60
    1.5 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-chile.eps~6b4470792773d5f9
    1.5 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-chad.gif~e6657243d593d2be
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-central-african-republic.gif~c0bf932afe983895
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-cape-verde.gif~152189bcc5c245a2
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.txt~c877dedbb6500f48
    1.5 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.pdf~7aa6ddfa4274a503
    1.3 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.gif~e75e7e744dba396c
    1.4 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.gif~2b36f4f336fcbdd7
    1.5 05/04/13 12:24:31 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-canada.eps~870d51433272b91e
    1.6 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-cameroon.gif~e144fca71e8fc244
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-cambodia.gif~390be7f98e98ef0f
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-burundi.gif~77e447f736b5b8fe
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-burma.gif~ab554009f470a00b
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-burkina-faso.gif~f17ab1a7b4726205
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.txt~8d3854c355db697e
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.pdf~fdcd6f1b96d36f5b
    1.3 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.gif~859289ca21a394b
    1.5 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.gif~829eaaa78ea00bc4
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bulgaria.eps~58ae212ad442ecb7
    1.5 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-brunei.gif~9d74fa8a8655bb8e
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.txt~82fed449c34f3150
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.gif~43080d754a1f66c3
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.gif~1cc3967b6293833b
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-brazil.eps~d11dc8c39b1b52ed
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-botswana.gif~ada926c097ae7484
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bosnia-and-herzegovina.gif~4bfbcc12c26a97ed
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bolivia.gif~7fbd5d698e19a7
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bhutan.gif~895593de8b75b3d7
    1.4 05/04/13 12:24:30 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bermuda.gif~60ea5c297a759644
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-benin.gif~e55efbc654304fc2
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-belize.gif~e1910cdc1a2aaf4a
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.txt~1cc4ae60f07ea525
    1.3 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.pdf~d66d1f4d161dbfa7
    1.3 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.gif~a94aacc01a1443af
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.gif~47e115c2f692a300
    1.5 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-belgium.eps~10f1218e783cadb5
    1.6 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-belarus.gif~e8b45aa5f1ca2b6d
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-barbados.gif~2c0e969f87b19e31
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bangladesh.gif~a26e3ed0f95fe8b
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bahrein.gif~fb4f1be9efcd652a
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-bahamas.gif~55a7fa36a5710a19
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-azerbaijan.gif~98176e76cf690118
    1.4 05/04/13 12:24:29 lenz@stripped +0 -0
    Auto merged

  configure.in
    1.360 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.txt~eabda07c94bc3783
    1.5 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.pdf~88115eca98801ee1
    1.3 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.gif~eda4c0df508b2796
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.gif~4b528a1b567629c1
    1.5 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-austria.eps~8e6934b528c7ba65
    1.6 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.txt~88eae38ad0a29a9b
    1.5 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.pdf~e7a39134644c310c
    1.3 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.gif~c6d8db20d5bdb80c
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.gif~56f9808ee943fac
    1.5 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-australia.eps~c3f5a8e36f6a6772
    1.6 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.txt~9b07e8896669b144
    1.3 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.gif~d812f4ac738f93b5
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.gif~38bb7a3d6a564ecc
    1.3 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-armenia.eps~643f5c261ebab928
    1.3 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.txt~75de5b063d1a1560
    1.3 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.pdf~83fcf14b727ae306
    1.3 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.gif~4fc28afb8cb08692
    1.5 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.gif~1818b07e221227
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-argentina.eps~79d033cbfba0697a
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-antigua-and-barbuda.gif~471679e823427c3d
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-antartica.gif~1a34b3a7409d5bf2
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-angola.gif~b366af754ac52de3
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-andorra.gif~400c9517f5a7268f
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-algeria.gif~70038752bd872102
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-albania.gif~920c18c5f3bd94f5
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-afghanistan.gif~bd934d946f3bdd59
    1.4 05/04/13 12:24:28 lenz@stripped +0 -0
    Auto merged

  BitKeeper/deleted/.del-manual.texi~af95f3e233925495
    1.881 05/04/13 12:24:26 lenz@stripped +0 -0
    Merge rename: Docs/manual.texi -> BitKeeper/deleted/.del-manual.texi~af95f3e233925495

  BitKeeper/deleted/.del-texi2html~74632fe370dcec73
    1.11 05/04/13 12:24:25 lenz@stripped +0 -0
    Merge rename: Docs/Support/texi2html -> BitKeeper/deleted/.del-texi2html~74632fe370dcec73

  BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d
    1.10 05/04/13 12:24:25 lenz@stripped +0 -0
    Merge rename: Docs/mysqld_error.txt -> BitKeeper/deleted/.del-mysqld_error.txt~95f167eb567c789d

  BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41
    1.4 05/04/13 12:24:24 lenz@stripped +0 -0
    Merge rename: Docs/manual_toc.html -> BitKeeper/deleted/.del-manual_toc.html~f483f2d33d9acb41

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lenz
# Host:	metis.lenznet
# Root:	/space/my/mysql-4.1-build/RESYNC

--- 1.51/Docs/Makefile.am	2004-11-12 21:15:50 +01:00
+++ 1.52/Docs/Makefile.am	2005-04-13 13:26:57 +02:00
@@ -9,184 +9,17 @@
 # If you know how to fix any of this more elegantly please mail
 # docs@stripped
 
-TEXI2HTML_FLAGS =	-iso -number -acc
-DVIPS =			dvips
-MAKEINFO =		@MAKEINFO@
-TEXINFO_TEX =		Support/texinfo.tex
+noinst_SCRIPTS =	Support/generate-text-files.pl
 
-noinst_SCRIPTS =	Support/texi2html Support/generate-text-files.pl \
-			Support/generate-mirror-listing.pl
-info_TEXINFOS =		manual.texi
+EXTRA_DIST =		$(noinst_SCRIPTS) mysql.info INSTALL-BINARY
 
-targets =		manual.txt mysql.info manual.html
-
-BUILT_SOURCES =		$(targets) manual_toc.html include.texi
-EXTRA_DIST =		$(noinst_SCRIPTS) $(BUILT_SOURCES) mysqld_error.txt \
-			INSTALL-BINARY reservedwords.texi internals.texi
-
-SUBDIRS =		Images
-
-all:			$(targets) txt_files
+all:			txt_files
 
 txt_files:		../INSTALL-SOURCE ../COPYING ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
 			INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
 
-CLEAN_FILES:		$(BUILD_SOURCES)
-	touch $(BUILD_SOURCES)
-
-# The PostScript and PDF version are so big that they are not included in the
-# standard distribution. It is available for download from the home page.  
-paper: manual_a4.ps manual_letter.ps  $(PDFMANUAL)
-
-#########################################################################
-
-# The Makefile contains the previous version so we can not use that
-include.texi:	../configure.in
-	echo "@c This file is autogenerated by the Makefile" > $@
-	echo -n "@set mysqlversion " >> $@
-	grep "AM_INIT_AUTOMAKE(mysql, " ../configure.in | \
-	 sed -e 's;AM_INIT_AUTOMAKE(mysql, ;;' -e 's;);;' >> $@
-	echo -n "@set defaultport " >> $@
-	grep "MYSQL_TCP_PORT_DEFAULT=" ../configure.in | \
-	 sed -e 's;MYSQL_TCP_PORT_DEFAULT=;;' >> $@
-
-
-#
-# English Manual
-#
-
-# GNU Info
-mysql.info:	manual.texi include.texi
-	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
-
-# Plain Text
-manual.txt:	manual.texi include.texi
-	cd $(srcdir) && \
-	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
-
-# HTML, all in one file
-manual.html:	manual.texi include.texi $(srcdir)/Support/texi2html
-	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
-manual_toc.html: manual.html
-
-# PDF, Portable Document Format
-manual.pdf: manual.texi
-	sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	mv manual-tmp.pdf $@
-	rm -f manual-tmp.*
-	touch $@
-
-# XML, DocBook 4.0
-mysql.xml: manual.texi include.texi
-	$(MAKEINFO) --force --no-ifinfo --docbook $<
-	mv $@ mysql-tmp.xml
-	Support/docbook-fixup.pl <mysql-tmp.xml >$@
-	rm -f mysql-tmp.xml
-
-# Postscript, A4 Paper
-manual_a4.ps:	manual.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
-	$(DVIPS) -t a4 manual.dvi -o $@
-	touch $@
-
-# Postscript, US Letter Paper
-manual_letter.ps:	manual.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch $<
-	$(DVIPS) -t letter manual.dvi -o $@
-	touch $@
-
-
-#
-# German Manual
-#
-
-# GNU Info
-mysql.de.info:	manual.de.texi include.texi
-	cd $(srcdir) && $(MAKEINFO) --no-split -I $(srcdir) $<
-
-# Plain Text
-manual.de.txt:	manual.de.texi include.texi
-	cd $(srcdir) && \
-	$(MAKEINFO) -I $(srcdir) --no-headers --no-split --output $@ $<
-
-# HTML, all in one file
-manual.de.html:	manual.de.texi include.texi $(srcdir)/Support/texi2html
-	cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $<
-manual_toc.de.html: manual.html
-
-# PDF, Portable Document Format
-manual.de.pdf: manual.de.texi
-	sed -e 's|@image{[^}]*} *||g' <$< >manual-tmp.texi
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	mv manual-tmp.pdf $@
-	rm -f manual-tmp.*
-	touch $@
-
-# XML, DocBook 4.0
-mysql.de.xml: manual.de.texi include.texi
-	$(MAKEINFO) --force --no-ifinfo --docbook $<
-	mv $@ mysql-tmp.xml
-	Support/docbook-fixup.pl <mysql-tmp.xml >$@
-	rm -f mysql-tmp.xml
-
-# Postscript, A4 Paper
-manual_a4.de.ps:	manual.de.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch --texinfo --quiet '@afourpaper' $<
-	$(DVIPS) -t a4 manual.de.dvi -o $@
-	touch $@
-
-# Postscript, US Letter Paper
-manual_letter.de.ps:	manual.de.texi include.texi
-	TEXINPUTS=$(srcdir):$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' \
-	    $(TEXI2DVI) --batch $<
-	$(DVIPS) -t letter manual.de.dvi -o $@
-	touch $@
-
-#
-# Miscellaneous
-#
-
-# Target to produce NuSphere Manual
-nusphere.pdf: manual.texi
-	sed -e 's/@example/@smallexample/g' \
-	    -e 's/@end example/@end smallexample/g' \
-	    -e 's/@c ifnusphere //g' \
-	    -e 's|@image{[^}]*} *||g' \
-	<$< >manual-tmp.texi
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	texindex manual-tmp.??
-	pdftex --interaction=nonstopmode manual-tmp.texi
-	mv manual-tmp.pdf $@
-	rm -f manual-tmp.*
-	touch $@
-
-# Include images for the manual in the distribution
-dist-hook:
-	BD=`cd $(top_srcdir); pwd`; \
-	echo "PostScript and PDF versions suitable for printing" \
-		> $(distdir)/manual.ps
-	echo "are available from http://dev.mysql.com/doc/" \
-		>> $(distdir)/manual.ps
-	echo "or any mirror site" \
-		>> $(distdir)/manual.ps
+CLEAN_FILES:		$(txt_files)
+	touch $(txt_files)
 
 GT = $(srcdir)/Support/generate-text-files.pl
 
@@ -201,9 +34,6 @@
 # the toplevel by the script that makes the binary tar files.
 INSTALL-BINARY:	mysql.info $(GT)
 	perl -w $(GT) mysql.info "Installing binary" "Installing source" > $@
-
-../COPYING:		mysql.info $(GT)
-	perl -w $(GT) mysql.info "GPL license" "MySQL FLOSS License Exception" > $@
 
 ../EXCEPTIONS-CLIENT: mysql.info $(GT)
 	perl -w $(GT) mysql.info "MySQL FLOSS License Exception" "Function Index" > $@

--- 1.359/configure.in	2005-04-11 17:31:08 +02:00
+++ 1.360/configure.in	2005-04-13 12:24:28 +02:00
@@ -3227,7 +3227,7 @@
  sql-common/Makefile SSL/Makefile dnl
  dbug/Makefile scripts/Makefile dnl
  include/Makefile sql-bench/Makefile tools/Makefile dnl
- tests/Makefile Docs/Makefile Docs/Images/Makefile support-files/Makefile dnl
+ tests/Makefile Docs/Makefile support-files/Makefile dnl
  support-files/MacOSX/Makefile mysql-test/Makefile dnl
  netware/Makefile dnl
  include/mysql_version.h dnl

--- 1.89/support-files/mysql.spec.sh	2005-04-01 18:52:00 +02:00
+++ 1.90/support-files/mysql.spec.sh	2005-04-13 13:26:57 +02:00
@@ -363,11 +363,6 @@
 (cd libmysql/.libs; tar cf $RBR/shared-libs.tar *.so*)
 (cd libmysql_r/.libs; tar rf $RBR/shared-libs.tar *.so*)
 
-# Save manual to avoid rebuilding
-mv Docs/manual.ps Docs/manual.ps.save
-make clean
-mv Docs/manual.ps.save Docs/manual.ps
-
 #
 # Only link statically on our i386 build host (which has a specially
 # patched static glibc installed) - ia64 and x86_64 run glibc-2.3 (unpatched)
@@ -533,8 +528,6 @@
 %defattr(-,root,root,0755)
 
 %doc COPYING README 
-%doc Docs/manual.{html,ps,texi,txt}
-%doc Docs/manual_toc.html
 %doc support-files/my-*.cnf
 %doc support-files/ndb-*.ini
 
@@ -695,6 +688,11 @@
 # itself - note that they must be ordered by date (important when
 # merging BK trees)
 %changelog 
+* Wed Mar 13 2005 Lenz Grimmer <lenz@stripped>
+
+- removed the MySQL manual files (html/ps/texi) - they have been removed
+  from the MySQL sources and are now available seperately.
+
 * Mon Feb 14 2005 Lenz Grimmer <lenz@stripped>
 
 * Fixed the compilation comments and moved them into the separate build sections

--- 1.31/scripts/make_win_src_distribution.sh	2005-03-31 20:27:22 +02:00
+++ 1.32/scripts/make_win_src_distribution.sh	2005-04-13 13:26:57 +02:00
@@ -289,9 +289,7 @@
 for i in COPYING ChangeLog README EXCEPTIONS-CLIENT\
          INSTALL-SOURCE INSTALL-WIN \
          INSTALL-WIN-SOURCE \
-         Docs/manual_toc.html  Docs/manual.html \
-         Docs/manual.txt Docs/mysqld_error.txt \
-         Docs/INSTALL-BINARY Docs/internals.texi
+         Docs/INSTALL-BINARY
 do
   print_debug "Copying file '$i'"
   if [ -f $i ]
Thread
bk commit into 4.1 tree (lenz:1.2173)lenz13 Apr