couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cml...@apache.org
Subject svn commit: r648071 - in /incubator/couchdb/branches/futon-async: ./ build-contrib/ etc/ etc/conf/ etc/couchdb/ etc/couchdb/conf/ etc/default/ etc/init/ etc/launchd/ etc/logrotate.d/
Date Tue, 15 Apr 2008 00:01:06 GMT
Author: cmlenz
Date: Mon Apr 14 17:01:01 2008
New Revision: 648071

URL: http://svn.apache.org/viewvc?rev=648071&view=rev
Log:
futon-async branch: Merged revisions 647572-648070 via svnmerge from /incubator/couchdb/trunk.

Added:
    incubator/couchdb/branches/futon-async/LICENCE
      - copied unchanged from r648069, incubator/couchdb/trunk/LICENCE
    incubator/couchdb/branches/futon-async/etc/couchdb/   (props changed)
      - copied from r648069, incubator/couchdb/trunk/etc/couchdb/
    incubator/couchdb/branches/futon-async/etc/couchdb/Makefile.am
      - copied unchanged from r648069, incubator/couchdb/trunk/etc/couchdb/Makefile.am
    incubator/couchdb/branches/futon-async/etc/couchdb/conf/
      - copied from r648069, incubator/couchdb/trunk/etc/couchdb/conf/
    incubator/couchdb/branches/futon-async/etc/couchdb/conf/mime.types
      - copied unchanged from r648069, incubator/couchdb/trunk/etc/couchdb/conf/mime.types
    incubator/couchdb/branches/futon-async/etc/couchdb/couch.ini.tpl.in
      - copied unchanged from r648069, incubator/couchdb/trunk/etc/couchdb/couch.ini.tpl.in
    incubator/couchdb/branches/futon-async/etc/couchdb/couch_httpd.conf.tpl.in
      - copied unchanged from r648069, incubator/couchdb/trunk/etc/couchdb/couch_httpd.conf.tpl.in
Removed:
    incubator/couchdb/branches/futon-async/build-contrib/apache_2.txt.gz
    incubator/couchdb/branches/futon-async/etc/conf/
    incubator/couchdb/branches/futon-async/etc/couch.ini.tpl.in
    incubator/couchdb/branches/futon-async/etc/couch_httpd.conf.tpl.in
Modified:
    incubator/couchdb/branches/futon-async/   (props changed)
    incubator/couchdb/branches/futon-async/Makefile.am
    incubator/couchdb/branches/futon-async/NEWS
    incubator/couchdb/branches/futon-async/bootstrap
    incubator/couchdb/branches/futon-async/configure.ac
    incubator/couchdb/branches/futon-async/etc/   (props changed)
    incubator/couchdb/branches/futon-async/etc/Makefile.am
    incubator/couchdb/branches/futon-async/etc/default/   (props changed)
    incubator/couchdb/branches/futon-async/etc/init/   (props changed)
    incubator/couchdb/branches/futon-async/etc/init/couchdb.tpl.in   (props changed)
    incubator/couchdb/branches/futon-async/etc/launchd/   (props changed)
    incubator/couchdb/branches/futon-async/etc/logrotate.d/   (props changed)

Propchange: incubator/couchdb/branches/futon-async/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 14 17:01:01 2008
@@ -1,6 +1,6 @@
-COPYING
-ChangeLog
 INSTALL
+ChangeLog
+LICENCE
 Makefile
 Makefile.in
 acinclude.m4

Propchange: incubator/couchdb/branches/futon-async/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Apr 14 17:01:01 2008
@@ -1 +1 @@
-/incubator/couchdb/trunk:1-647571
+/incubator/couchdb/trunk:1-648070

Modified: incubator/couchdb/branches/futon-async/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/Makefile.am?rev=648071&r1=648070&r2=648071&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/Makefile.am (original)
+++ incubator/couchdb/branches/futon-async/Makefile.am Mon Apr 14 17:01:01 2008
@@ -16,11 +16,9 @@
 
 pkgdoc_DATA = AUTHORS.gz BUGS.gz changelog.gz NEWS.gz README.gz THANKS.gz
 
-CLEANFILES = $(doc_DATA)
-
 DISTCLEANFILES = $(pkgdoc_DATA)
 
-EXTRA_DIST = AUTHORS BUGS ChangeLog NEWS README THANKS
+EXTRA_DIST = AUTHORS BUGS ChangeLog LICENCE NEWS README THANKS
 
 AUTHORS.gz: $(top_srcdir)/AUTHORS
 	-gzip -9 < $< > $@
@@ -43,7 +41,6 @@
 local-clean: maintainer-clean
 	@echo "This command is intended for maintainers to use;"
 	@echo "it deletes files that may need special tools to rebuild."
-	rm -f COPYING
 	rm -f ChangeLog
 	rm -f INSTALL
 	rm -f acinclude.m4

