tagging 1.0.1

git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/1.0.1@984255 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 46 insertions, 7 deletions

diff --git a/CHANGES b/CHANGES
index 384b3f38..08458f10 100644
--- a/CHANGES
+++ b/CHANGES
@@ -30,6 +30,10 @@ Futon:
 
   * User interface element for querying stale (cached) views.
 
+Build and System Integration:
+
+  * Included additional source files for distribution.
+
 Version 1.0.0
 -------------
 
diff --git a/NEWS b/NEWS
index 5f7e3306..bd6b5d2b 100644
--- a/NEWS
+++ b/NEWS
@@ -33,7 +33,7 @@ Version 1.0.0
 Version 0.11.2
 --------------
 
-  * Replicator buxfixes for design documents and secured databases.
+  * Replicator buxfixes for replicating design documents from secured databases.
   * Better error messages on invalid URL requests.
   * User documents can now be deleted by admins or the user.
   * Avoid potential DOS attack by guarding all creation of atoms.
diff --git a/configure.ac b/configure.ac
index 0c089523..c609a084 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,6 +391,7 @@ AC_CONFIG_FILES([etc/launchd/org.apache.couchdb.plist.tpl])
 AC_CONFIG_FILES([etc/launchd/Makefile])
 AC_CONFIG_FILES([etc/logrotate.d/couchdb.tpl])
 AC_CONFIG_FILES([etc/logrotate.d/Makefile])
+AC_CONFIG_FILES([etc/windows/Makefile])
 AC_CONFIG_FILES([etc/Makefile])
 AC_CONFIG_FILES([share/Makefile])
 AC_CONFIG_FILES([src/Makefile])
diff --git a/etc/Makefile.am b/etc/Makefile.am
index c166636c..148f7015 100644
--- a/etc/Makefile.am
+++ b/etc/Makefile.am
@@ -10,7 +10,7 @@
 ## License for the specific language governing permissions and limitations under
 ## the License.
 
-SUBDIRS = couchdb default init launchd logrotate.d
+SUBDIRS = couchdb default init launchd logrotate.d windows
 
 default_sysconf_data = logrotate.d/couchdb
 
@@ -25,10 +25,15 @@ endif
 
 nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
 
-EXTRA_DIST = default/couchdb
+EXTRA_DIST = \
+    default/couchdb \
+    windows/couchdb.iss.tpl \
+    windows/README.txt.tpl
 
 if WINDOWS
-EXTRA_DIST += windows/setup-couchdb-@version@.exe.md5 windows/setup-couchdb-@version@.exe.sha
+EXTRA_DIST += \
+    windows/setup-couchdb-@version@.exe.md5 \
+    windows/setup-couchdb-@version@.exe.sha
 endif
 
 CLEANFILES = $(init_DATA) $(default_sysconf_data) $(launchd_DATA)
diff --git a/etc/windows/Makefile.am b/etc/windows/Makefile.am
new file mode 100644
index 00000000..5b4faae0
--- /dev/null
+++ b/etc/windows/Makefile.am
@@ -0,0 +1,13 @@
+## Licensed under the Apache License, Version 2.0 (the "License"); you may not
+## use this file except in compliance with the License. You may obtain a copy of
+## the License at
+##
+##   http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+## WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+## License for the specific language governing permissions and limitations under
+## the License.
+
+## This file intentionally left blank.
diff --git a/license.skip b/license.skip
index 10ff0892..a7aa6ec3 100644
--- a/license.skip
+++ b/license.skip
@@ -49,6 +49,7 @@
 ^etc/logrotate.d/Makefile
 ^etc/logrotate.d/Makefile.in
 ^etc/logrotate.d/couchdb*
+^etc/windows/Makefile
 ^etc/windows/README.txt.tpl
 ^libtool
 ^license.skip
diff --git a/share/Makefile.am b/share/Makefile.am
index 77d5f8d8..752fa9f9 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -104,6 +104,10 @@ nobase_dist_localdata_DATA = \
     www/script/jquery.resizer.js \
     www/script/jquery.suggest.js \
     www/script/json2.js \
+    www/script/jspec/jspec.css \
+    www/script/jspec/jspec.jquery.js \
+    www/script/jspec/jspec.js \
+    www/script/jspec/jspec.xhr.js \
     www/script/oauth.js \
     www/script/sha1.js \
     www/script/base64.js \
@@ -175,6 +179,16 @@ nobase_dist_localdata_DATA = \
     www/script/test/view_pagination.js \
     www/script/test/view_sandboxing.js \
     www/script/test/view_xml.js \
+    www/spec/couch_js_class_methods_spec.js \
+    www/spec/couch_js_instance_methods_1_spec.js \
+    www/spec/couch_js_instance_methods_2_spec.js \
+    www/spec/couch_js_instance_methods_3_spec.js \
+    www/spec/custom_helpers.js \
+    www/spec/jquery_couch_js_class_methods_spec.js \
+    www/spec/jquery_couch_js_instance_methods_1_spec.js \
+    www/spec/jquery_couch_js_instance_methods_2_spec.js \
+    www/spec/jquery_couch_js_instance_methods_3_spec.js \
+    www/spec/run.html \
     www/status.html \
     www/style/layout.css \
     www/_sidebar.html
diff --git a/src/erlang-oauth/Makefile.am b/src/erlang-oauth/Makefile.am
index 1d123396..48b76482 100644
--- a/src/erlang-oauth/Makefile.am
+++ b/src/erlang-oauth/Makefile.am
@@ -12,18 +12,19 @@
 
 oauthebindir = $(localerlanglibdir)/erlang-oauth/ebin
 
-# Removed oauth_rsa_sha1.erl until we require R12B5 or
-# we add a ./configure option to enable it.
-
 oauth_file_collection = \
 	oauth.app.in \
     oauth.erl \
     oauth_hmac_sha1.erl \
     oauth_http.erl \
     oauth_plaintext.erl \
+    oauth_rsa_sha1.erl \
     oauth_unix.erl \
     oauth_uri.erl
 
+# Removed oauth_rsa_sha1.beam until we require R12B5 or
+# we add a ./configure option to enable it.
+
 oauthebin_make_generated_file_list = \
 	oauth.app \
     oauth.beam \