You are viewing a plain text version of this content. The canonical link for it is here.
Posted to site-cvs@tcl.apache.org by mx...@apache.org on 2012/12/20 21:25:05 UTC
svn commit: r1424671 - in /tcl/rivet/branches/debian-apache2.2: ./ patches/
Author: mxmanghi
Date: Thu Dec 20 20:25:04 2012
New Revision: 1424671
URL: http://svn.apache.org/viewvc?rev=1424671&view=rev
Log:
committing new patches and changes made to package libapache2-mod-rivet
Added:
tcl/rivet/branches/debian-apache2.2/patches/manual-output-utf-8.patch
Modified:
tcl/rivet/branches/debian-apache2.2/changelog
tcl/rivet/branches/debian-apache2.2/control
tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch
tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch
tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch
tcl/rivet/branches/debian-apache2.2/patches/series
tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch
tcl/rivet/branches/debian-apache2.2/rules
Modified: tcl/rivet/branches/debian-apache2.2/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/changelog?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/changelog (original)
+++ tcl/rivet/branches/debian-apache2.2/changelog Thu Dec 20 20:25:04 2012
@@ -1,10 +1,12 @@
libapache2-mod-rivet (2.1.0-1) unstable; urgency=low
* New upstream release 2.1.0
- * Applied patches to fix minor bugs in version 2.1.0 and improve
- command '::rivet::headers' error reporting
+ * Applied patches to fix minor bugs in version 2.1.0, improve
+ command '::rivet::headers' error reporting.
+ * manual generation target patched and output generated using utf-8
+ encoding
- -- Massimo Manghi <mx...@apache.org> Mon, 17 Dec 2012 00:06:55 +0100
+ -- Massimo Manghi <mx...@apache.org> Mon, 18 Dec 2012 10:06:55 +0100
libapache2-mod-rivet (2.0.5-1) unstable; urgency=low
Modified: tcl/rivet/branches/debian-apache2.2/control
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/control?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/control (original)
+++ tcl/rivet/branches/debian-apache2.2/control Thu Dec 20 20:25:04 2012
@@ -2,7 +2,7 @@ Source: libapache2-mod-rivet
Section: web
Priority: extra
Maintainer: Massimo Manghi <mx...@apache.org>
-Build-Depends: tcl8.5-dev, apache2-prefork-dev, automake, debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~)
+Build-Depends: tcl8.5-dev, apache2-prefork-dev, automake, debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), docbook-xsl, xsltproc
Standards-Version: 3.9.3
Homepage: http://tcl.apache.org/rivet/
Added: tcl/rivet/branches/debian-apache2.2/patches/manual-output-utf-8.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/manual-output-utf-8.patch?rev=1424671&view=auto
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/manual-output-utf-8.patch (added)
+++ tcl/rivet/branches/debian-apache2.2/patches/manual-output-utf-8.patch Thu Dec 20 20:25:04 2012
@@ -0,0 +1,50 @@
+Description: manual page poor quality due to wrong encoding
+ manual pages shipped with rivet 2.1.0 have an encoding that displays ugly with the
+ debian documentation system. HTML output is now produced in UTF-8
+Author: mxmanghi@apache.org
+Origin: upstream
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -14,7 +14,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-# $Id: Makefile.am 1088436 2011-04-03 23:17:21Z mxmanghi $
++# $Id: Makefile.am 1416388 2012-12-03 09:38:36Z mxmanghi $
+
+ .PHONY: clean
+
+@@ -25,13 +25,17 @@
+
+ # English, multiple files.
+ html/index.html: rivet.xml rivet-chunk.xsl rivet.xsl xml/*.xml
+- xsltproc --stringparam html.stylesheet rivet.css --stringparam \
+- html.ext ".html" --nonet -o html/ rivet-chunk.xsl rivet.xml
++ xsltproc --stringparam html.stylesheet rivet.css \
++ --stringparam html.ext ".html" \
++ --stringparam chunker.output.encoding UTF-8 \
++ --nonet -o html/ rivet-chunk.xsl rivet.xml
+
+ # English, one big file.
+ html/rivet.html: rivet.xml rivet-nochunk.xsl rivet.xsl xml/*.xml
+- xsltproc --stringparam html.stylesheet rivet.css --stringparam \
+- html.ext ".html" --nonet -o html/rivet.html rivet-nochunk.xsl \
++ xsltproc --stringparam html.stylesheet rivet.css \
++ --stringparam html.ext ".html" \
++ --stringparam chunker.output.encoding UTF-8 \
++ --nonet -o html/rivet.html rivet-nochunk.xsl \
+ rivet.xml
+
+ # This means these are not build automatically, but at least
+@@ -39,7 +43,7 @@
+
+ docs: picts html/rivet.css html/index.html
+
+-docs-nochunk: html/rivet.html
++docs-nochunk: picts html/rivet.css html/rivet.html
+
+ html/rivet.css: mandirs rivet.css
+ cp -v rivet.css html/
Modified: tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch (original)
+++ tcl/rivet/branches/debian-apache2.2/patches/mod-rivet-rivetlib.patch Thu Dec 20 20:25:04 2012
@@ -1,3 +1,12 @@
+Description: wrong package dependendencies load fixed
+ mod_rivet.c loaded packages 'rivetlib' and 'RivetTcl' in the wrong order preventing commands
+ in librivet from being imported in the global namespace.
+Author: mxmanghi@apache.org
+Origin: upstream
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54290
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/apache-2/mod_rivet.c
+++ b/src/apache-2/mod_rivet.c
@@ -15,7 +15,7 @@
@@ -5,7 +14,7 @@
*/
-/* $Id: mod_rivet.c 1374729 2012-08-19 11:09:10Z mxmanghi $ */
-+/* $Id: mod_rivet.c 1421053 2012-12-13 00:32:03Z mxmanghi $ */
++/* $Id: mod_rivet.c 1423234 2012-12-18 00:30:35Z mxmanghi $ */
/* Rivet config */
#ifdef HAVE_CONFIG_H
Modified: tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch (original)
+++ tcl/rivet/branches/debian-apache2.2/patches/rivet-core-headers-subcmd.patch Thu Dec 20 20:25:04 2012
@@ -1,3 +1,10 @@
+Description: adding error message when handling a wrong subcommand of '::rivet::headers'
+ when a wrong subcommand to command ::rivet::headers was given no meaningful error
+ message was printed even though the command returned TCL_ERROR. This patch adds an error message
+Author: mxmanghi@apache.org
+Origin: upstream
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/apache-2/rivetCore.c
+++ b/src/apache-2/rivetCore.c
@@ -17,7 +17,7 @@
@@ -5,7 +12,7 @@
*/
-/* $Id: rivetCore.c 1335266 2012-05-07 21:20:11Z mxmanghi $ */
-+/* $Id: rivetCore.c 1422710 2012-12-16 23:12:29Z mxmanghi $ */
++/* $Id: rivetCore.c 1423234 2012-12-18 00:30:35Z mxmanghi $ */
/* Rivet config */
#ifdef HAVE_CONFIG_H
Modified: tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch (original)
+++ tcl/rivet/branches/debian-apache2.2/patches/rivet-import-fix.patch Thu Dec 20 20:25:04 2012
@@ -1,3 +1,11 @@
+Description: package RivetTcl renamed as Rivet
+ to improve compatibility with existing software written for Rivet 2.0 package RivetTcl
+ has been renamed as 'Rivet' previously provided by librivet
+Author: mxmanghi@apache.org
+Origin: upstream
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/rivet/init.tcl
+++ b/rivet/init.tcl
@@ -12,7 +12,7 @@
Modified: tcl/rivet/branches/debian-apache2.2/patches/series
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/series?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/series (original)
+++ tcl/rivet/branches/debian-apache2.2/patches/series Thu Dec 20 20:25:04 2012
@@ -3,4 +3,5 @@ rivet-core-headers-subcmd.patch
mod-rivet-rivetlib.patch
rivet-import-fix.patch
librivet-pkg-version.patch
+manual-output-utf-8.patch
doc-nohtmlremove.patch
Modified: tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch (original)
+++ tcl/rivet/branches/debian-apache2.2/patches/session-fix-store.patch Thu Dec 20 20:25:04 2012
@@ -1,3 +1,45 @@
+Description: return code of method 'store' introduced incompatibility with session package and other existing code
+ Method 'store' in class ::Database returns what returned by methods
+ 'insert' (for a new row) or 'update' (for an existing row). Previously
+ 'store' returned invariably 1 on normal execution of the method, making
+ it a unusuable value for having insight in what the method did internally
+ (this behaviour is undocumented in the manual). Package Session's 'store'
+ method turned out to test this value to detect error conditions thus it failed
+ when a call to 'store' didn't change any values in an existing row.
+ To prevent other incompatibilities the old behaviour was reinstated. Also ::Session::store
+ method was revised removing wrong and all too verbose error output.
+Author: mxmanghi@apache.org
+Bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=54313
+Origin: upstream
+Last-Update: 2012-12-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/rivet/packages/dio/dio.tcl
++++ b/rivet/packages/dio/dio.tcl
+@@ -14,7 +14,7 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+-# $Id: dio.tcl 1388916 2012-09-22 22:51:20Z mxmanghi $
++# $Id: dio.tcl 1423165 2012-12-17 21:39:08Z mxmanghi $
+
+ catch {package require Tclx}
+ package require Itcl
+@@ -448,11 +448,11 @@
+ $res destroy
+
+ if {$numrows} {
+- return [eval $this update $arrayName $args]
++ $this update $arrayName $args
+ } else {
+- return [eval $this insert $myTable $arrayName]
++ $this insert $myTable $arrayName
+ }
+-
++ return 1
+ }
+
+ #
--- a/rivet/packages/session/session-class.tcl
+++ b/rivet/packages/session/session-class.tcl
@@ -1,7 +1,7 @@
Modified: tcl/rivet/branches/debian-apache2.2/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/rules?rev=1424671&r1=1424670&r2=1424671&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/rules (original)
+++ tcl/rivet/branches/debian-apache2.2/rules Thu Dec 20 20:25:04 2012
@@ -38,22 +38,21 @@ build-indep: build-stamp
build-stamp: configure-stamp
dh_testdir
$(MAKE)
-# ( cd doc; $(MAKE) docs )
+ ( cd doc; rm -fr html/; $(MAKE) docs )
touch build-stamp
configure-stamp:
dh_testdir
chmod +x ./configure
- 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.1 \
- --enable-version-display
+ 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-rivet-target-dir=/usr/lib/tcltk/rivet2.1 \
+ --enable-version-display
touch configure-stamp
binary-indep: build libapache2-mod-rivet-doc
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org