Modified: incubator/couchdb/branches/futon-async/NEWS
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/NEWS?rev=648071&r1=648070&r2=648071&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/NEWS (original)
+++ incubator/couchdb/branches/futon-async/NEWS Mon Apr 14 17:01:01 2008
@@ -1,8 +1,8 @@
 Apache CouchDB NEWS
 ===================
 
-Version 0.7.3a1
----------------
+Version 0.7.3a
+--------------
 
 This version is unreleased and only available from the source repository.
 

Modified: incubator/couchdb/branches/futon-async/bootstrap
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/bootstrap?rev=648071&r1=648070&r2=648071&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/bootstrap (original)
+++ incubator/couchdb/branches/futon-async/bootstrap Mon Apr 14 17:01:01 2008
@@ -29,8 +29,6 @@
 CONFIG_GUESS_FILE="build-aux/config.guess"
 CONFIG_SUB_COMPRESSED_FILE="build-contrib/config.sub_2007-09-12.gz"
 CONFIG_SUB_FILE="build-aux/config.sub"
-COPYING_FILE="COPYING"
-LICENSE_COMPRESSED_FILE="build-contrib/apache_2.txt.gz"
 M4_DIRECTORY="m4"
 M4_AC_CHECK_ICU_FILE="m4/ac_check_icu.m4"
 REPOSITORY_URI="http://svn.apache.org/repos/asf/incubator/couchdb/trunk"
