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/19 15:39:18 UTC
svn commit: r1024231 - in /tcl/rivet/trunk: ChangeLog Makefile.am
Makefile.in debian/control debian/files
debian/libapache2-mod-rivet-doc.docs debian/libapache2-mod-rivet.substvars
debian/rules doc/Makefile.am src/apache-2/rivetCore.c
Author: mxmanghi
Date: Tue Oct 19 13:39:17 2010
New Revision: 1024231
URL: http://svn.apache.org/viewvc?rev=1024231&view=rev
Log:
* 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.
* src/apache-2/rivetCore.c: In Rivet_ApacheTable the variable table is initialized to NULL to silence a
compilation warning
* doc/Makefile.am: the 'distclean' target must remove the Makefile
* Makefile.am: rivet_config.h removal added to 'distclean-local'
Modified:
tcl/rivet/trunk/ChangeLog
tcl/rivet/trunk/Makefile.am
tcl/rivet/trunk/Makefile.in
tcl/rivet/trunk/debian/control
tcl/rivet/trunk/debian/files
tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs
tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars
tcl/rivet/trunk/debian/rules
tcl/rivet/trunk/doc/Makefile.am
tcl/rivet/trunk/src/apache-2/rivetCore.c (contents, props changed)
Modified: tcl/rivet/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/ChangeLog?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/ChangeLog (original)
+++ tcl/rivet/trunk/ChangeLog Tue Oct 19 13:39:17 2010
@@ -1,5 +1,13 @@
+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.
+ * src/apache-2/rivetCore.c: In Rivet_ApacheTable the variable table is initialized to NULL to silence a
+ compilation warning
+ * doc/Makefile.am: the 'distclean' target must remove the Makefile
+ * Makefile.am: rivet_config.h removal added to 'distclean-local'
+
2010-10-18 Massimo Manghi <mx...@apache.org>
- * rivet/packages/tclrivet/parse.tcl: add svn:executable property as per suggested by the debian consistency script
+ * rivet/packages/tclrivet/parse.tcl: add svn:executable property as suggested by the debian consistency scripts
* debian/*: more changes to remove unnecessary files from the binary packages of Debian
2010-10-14 Massimo Manghi <mx...@apache.org>
Modified: tcl/rivet/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.am?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.am (original)
+++ tcl/rivet/trunk/Makefile.am Tue Oct 19 13:39:17 2010
@@ -27,3 +27,5 @@ uninstall-local:
rm -fr $(DESTDIR)$(RIVETLIB_DESTDIR)
#
+distclean-local:
+ rm -fr rivet_config.h
Modified: tcl/rivet/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/Makefile.in?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/Makefile.in (original)
+++ tcl/rivet/trunk/Makefile.in Tue Oct 19 13:39:17 2010
@@ -715,7 +715,7 @@ distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -f Makefile
distclean-am: clean-am distclean-generic distclean-hdr \
- distclean-libtool distclean-tags
+ distclean-libtool distclean-local distclean-tags
dvi: dvi-recursive
@@ -785,17 +785,17 @@ uninstall-am: uninstall-local
clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
dist-gzip dist-lzma dist-shar dist-tarZ dist-xz dist-zip \
distcheck distclean distclean-generic distclean-hdr \
- distclean-libtool distclean-tags distcleancheck distdir \
- distuninstallcheck dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am \
- install-data-local install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
- uninstall uninstall-am uninstall-local
+ distclean-libtool distclean-local distclean-tags \
+ distcleancheck distdir distuninstallcheck dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-data-local install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-pdf \
+ install-pdf-am install-ps install-ps-am install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-local
libtool: $(LIBTOOL_DEPS)
@@ -812,6 +812,8 @@ uninstall-local:
rm -fr $(DESTDIR)$(RIVETLIB_DESTDIR)
#
+distclean-local:
+ rm -fr rivet_config.h
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Modified: tcl/rivet/trunk/debian/control
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/control?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/control (original)
+++ tcl/rivet/trunk/debian/control Tue Oct 19 13:39:17 2010
@@ -26,7 +26,7 @@ Package: libapache2-mod-rivet-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Description: Documentation for Rivet a server-side Tcl programming system
+Description: Documentation for Rivet, a server-side Tcl programming system
Apache Rivet is a system for creating dynamic web content via the Tcl
programming language integrated with Apache Web Server. It is
designed to be fast, powerful and extensible, consume few system
@@ -35,5 +35,5 @@ Description: Documentation for Rivet a s
(GUI's, system administration tasks, text processing, database
manipulation, XML, and so on). In order to meet these goals
Tcl programming language was chosen to combine with the Apache HTTP
- Server. This package contains the HTML configuration and programming manual
+ Server. This package contains the HTML configuration and programming manual.
Modified: tcl/rivet/trunk/debian/files
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/files?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/files (original)
+++ tcl/rivet/trunk/debian/files Tue Oct 19 13:39:17 2010
@@ -0,0 +1,2 @@
+libapache2-mod-rivet_2.0.1-1_amd64.deb web extra
+libapache2-mod-rivet-doc_2.0.1-1_all.deb doc extra
Modified: tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs (original)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet-doc.docs Tue Oct 19 13:39:17 2010
@@ -1 +1,2 @@
doc/html/
+contrib/
Modified: tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars (original)
+++ tcl/rivet/trunk/debian/libapache2-mod-rivet.substvars Tue Oct 19 13:39:17 2010
@@ -0,0 +1,2 @@
+shlibs:Depends=libc6 (>= 2.3.4), tcl8.5 (>= 8.5.0)
+misc:Depends=
Modified: tcl/rivet/trunk/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/debian/rules?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/debian/rules (original)
+++ tcl/rivet/trunk/debian/rules Tue Oct 19 13:39:17 2010
@@ -71,16 +71,8 @@ libapache2-mod-rivet-doc: build
dh_testdir
dh_testroot
dh_installdirs -p$@
- dh_installchangelogs -p$@ ChangeLog
dh_installdocs -p$@
- dh_installman -p$@
- dh_link -p$@
- dh_strip -p$@
- dh_compress -p$@
- dh_fixperms -p$@
- dh_makeshlibs -p$@
dh_installdeb -p$@
- dh_shlibdeps -p$@
dh_gencontrol -p$@
dh_md5sums -p$@
dh_builddeb -p$@
Modified: tcl/rivet/trunk/doc/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/doc/Makefile.am?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/doc/Makefile.am (original)
+++ tcl/rivet/trunk/doc/Makefile.am Tue Oct 19 13:39:17 2010
@@ -72,4 +72,5 @@ distclean:
if [ -e graphics ]; then \
rm graphics ; \
fi
+ -rm Makefile
Modified: tcl/rivet/trunk/src/apache-2/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/trunk/src/apache-2/rivetCore.c?rev=1024231&r1=1024230&r2=1024231&view=diff
==============================================================================
--- tcl/rivet/trunk/src/apache-2/rivetCore.c (original)
+++ tcl/rivet/trunk/src/apache-2/rivetCore.c Tue Oct 19 13:39:17 2010
@@ -587,7 +587,7 @@ append_key_value_callback (void *data, c
TCL_CMD_HEADER( Rivet_ApacheTable )
{
- apr_table_t *table;
+ apr_table_t *table = NULL;
int subcommandindex;
static CONST84 char *SubCommand[] = {
Propchange: tcl/rivet/trunk/src/apache-2/rivetCore.c
------------------------------------------------------------------------------
svn:keyword = Id
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org