You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by mx...@apache.org on 2010/10/27 15:37:25 UTC
svn commit: r1027956 - in /tcl/rivet/trunk: ./ debian/ doc/
Author: mxmanghi
Date: Wed Oct 27 13:37:24 2010
New Revision: 1027956
URL: http://svn.apache.org/viewvc?rev=1027956&view=rev
Log:
* branches/2_0: changes done in branches 2_0 reintegrated into trunk. This implied the following changes in trunk
* debian/[clean,docs,*.substvars,dirs,files,install]: not needed, hence removed from repository
* debian/[changelog,copyright,rules]: files changed to produce a clean package out of the source tree
* VERSION,configure.ac: version number bumped up to 2.0.2
* doc/rivet-chunk.xsl: obsolete and misplaced copyright statement removed
Removed:
tcl/rivet/trunk/debian/clean
tcl/rivet/trunk/debian/dirs
tcl/rivet/trunk/debian/docs
tcl/rivet/trunk/debian/files
tcl/rivet/trunk/debian/install
tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.substvars
tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars
Modified:
tcl/rivet/trunk/ (props changed)
tcl/rivet/trunk/BUGS
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/README
tcl/rivet/trunk/VERSION
tcl/rivet/trunk/configure.ac
tcl/rivet/trunk/debian/changelog
tcl/rivet/trunk/debian/copyright
tcl/rivet/trunk/debian/libapache2-mod-rivet.docs
tcl/rivet/trunk/debian/rules
tcl/rivet/trunk/doc/rivet-chunk.xsl (contents, props changed)
tcl/rivet/trunk/doc/rivet.xml
Propchange: tcl/rivet/trunk/
------------------------------------------------------------------------------
svn:mergeinfo = /tcl/rivet/branches/2_0:939332-1027850
Modified: tcl/rivet/trunk/BUGS
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/BUGS?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/BUGS (original)
+++ tcl/rivet/trunk/BUGS Wed Oct 27 13:37:24 2010
@@ -2,9 +2,10 @@ KNOWN BUGS
$Id$
-"DIO store" will malfunction if the case of the variable names in the array
+1) "DIO store" will malfunction if the case of the variable names in the array
does not match the case of the field names in the table. What happens is that
any fields with case inconsistencies will neither be inserted or updated.
-Rivet apparently conflicts with mod_cgi in some apache installations. When
-mod_rivet is loaded cgi script stop sending content to any client.
+2010-04-29: Rivet apparently conflicts with mod_cgi in some apache installations. When
+mod_rivet is loaded cgi script stop sending content to any client.
+
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Wed Oct 27 13:37:24 2010
@@ -1,3 +1,14 @@
+2010-10-27 Massimo Manghi <mx...@apache.org>
+ * branches/2_0: changes done in branches 2_0 reintegrated into trunk. This implied the following changes in trunk
+ * debian/[clean,docs,*.substvars,dirs,files,install]: not needed, hence removed from repository
+ * debian/[changelog,copyright,rules]: files changed to produce a clean package out of the source tree
+ * VERSION,configure.ac: version number bumped up to 2.0.2
+ * doc/rivet-chunk.xsl: obsolete and misplaced copyright statement removed
+
+2010-10-20 Massimo Manghi <mx...@apache.org>
+ * debian/[clean,install,docs,dirs]: removed because not needed or redundant
+ * debian/copyright: completed to include also the Tcl license. Added copyright notes for stuff in win/
+
2010-10-19 Massimo Manghi <mx...@apache.org>
* debian/control,debian/Makefile.am: Minor adjustments to debian/control to fulfill Debian policy
* debian/libapache2-mod-rivet-doc.docs: the 'contrib' directory is installed now in this package.
@@ -17,6 +28,9 @@
2010-10-13 Massimo Manghi <mx...@apache.org>
* src/buildscripts: trying to keep the source tree as tidy as possible. src/buildscripts/* are removed because they were\
then initial and later abandoned Rivet build scripts
+ * branches/2_0/src/buildscripts: removed also from the branch development
+ * branches/2_0/debian/*: merging the debian scripts largely rewritten in trunk. Added control files to
+ build 2 packages for debian (binary module and docs)
2010-10-11 Massimo Manghi <mx...@apache.org>
* tclconfig/config.sub,tclconfig/config.guess: Debian package build system signalled that these 2 files were too old
@@ -69,6 +83,13 @@
aborts with an HTTP_INTERNAL_ERROR and a message is printed in the log file.
* VERSION,configure.ac: version number changes as 2.0.1 (temporarily)
+2010-07-13 Massimo Manghi <mx...@apache.org>
+ * doc/rivet.xml,doc/html/*.html: Latest minor changes before releasing
+ * VERSION,configure.ac: Release number changed as 2.0.1
+
+2010-07-12 Massimo Manghi <mx...@apache.org>
+ * branches/2_0: Merge of trunk changes into the 2_0 branch.
+
2010-07-12 Massimo Manghi <mx...@apache.org>
* rivet/packages/calendar/calendar.tcl: new comments added. Fixed misspelled -errorinfo option
in a return statement.
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Wed Oct 27 13:37:24 2010
@@ -18,7 +18,7 @@
#
# top-level Makefile.am for Apache Rivet: gets turned into a Makefile.in by automake
#
-# $Id: Makefile.am 959005 2010-06-29 15:07:45Z mxmanghi $
+# $Id: Makefile.am 1024313 2010-10-19 16:29:56Z mxmanghi $
#
# 2007/12/25: Added target uninistall-local that removes the tcl stuff (mxmanghi)
# 2010/06/22: target instal-data-local searches for pkgIndex.tcl files and deletes them
Modified: tcl/rivet/trunk/README
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/README?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/README (original)
+++ tcl/rivet/trunk/README Wed Oct 27 13:37:24 2010
@@ -8,4 +8,16 @@ docs in HTML are more thorough and exten
See LICENSE for licensing terms.
-$Id$
\ No newline at end of file
+$Id$
+
+
+ KNOWN PROBLEMS
+ ==============
+
+
+ - Rivet is reported to conflict with cgi scripts on some Linux machines.
+Symptom of the problem is when cgi scripts hang forever and don't send contents
+to the client
+
+
+
Modified: tcl/rivet/trunk/VERSION
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/VERSION?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/VERSION (original)
+++ tcl/rivet/trunk/VERSION Wed Oct 27 13:37:24 2010
@@ -1 +1 @@
-2.0.1
+2.0.2
Modified: tcl/rivet/trunk/configure.ac
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/configure.ac?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/configure.ac (original)
+++ tcl/rivet/trunk/configure.ac Wed Oct 27 13:37:24 2010
@@ -22,7 +22,7 @@ dnl
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
-AC_INIT([Rivet],[2.0.1])
+AC_INIT([Rivet],[2.0.2])
TEA_INIT([3.9])
AC_CONFIG_AUX_DIR(tclconfig)
Modified: tcl/rivet/trunk/debian/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/changelog?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/changelog (original)
+++ tcl/rivet/trunk/debian/changelog Wed Oct 27 13:37:24 2010
@@ -1,4 +1,4 @@
-libapache2-mod-rivet (2.0.1-1) unstable; urgency=low
+libapache2-mod-rivet (2.0.2-1) unstable; urgency=low
* Initial package of Rivet for Debian
* Closes: #599446, #599447
Modified: tcl/rivet/trunk/debian/copyright
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/copyright?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/copyright (original)
+++ tcl/rivet/trunk/debian/copyright Wed Oct 27 13:37:24 2010
@@ -11,7 +11,6 @@ Copyright: Copyright (c) 2008 Guido U.
Copyright (c) 2008 Gerald Point <Ge...@labri.fr>
License: GPL-2+
-
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
@@ -30,10 +29,6 @@ License: Apache-2.0
On Debian systems, the complete text of the Apache version 2.0 license
can be found in "/usr/share/common-licenses/Apache-2.0".
-This work was packaged for Debian by:
-
- Massimo Manghi <mx...@apache.org> on Mon, 20 Sep 2010 16:37:14 +0200
-
License: GPL-2+
This program is free software; you can redistribute it and/or modify it
@@ -62,6 +57,117 @@ License: GPL-2+
distribute a modified version of the Autoconf Macro, you may extend this
special exception to the GPL to apply to your modified version as well.
+Files: win/*
+Copyright: Copyright (c) 1995-1996 Sun Microsystems, Inc.
+ Copyright (c) 1998-2000 Ajuba Solutions.
+ Copyright (c) 2001 ActiveState Corporation.
+ Copyright (c) 2001-2002 David Gravereaux.
+ Copyright (c) 2003 Pat Thoyts
+ Copyright (c) 2003 by Patrick Thoyts
+ Copyright (C) 2004 The Apache Software Foundation
+
+Files: tclconfig/tcl.m4
+Copyright: Copyright (c) 1999-2000 Ajuba Solutions.
+ Copyright (c) 2002-2005 ActiveState Corporation.
+
+License:
+
+ This software is copyrighted by the Regents of the University of
+ California, Sun Microsystems, Inc., Scriptics Corporation, ActiveState
+ Corporation and other parties. The following terms apply to all files
+ associated with the software unless explicitly disclaimed in
+ individual files.
+
+ The authors hereby grant permission to use, copy, modify, distribute,
+ and license this software and its documentation for any purpose, provided
+ that existing copyright notices are retained in all copies and that this
+ notice is included verbatim in any distributions. No written agreement,
+ license, or royalty fee is required for any of the authorized uses.
+ Modifications to this software may be copyrighted by their authors
+ and need not follow the licensing terms described here, provided that
+ the new terms are clearly indicated on the first page of each file where
+ they apply.
+
+ IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+ FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+ DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+ THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. THIS SOFTWARE
+ IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE
+ NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR
+ MODIFICATIONS.
+
+ GOVERNMENT USE: If you are acquiring this software on behalf of the
+ U.S. government, the Government shall have only "Restricted Rights"
+ in the software and related documentation as defined in the Federal
+ Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you
+ are acquiring the software on behalf of the Department of Defense, the
+ software shall be classified as "Commercial Computer Software" and the
+ Government shall have only "Restricted Rights" as defined in Clause
+ 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, the
+ authors grant the U.S. Government and others acting in its behalf
+ permission to use and distribute the software in accordance with the
+ terms specified in this license.
+
+Files: tclconfig/compile
+Copyright: Copyright (c) 1999, 2000 Free Software Foundation, Inc.
+ written by Tom Tromey <tr...@cygnus.com>.
+License: GPL-2+
+
+Files: tclconfig/config.guess, tclconfig/config.sub
+Copyright: Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+ 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: tclconfig/depcomp
+Copyright: Copyright 1999, 2000 Free Software Foundation, Inc.
+ Originally written by Alexandre Oliva <ol...@dcc.unicamp.br>.
+License: GPL-2+
+
+Files: tclconfig/install-sh
+Copyright: Copyright (C) 1994 X Consortium
+License:
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to
+ deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+ AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+ TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+ Except as contained in this notice, the name of the X Consortium shall not
+ be used in advertising or otherwise to promote the sale, use or other deal-
+ ings in this Software without prior written authorization from the X Consor-
+ tium.
+
+
+ FSF changes to this file are in the public domain.
+
+Files: tclconfig/libtool.m4, tclconfig/ltmain.sh
+Copyright: Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007,
+ 2008 Free Software Foundation, Inc.
+ Originally by Gordon Matzigkeit <go...@gnu.ai.mit.edu>, 1996
+License: GPL-2+
+
+Files: tclconfig/missing
+Copyright: Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+ Originally by Fran,cois Pinard <pi...@iro.umontreal.ca>, 1996.
+License: GPL-2+
+
License:
The GPL license is available at "/usr/share/common-licenses/GPL-2+".
Modified: tcl/rivet/trunk/debian/libapache2-mod-rivet.docs
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.docs?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.docs (original)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.docs Wed Oct 27 13:37:24 2010
@@ -1,6 +1,4 @@
BUGS
-form.txt
README
-README.configure
TODO
CHANGES
Modified: tcl/rivet/trunk/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/rules?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/rules (original)
+++ tcl/rivet/trunk/debian/rules Wed Oct 27 13:37:24 2010
@@ -1,10 +1,22 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
TCL_VERSION=8.5
package=libapache2-mod-rivet
+LDFLAGS += -Wl,--as-needed
+CFLAGS = -Wall -g
+
+# Don't let the configure script guess our platform.
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
export DH_OPTIONS
@@ -12,6 +24,7 @@ clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+ rm -f _configs.sed
dh_auto_clean
dh_clean
@@ -29,12 +42,15 @@ configure: configure-stamp
configure-stamp:
dh_testdir
chmod +x ./configure
- ./configure --with-tcl=/usr/lib/tcl$(TCL_VERSION)/ \
- --with-apache=/usr \
- --with-apxs=/usr/bin/apxs2 \
- --with-tclsh=/usr/bin/tclsh$(TCL_VERSION) \
- --with-apache-version=2 \
- --with-rivet-target-dir=/usr/lib/rivet2.0 \
+ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
+ ./configure --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --with-tcl=/usr/lib/tcl$(TCL_VERSION)/ \
+ --with-apache=/usr \
+ --with-apxs=/usr/bin/apxs2 \
+ --with-tclsh=/usr/bin/tclsh$(TCL_VERSION) \
+ --with-apache-version=2 \
+ --with-rivet-target-dir=/usr/lib/tcltk/rivet2.0 \
--enable-version-display
touch configure-stamp
@@ -54,6 +70,10 @@ libapache2-mod-rivet: build
dh_install -a
dh_installexamples -a -p$@
dh_auto_install -a -p$@ --destdir=$(CURDIR)/debian/$@
+
+ # Remove README* files in bogus places.
+ find $(CURDIR)/debian/$@/usr/lib/tcltk -name 'README*' -exec rm -v {} \;
+
dh_install -a -p$@
dh_installman -p$@
dh_link -p$@
@@ -71,7 +91,9 @@ libapache2-mod-rivet-doc: build
dh_testdir
dh_testroot
dh_installdirs -p$@
- dh_installdocs -p$@
+ dh_installdocs -p$@
+ dh_compress -p$@
+ dh_fixperms -p$@
dh_installdeb -p$@
dh_gencontrol -p$@
dh_md5sums -p$@
Modified: tcl/rivet/trunk/doc/rivet-chunk.xsl
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/rivet-chunk.xsl?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/rivet-chunk.xsl (original)
+++ tcl/rivet/trunk/doc/rivet-chunk.xsl Wed Oct 27 13:37:24 2010
@@ -26,15 +26,11 @@
indent="no"/>
-->
- <!-- ********************************************************************
- $Id$
+ <!--
********************************************************************
-
- This file is part of the XSL DocBook Stylesheet distribution.
- See ../README or http://nwalsh.com/docbook/xsl/ for copyright
- and other information.
-
- ******************************************************************** -->
+ $Id$
+ ********************************************************************
+ -->
<!-- ==================================================================== -->
Propchange: tcl/rivet/trunk/doc/rivet-chunk.xsl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Wed Oct 27 13:37:24 2010
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: tcl/rivet/trunk/doc/rivet.xml
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/rivet.xml?rev=1027956&r1=1027955&r2=1027956&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/rivet.xml (original)
+++ tcl/rivet/trunk/doc/rivet.xml Wed Oct 27 13:37:24 2010
@@ -107,19 +107,19 @@
<!-- Sessions -->
&session.xml;
- <!-- Form -->
- &form.xml;
+ <!-- Form -->
+ &form.xml;
- <!-- Calendar -->
- &calendar.xml;
+ <!-- Calendar -->
+ &calendar.xml;
<!-- Help -->
&help.xml;
- <!-- Internals -->
- &internals.xml;
+ <!-- Internals -->
+ &internals.xml;
- <!-- Upgrade -->
- &upgrade.xml;
+ <!-- Upgrade -->
+ &upgrade.xml;
</article>
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org