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 2011/04/18 11:11:26 UTC

svn commit: r1094377 - in /tcl/rivet/branches/rivet-namespace: ./ ChangeLog INSTALL debian/changelog debian/control doc/ src/Makefile.am src/apache-2/Makefile.am src/apache-2/mod_rivet.c

Author: mxmanghi
Date: Mon Apr 18 09:11:25 2011
New Revision: 1094377

URL: http://svn.apache.org/viewvc?rev=1094377&view=rev
Log:
merging latest changes in trunk

Modified:
    tcl/rivet/branches/rivet-namespace/   (props changed)
    tcl/rivet/branches/rivet-namespace/ChangeLog
    tcl/rivet/branches/rivet-namespace/INSTALL
    tcl/rivet/branches/rivet-namespace/debian/changelog
    tcl/rivet/branches/rivet-namespace/debian/control
    tcl/rivet/branches/rivet-namespace/doc/   (props changed)
    tcl/rivet/branches/rivet-namespace/src/Makefile.am
    tcl/rivet/branches/rivet-namespace/src/apache-2/Makefile.am
    tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c

Propchange: tcl/rivet/branches/rivet-namespace/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 09:11:25 2011
@@ -1,4 +1,4 @@
 /tcl/rivet/branches/2_0:939332-1027850
 /tcl/rivet/branches/master-interp:1062190-1065801
 /tcl/rivet/branches/neh:1069501-1076014
-/tcl/rivet/trunk:1065843-1089334
+/tcl/rivet/trunk:1065843-1094357

Modified: tcl/rivet/branches/rivet-namespace/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/ChangeLog?rev=1094377&r1=1094376&r2=1094377&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/ChangeLog (original)
+++ tcl/rivet/branches/rivet-namespace/ChangeLog Mon Apr 18 09:11:25 2011
@@ -1,3 +1,9 @@
+2011-04-14 Massimo Manghi <mx...@apache.org>
+    * src/Makefile.am,src/apache-2/Makefile.am: Add target install-data-hook with command line for
+    removing unneeded .la files from target directories
+    * configure.ac: doc/convert_examples.tcl is generated from template: added to AC_CONFIG_FILES 
+    * debian/changelog,debian/control: changed to reflect improvement in the script for Debian
+
 2011-06-07 Massimo Manghi <mx...@apache.org>
     * rivet/init.tcl: because of bug #3216070 of Tcl we cannot preload rivetlib, so it doesn't make
     sense to import the rivet namespace, because we cannot have all the command set loaded in and

Modified: tcl/rivet/branches/rivet-namespace/INSTALL
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/INSTALL?rev=1094377&r1=1094376&r2=1094377&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/INSTALL (original)
+++ tcl/rivet/branches/rivet-namespace/INSTALL Mon Apr 18 09:11:25 2011
@@ -16,7 +16,7 @@ Example:
 	    --with-apxs=/usr/bin/apxs 		\
 	    --with-tclsh=/usr/bin/tclsh8.5 	\
 	    --with-apache-version=2		\
-	    --with-rivet-target-dir=/usr/lib/rivet2.0 \
+	    --with-rivet-target-dir=/usr/lib/rivet2.1 \
 	    --enable-version-display
 
 2) if 'configure' was successful Rivet is ready for compilation
@@ -84,6 +84,6 @@ autoreconf
 ./configure --with-apache-version=2 --with-tcl=/usr/lib --with-apxs=/usr/bin/apxs 
 make
 
-Rivet was packaged for SuSE. See http://tcl.apache.org/download.html
+Rivet is packaged for various Linux flavours. A list is available at http://tcl.apache.org/download.html
 
 # RCS: @(#) $Id$

Modified: tcl/rivet/branches/rivet-namespace/debian/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/debian/changelog?rev=1094377&r1=1094376&r2=1094377&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/debian/changelog (original)
+++ tcl/rivet/branches/rivet-namespace/debian/changelog Mon Apr 18 09:11:25 2011
@@ -1,9 +1,20 @@
-libapache2-mod-rivet (2.0.2-2) unstable; urgency=low
+libapache2-mod-rivet (2.0.3-2) unstable; urgency=low
 
