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 18:29:57 UTC
svn commit: r1024313 - in /tcl/rivet/branches/2_0: ./ debian/ doc/
rivet/packages/tclrivet/ src/apache-2/
Author: mxmanghi
Date: Tue Oct 19 16:29:56 2010
New Revision: 1024313
URL: http://svn.apache.org/viewvc?rev=1024313&view=rev
Log:
committing changes merged from 'trunk'
Added:
tcl/rivet/branches/2_0/debian/libapache2-mod-rivet.dirs
- copied unchanged from r1024311, tcl/rivet/trunk/debian/libapache2-mod-rivet.dirs
tcl/rivet/branches/2_0/debian/libapache2-mod-rivet.docs
- copied unchanged from r1024311, tcl/rivet/trunk/debian/libapache2-mod-rivet.docs
Removed:
tcl/rivet/branches/2_0/debian/README.Debian
Modified:
tcl/rivet/branches/2_0/ (props changed)
tcl/rivet/branches/2_0/ChangeLog
tcl/rivet/branches/2_0/Makefile.am
tcl/rivet/branches/2_0/Makefile.in
tcl/rivet/branches/2_0/debian/changelog
tcl/rivet/branches/2_0/debian/clean
tcl/rivet/branches/2_0/debian/control
tcl/rivet/branches/2_0/debian/dirs
tcl/rivet/branches/2_0/debian/docs
tcl/rivet/branches/2_0/debian/files
tcl/rivet/branches/2_0/debian/install
tcl/rivet/branches/2_0/debian/libapache2-mod-rivet-doc.docs
tcl/rivet/branches/2_0/debian/rules
tcl/rivet/branches/2_0/debian/watch
tcl/rivet/branches/2_0/doc/Makefile.am
tcl/rivet/branches/2_0/rivet/packages/tclrivet/parse.tcl (props changed)
tcl/rivet/branches/2_0/src/apache-2/rivetCore.c (contents, props changed)
Propchange: tcl/rivet/branches/2_0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 19 16:29:56 2010
@@ -1 +1 @@
-/tcl/rivet/trunk:939332-1022108
+/tcl/rivet/trunk:939332-1024311
Modified: tcl/rivet/branches/2_0/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/ChangeLog?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/ChangeLog (original)
+++ tcl/rivet/branches/2_0/ChangeLog Tue Oct 19 16:29:56 2010
@@ -1,3 +1,19 @@
+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 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>
+ * debian/: more adjustments in the way of getting a working setup for Debian. Some information was moved to make
+ it 'package specific'. More tweaking on debian/control and /debian/changelog
+
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
Modified: tcl/rivet/branches/2_0/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/Makefile.am?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/Makefile.am (original)
+++ tcl/rivet/branches/2_0/Makefile.am Tue Oct 19 16:29:56 2010
@@ -27,3 +27,5 @@ uninstall-local:
rm -fr $(DESTDIR)$(RIVETLIB_DESTDIR)
#
+distclean-local:
+ rm -fr rivet_config.h
Modified: tcl/rivet/branches/2_0/Makefile.in
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/Makefile.in?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/Makefile.in (original)
+++ tcl/rivet/branches/2_0/Makefile.in Tue Oct 19 16:29:56 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/branches/2_0/debian/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/changelog?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/changelog (original)
+++ tcl/rivet/branches/2_0/debian/changelog Tue Oct 19 16:29:56 2010
@@ -1,15 +1,7 @@
libapache2-mod-rivet (2.0.1-1) unstable; urgency=low
- * Non-maintainer upload.
- * Switch to dpkg-source 3.0 (quilt) format
- * added debian/watch file
- * copyright file amended and extended
- * removed old build system unused files and win/*
* Initial package of Rivet for Debian
- * closes: bug#599446
- * closes: bug#599447
- * Description of the package amended as per suggestions received on the list
- debian-mentors
+ * Closes: #599446, #599447
-- Massimo Manghi <mx...@apache.org> Mon, 11 Oct 2010 15:22:19 +0200
Modified: tcl/rivet/branches/2_0/debian/clean
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/clean?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/clean (original)
+++ tcl/rivet/branches/2_0/debian/clean Tue Oct 19 16:29:56 2010
@@ -1 +0,0 @@
-
Modified: tcl/rivet/branches/2_0/debian/control
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/control?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/control (original)
+++ tcl/rivet/branches/2_0/debian/control Tue Oct 19 16:29:56 2010
@@ -2,13 +2,14 @@ Source: libapache2-mod-rivet
Section: web
Priority: extra
Maintainer: Massimo Manghi <mx...@apache.org>
-Build-Depends: tcl8.5-dev, libapr1-dev, apache2-prefork-dev, debhelper (>= 7.0.50~)
+Build-Depends: tcl8.5-dev, apache2-prefork-dev, debhelper (>= 7.0.50~)
+Build-Depends-Indep: xsltproc, docbook, docbook-utils, docbook-xsl, docbook-xml
Standards-Version: 3.9.1
Homepage: http://tcl.apache.org/rivet/
Package: libapache2-mod-rivet
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.5, libapr1, debhelper (>= 7.0.50~)
+Depends: ${shlibs:Depends}, ${misc:Depends}, itcl3, apache2-mpm-prefork
Suggests: libapache2-mod-rivet-doc
Description: Server-side Tcl programming system combining ease of use and power
Apache Rivet is a system for creating dynamic web content via the Tcl
@@ -25,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
@@ -34,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/branches/2_0/debian/dirs
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/dirs?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/dirs (original)
+++ tcl/rivet/branches/2_0/debian/dirs Tue Oct 19 16:29:56 2010
@@ -1 +0,0 @@
-usr/lib/apache2/modules
Modified: tcl/rivet/branches/2_0/debian/docs
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/docs?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/docs (original)
+++ tcl/rivet/branches/2_0/debian/docs Tue Oct 19 16:29:56 2010
@@ -1,6 +0,0 @@
-BUGS
-form.txt
-README
-README.configure
-TODO
-CHANGES
Modified: tcl/rivet/branches/2_0/debian/files
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/files?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/files (original)
+++ tcl/rivet/branches/2_0/debian/files Tue Oct 19 16:29:56 2010
@@ -1,2 +1,2 @@
libapache2-mod-rivet_2.0.1-1_amd64.deb web extra
-libapache2-mod-rivet-doc_2.0.1-1_all.deb web extra
+libapache2-mod-rivet-doc_2.0.1-1_all.deb doc extra
Modified: tcl/rivet/branches/2_0/debian/install
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/install?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/install (original)
+++ tcl/rivet/branches/2_0/debian/install Tue Oct 19 16:29:56 2010
@@ -1,2 +0,0 @@
-debian/rivet.load etc/apache2/mods-available
-debian/rivet.conf etc/apache2/mods-available
Modified: tcl/rivet/branches/2_0/debian/libapache2-mod-rivet-doc.docs
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/libapache2-mod-rivet-doc.docs?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/libapache2-mod-rivet-doc.docs (original)
+++ tcl/rivet/branches/2_0/debian/libapache2-mod-rivet-doc.docs Tue Oct 19 16:29:56 2010
@@ -1 +1,2 @@
doc/html/
+contrib/
Modified: tcl/rivet/branches/2_0/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/rules?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/rules (original)
+++ tcl/rivet/branches/2_0/debian/rules Tue Oct 19 16:29:56 2010
@@ -1,13 +1,6 @@
#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
# Uncomment this to turn on verbose mode.
-
export DH_VERBOSE=1
TCL_VERSION=8.5
@@ -15,13 +8,11 @@ package=libapache2-mod-rivet
export DH_OPTIONS
-#%:
-# dh $@
-clean: configure
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- $(MAKE) clean
+ dh_auto_clean
dh_clean
@@ -30,6 +21,7 @@ build: configure build-stamp
build-stamp: configure-stamp
dh_testdir
$(MAKE)
+ ( cd doc; $(MAKE) docs )
touch build-stamp
configure: configure-stamp
@@ -60,20 +52,9 @@ libapache2-mod-rivet: build
dh_installchangelogs ChangeLog
dh_installdocs -p$@
dh_install -a
-# $(MAKE) install DESTDIR=$(CURDIR)/debian/$@
dh_installexamples -a -p$@
dh_auto_install -a -p$@ --destdir=$(CURDIR)/debian/$@
-# dh_install -a $(CURDIR)/debian/tmp $(CURDIR/debian/$(package)
dh_install -a -p$@
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
-# dh_installcron
-# dh_installinfo
dh_installman -p$@
dh_link -p$@
dh_strip -p$@
@@ -88,19 +69,10 @@ libapache2-mod-rivet: build
libapache2-mod-rivet-doc: build
dh_testdir
-# ( cd doc/; $(MAKE) docs )
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/branches/2_0/debian/watch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/watch?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/watch (original)
+++ tcl/rivet/branches/2_0/debian/watch Tue Oct 19 16:29:56 2010
@@ -1,23 +1,2 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
version=3
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.example.com/downloads.php libapache2-mod-rivet-(.*)\.tar\.gz
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/libapache2-mod-rivet-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/libapache2-mod-rivet-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/libapache2-mod-rivet/libapache2-mod-rivet-(.*)\.tar\.gz
-
-# Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html libapache2-mod-rivet-(.*)\.tar\.gz
+http://www.apache.org/dist/tcl/rivet/rivet-(\d.*)\.tar\.gz
Modified: tcl/rivet/branches/2_0/doc/Makefile.am
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/doc/Makefile.am?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/doc/Makefile.am (original)
+++ tcl/rivet/branches/2_0/doc/Makefile.am Tue Oct 19 16:29:56 2010
@@ -72,4 +72,5 @@ distclean:
if [ -e graphics ]; then \
rm graphics ; \
fi
+ -rm Makefile
Propchange: tcl/rivet/branches/2_0/rivet/packages/tclrivet/parse.tcl
------------------------------------------------------------------------------
svn:executable = *
Modified: tcl/rivet/branches/2_0/src/apache-2/rivetCore.c
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/src/apache-2/rivetCore.c?rev=1024313&r1=1024312&r2=1024313&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/src/apache-2/rivetCore.c (original)
+++ tcl/rivet/branches/2_0/src/apache-2/rivetCore.c Tue Oct 19 16:29:56 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/branches/2_0/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