@@ -192,8 +190,6 @@
 process_file_collection () {
     # Process files required to complete the bootstrap.
 
-    echo "Installing \`"$COPYING_FILE"'"
-    gzip --decompress --stdout $LICENSE_COMPRESSED_FILE > $COPYING_FILE
     echo "Installing \`"$BUILD_AUX_DIRECTORY"'"
     mkdir -p $BUILD_AUX_DIRECTORY
     echo "Installing \`"$CONFIG_GUESS_FILE"'"

Modified: incubator/couchdb/branches/futon-async/configure.ac
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/configure.ac?rev=648071&r1=648070&r2=648071&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/configure.ac (original)
+++ incubator/couchdb/branches/futon-async/configure.ac Mon Apr 14 17:01:01 2008
@@ -21,7 +21,7 @@
 
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE([1.6.3 gnu check-news -Wno-portability])
+AM_INIT_AUTOMAKE([1.6.3 foreign check-news -Wno-portability])
 
 AC_GNU_SOURCE
 AC_ENABLE_SHARED
@@ -214,8 +214,9 @@
 AC_CONFIG_FILES([bin/couchjs.tpl])
 AC_CONFIG_FILES([bin/couchdb.tpl])
 AC_CONFIG_FILES([bin/Makefile])
-AC_CONFIG_FILES([etc/couch_httpd.conf.tpl])
-AC_CONFIG_FILES([etc/couch.ini.tpl])
+AC_CONFIG_FILES([etc/couchdb/Makefile])
+AC_CONFIG_FILES([etc/couchdb/couch_httpd.conf.tpl])
+AC_CONFIG_FILES([etc/couchdb/couch.ini.tpl])
 AC_CONFIG_FILES([etc/default/couchdb.tpl])
 AC_CONFIG_FILES([etc/default/Makefile])
 AC_CONFIG_FILES([etc/init/couchdb.tpl])

Propchange: incubator/couchdb/branches/futon-async/etc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 14 17:01:01 2008
@@ -1,8 +1,2 @@
 Makefile
 Makefile.in
-couch.ini
-couch.ini.dist
-couch.ini.tpl
-couch_httpd.conf
-couch_httpd.conf.dist
-couch_httpd.conf.tpl

Modified: incubator/couchdb/branches/futon-async/etc/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/futon-async/etc/Makefile.am?rev=648071&r1=648070&r2=648071&view=diff
==============================================================================
--- incubator/couchdb/branches/futon-async/etc/Makefile.am (original)
+++ incubator/couchdb/branches/futon-async/etc/Makefile.am Mon Apr 14 17:01:01 2008
@@ -14,48 +14,27 @@
 
 couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
 
-SUBDIRS = default init launchd logrotate.d
+SUBDIRS = couchdb default init launchd logrotate.d
 
-default_sysconf_data = logrotate.d/couchdb.dist
-
-pkgconf_DATA = couch.ini.dist couch_httpd.conf.dist
-
-nobase_dist_pkgconf_DATA = conf/mime.types
+default_sysconf_data = logrotate.d/couchdb
 
 if INIT
-init_sysconf_data = default/couchdb.dist
-init_DATA = init/couchdb.dist
+init_sysconf_data = default/couchdb
+init_DATA = init/couchdb
 endif
 
 if LAUNCHD
-launchd_DATA = launchd/org.apache.couchdb.plist.dist
+launchd_DATA = launchd/org.apache.couchdb.plist
 endif
 
 nobase_sysconf_DATA = $(default_sysconf_data) $(init_sysconf_data)
 
-CLEANFILES = $(init_DATA) $(nobase_sysconf_DATA) $(launchd_DATA) $(pkgconf_DATA)
+CLEANFILES = $(init_DATA) $(nobase_sysconf_DATA) $(launchd_DATA)
 
 transform = @program_transform_name@
 couchdb_command_name = `echo couchdb | sed '$(transform)'`
-couchjs_command_name = `echo couchjs | sed '$(transform)'`
-
-couch.ini.dist: couch.ini.tpl
-	sed -e "s|%bindir%|@bindir@|g" \
-	    -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
-	    -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \
-	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
-	    -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
-	< $< > $@
-
-couch_httpd.conf.dist: couch_httpd.conf.tpl
-	sed -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
-	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
-	< $< > $@
 
-default/couchdb.dist: default/couchdb.tpl
+default/couchdb: default/couchdb.tpl
 	if test "$(mkdir_p)"; then \
 	    $(mkdir_p) default; \
 	else \
@@ -69,7 +48,7 @@
 	    -e "s|%localstatedir%|@localstatedir@|" \
 	< $< > $@
 
-init/couchdb.dist: init/couchdb.tpl
+init/couchdb: init/couchdb.tpl
 	if test "$(mkdir_p)"; then \
 	    $(mkdir_p) init; \
 	else \
@@ -84,10 +63,10 @@
 	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
 	< $< > $@
 
-logrotate.d/couchdb.dist: logrotate.d/couchdb.tpl
+logrotate.d/couchdb: logrotate.d/couchdb.tpl
 	sed -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" < $< > $@
 
-launchd/org.apache.couchdb.plist.dist: launchd/org.apache.couchdb.plist.tpl
+launchd/org.apache.couchdb.plist: launchd/org.apache.couchdb.plist.tpl
 	if test "$(mkdir_p)"; then \
 	    $(mkdir_p) launchd; \
 	else \
@@ -101,28 +80,6 @@
 	< $< > $@
 
 install-data-hook:
-	if test $(init_DATA); then \
+	if test -n "$(init_DATA)"; then \
 	    chmod 755 "$(DESTDIR)$(initdir)/couchdb"; \
-	    mv -i "$(DESTDIR)$(sysconfdir)/default/couchdb.dist" \
-	        "$(DESTDIR)$(sysconfdir)/default/couchdb"; \
-	    mv -i "$(DESTDIR)$(initdir)/couchdb.dist" \
-	        "$(DESTDIR)$(initdir)/couchdb"; \
-	fi
-	if test $(launchd_DATA); then \
-	    mv -i "$(DESTDIR)$(launchddir)/org.apache.couchdb.plist.dist" \
-	        "$(DESTDIR)$(launchddir)/org.apache.couchdb.plist"; \
 	fi
-	mv -i "$(DESTDIR)/$(sysconfdir)/logrotate.d/couchdb.dist" \
-	    "$(DESTDIR)/$(sysconfdir)/logrotate.d/couchdb"
-	mv -i "$(DESTDIR)/$(pkgconfdir)/couch.ini.dist" \
-	    "$(DESTDIR)/$(pkgconfdir)/couch.ini"
-	mv -i "$(DESTDIR)/$(pkgconfdir)/couch_httpd.conf.dist" \
-	    "$(DESTDIR)/$(pkgconfdir)/couch_httpd.conf"
-
-uninstall-hook:
-	rm -f $(DESTDIR)$(initdir)/couchdb
-	rm -f $(DESTDIR)$(launchddir)/org.apache.couchdb.plist
-	rm -f $(DESTDIR)$(sysconfdir)/default/couchdb
-	rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/couchdb
-	rm -f $(DESTDIR)/$(pkgconfdir)/couch.ini
-	rm -f $(DESTDIR)/$(pkgconfdir)/couch_httpd.conf

Propchange: incubator/couchdb/branches/futon-async/etc/couchdb/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Apr 14 17:01:01 2008
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+couch_httpd.conf
+couch_httpd.conf.tpl
+couch.ini
+couch.ini.tpl

Propchange: incubator/couchdb/branches/futon-async/etc/default/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 14 17:01:01 2008
@@ -1,4 +1,4 @@
 Makefile
 Makefile.in
+couchdb
 couchdb.tpl
-couchdb.dist

Propchange: incubator/couchdb/branches/futon-async/etc/init/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 14 17:01:01 2008
@@ -1,5 +1,4 @@
 Makefile
 Makefile.in
-couchdb.dist
-couchdb.tpl
 couchdb
+couchdb.tpl

Propchange: incubator/couchdb/branches/futon-async/etc/init/couchdb.tpl.in
            ('svn:executable' removed)

Propchange: incubator/couchdb/branches/futon-async/etc/launchd/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 14 17:01:01 2008
@@ -2,4 +2,3 @@
 Makefile.in
 org.apache.couchdb.plist
 org.apache.couchdb.plist.tpl
-org.apache.couchdb.plist.dist

Propchange: incubator/couchdb/branches/futon-async/etc/logrotate.d/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Apr 14 17:01:01 2008
@@ -2,4 +2,3 @@
 Makefile.in
 couchdb
 couchdb.tpl
-couchdb.dist



Mime
View raw message