-  * removed redundant code in libapache2-mod-rivet.postinst
-  * files in contrib/ are now installed with the docs 
+  * Added installation targets for removing unneeded .la libtool files 
+    (Closes: #621613)
+  * Removed redundant lines of code from 
+    debian/libapache2-mod-rivet.postist
+  * Debian script examined in order to check compliance with package 
+    standard 3.9.2
+  * Added 'automake' to list of Build-Depends
 
- -- Massimo Manghi <mx...@apache.org>  Tue, 30 Nov 2010 12:31:27 +0100
+ -- Massimo Manghi <mx...@apache.org>  Thu, 14 Apr 2011 22:40:27 +0200
+
+libapache2-mod-rivet (2.0.3-1) unstable; urgency=low
+
+  * New release 2.0.3 
+
+ -- Massimo Manghi <mx...@apache.org>  Sat, 19 Mar 2011 02:19:17 +0100
 
 libapache2-mod-rivet (2.0.2-1) unstable; urgency=low
 

Modified: tcl/rivet/branches/rivet-namespace/debian/control
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/debian/control?rev=1094377&r1=1094376&r2=1094377&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/debian/control (original)
+++ tcl/rivet/branches/rivet-namespace/debian/control Mon Apr 18 09:11:25 2011
@@ -2,9 +2,9 @@ Source: libapache2-mod-rivet
 Section: web
 Priority: extra
 Maintainer: Massimo Manghi <mx...@apache.org>
-Build-Depends: tcl8.5-dev, apache2-prefork-dev, debhelper (>= 7.0.50~)
+Build-Depends: tcl8.5-dev, apache2-prefork-dev, automake, debhelper (>= 7.0.50~)
 Build-Depends-Indep: xsltproc, docbook, docbook-utils, docbook-xsl, docbook-xml
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://tcl.apache.org/rivet/
 
 Package: libapache2-mod-rivet

Propchange: tcl/rivet/branches/rivet-namespace/doc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 09:11:25 2011
@@ -1,3 +1,3 @@
 /tcl/rivet/branches/2_0/doc:939332-1027850
 /tcl/rivet/branches/master-interp/doc:1062190-1065801
-/tcl/rivet/trunk/doc:1065843-1089334
+/tcl/rivet/trunk/doc:1065843-1094357

Modified: tcl/rivet/branches/rivet-namespace/src/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/src/Makefile.am?rev=1094377&r1=1094376&r2=1094377&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/src/Makefile.am (original)
+++ tcl/rivet/branches/rivet-namespace/src/Makefile.am Mon Apr 18 09:11:25 2011
@@ -16,6 +16,7 @@
 
 # AM_CFLAGS = @TCL_INCLUDES@ @GM_CPPFLAGS@
 
+
 # The weird and wild magic of auto* associates these two.
 ##apxs_libexecdir = @APXS_LIBEXECDIR@
 ##apxs_libexec_LTLIBRARIES = mod_rivet.la
@@ -24,7 +25,6 @@ INCLUDES = -I@apache_include@ 
 
 # ... and these two.  We want to put the libs in the package path,
 # rather than the standard library location for the system.
-
 lib_libexecdir = @RIVET_TCL_TARGET@
 lib_libexec_LTLIBRARIES = librivetlib.la librivetparser.la
 
@@ -65,3 +65,9 @@ librivetparser_la_CPPFLAGS = @TCL_INCLUD
  
 SUBDIRS = @apache_version_dir@
 
+# Removing libtool .la files from installation
+
+install-data-hook:
+	echo 'removing unwanted libtool .la files'
+	rm -fv $(DESTDIR)/$(lib_libexecdir)/*.la
+

Modified: tcl/rivet/branches/rivet-namespace/src/apache-2/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/src/apache-2/Makefile.am?rev=1094377&r1=1094376&r2=1094377&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/src/apache-2/Makefile.am (original)
+++ tcl/rivet/branches/rivet-namespace/src/apache-2/Makefile.am Mon Apr 18 09:11:25 2011
@@ -48,18 +48,10 @@ mod_rivet_la_CPPFLAGS = @TCL_INCLUDES@  
 
 # APXS_CPPFLAGS_SHLIB
 
-#
-# Rivet Library
-#
-##librivet_la_SOURCES = rivetList.c rivetCrypt.c rivetWWW.c rivetPkgInit.c
-##librivet_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
-##librivet_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
-##librivet_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'
+# Removing libtool .la files from installation
+
+install-data-hook:
+	echo 'removing unwanted libtool .la files'
+	rm -fv $(DESTDIR)/$(apxs_libexecdir)/*.la
+
 
-#
-# Rivet Parser Library
-#
-##librivetparser_la_SOURCES = rivetParser.c parserPkgInit.c
-##librivetparser_la_LDFLAGS = @TCL_LIB_SPEC@ @APXS_LDFLAGS@ -module -avoid-version
-##librivetparser_la_LIBADD = @TCL_LIBS@ @APXS_LIBS@
-##librivetparser_la_CPPFLAGS = @TCL_INCLUDES@ @APXS_CPPFLAGS@ @APXS_INCLUDES@ -DSTART_TAG='"<?"' -DEND_TAG='"?>"'

Modified: tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c?rev=1094377&r1=1094376&r2=1094377&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c (original)
+++ tcl/rivet/branches/rivet-namespace/src/apache-2/mod_rivet.c Mon Apr 18 09:11:25 2011
@@ -354,8 +354,9 @@ Rivet_ExecuteAndCheck(Tcl_Interp *interp
 
         /* if the error was thrown by Rivet, see if it's abort_page and,
          * if so, don't treat it as an error, i.e. don't execute the
-         * installed error handler or the default one, just let the
-         * page emit as normal
+         * installed error handler or the default one, just check if
+         * a rivet_abort_script is defined, otherwise the page emits 
+         * as normal
          */
         if (strcmp (Tcl_GetString (errorCodeElementObj), "RIVET") == 0) {
 



---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org