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/10/08 19:44:00 UTC
svn commit: r1180424 - in /tcl/rivet/branches/rivet-namespace: ./ ChangeLog
debian/changelog debian/control debian/libapache2-mod-rivet-doc.doc-base
debian/rules doc/
Author: mxmanghi
Date: Sat Oct 8 17:44:00 2011
New Revision: 1180424
URL: http://svn.apache.org/viewvc?rev=1180424&view=rev
Log:
commit latest changes done by merge from trunk
Modified:
tcl/rivet/branches/rivet-namespace/ (props changed)
tcl/rivet/branches/rivet-namespace/ChangeLog
tcl/rivet/branches/rivet-namespace/debian/changelog
tcl/rivet/branches/rivet-namespace/debian/control
tcl/rivet/branches/rivet-namespace/debian/libapache2-mod-rivet-doc.doc-base
tcl/rivet/branches/rivet-namespace/debian/rules
tcl/rivet/branches/rivet-namespace/doc/ (props changed)
Propchange: tcl/rivet/branches/rivet-namespace/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 8 17:44:00 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-1175897
+/tcl/rivet/trunk:1065843-1180422
Modified: tcl/rivet/branches/rivet-namespace/ChangeLog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/ChangeLog?rev=1180424&r1=1180423&r2=1180424&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/ChangeLog (original)
+++ tcl/rivet/branches/rivet-namespace/ChangeLog Sat Oct 8 17:44:00 2011
@@ -1,3 +1,9 @@
+2011-10-09 Massimo Manghi <mx...@apache.org>
+ * debian/*: preparing to move the debian stuff away from
+ development branches of Rivet. I'm committing the latest
+ changes done in the process of releasing the Debian package
+ for 2.0.4
+
2011-09-26 Massimo Manghi <mx...@apache.org>
* m4/ax_compare_version.m4: add macro for version comparison from the GNU macro archive
Modified: tcl/rivet/branches/rivet-namespace/debian/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/debian/changelog?rev=1180424&r1=1180423&r2=1180424&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/debian/changelog (original)
+++ tcl/rivet/branches/rivet-namespace/debian/changelog Sat Oct 8 17:44:00 2011
@@ -1,3 +1,12 @@
+libapache2-mod-rivet (2.0.4-1) unstable; urgency=low
+
+ * New upstream release 2.0.4
+ * Remove debian/patches/makefile_am.diff - included upstream.
+ * Package documentation tag set to 'Web Programming' in
+ debian/libapache2-mod-rivet-doc.doc-base
+
+ -- Massimo Manghi <mx...@apache.org> Wed, 21 Sep 2011 22:20:30 +0200
+
libapache2-mod-rivet (2.0.3-2) unstable; urgency=low
* Added installation targets for removing unneeded .la libtool files
Modified: tcl/rivet/branches/rivet-namespace/debian/control
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/debian/control?rev=1180424&r1=1180423&r2=1180424&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/debian/control (original)
+++ tcl/rivet/branches/rivet-namespace/debian/control Sat Oct 8 17:44:00 2011
@@ -11,7 +11,7 @@ Package: libapache2-mod-rivet
Architecture: any
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
+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
programming language integrated with Apache Web Server. It is
designed to be fast, powerful and extensible, consume few system
@@ -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
Modified: tcl/rivet/branches/rivet-namespace/debian/libapache2-mod-rivet-doc.doc-base
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/debian/libapache2-mod-rivet-doc.doc-base?rev=1180424&r1=1180423&r2=1180424&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/debian/libapache2-mod-rivet-doc.doc-base (original)
+++ tcl/rivet/branches/rivet-namespace/debian/libapache2-mod-rivet-doc.doc-base Sat Oct 8 17:44:00 2011
@@ -2,7 +2,8 @@ Document: libapache2-mod-rivet
Title: The Apache Rivet Programming Manual
Author: The Rivet Team
Abstract: This manual explains how to script web pages using Rivet and the Tcl programming language
-Section: Web Programming
+Section: Web Development
+
Format: HTML
Index: /usr/share/doc/libapache2-mod-rivet-doc/html/index.html
Files: /usr/share/doc/libapache2-mod-rivet-doc/html/*.html
Modified: tcl/rivet/branches/rivet-namespace/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/rivet-namespace/debian/rules?rev=1180424&r1=1180423&r2=1180424&view=diff
==============================================================================
--- tcl/rivet/branches/rivet-namespace/debian/rules (original)
+++ tcl/rivet/branches/rivet-namespace/debian/rules Sat Oct 8 17:44:00 2011
@@ -4,6 +4,7 @@
#export DH_VERBOSE=1
TCL_VERSION=8.5
+RIVET_LIBRARY_DIR=/usr/lib/tcltk/rivet2.1
package=libapache2-mod-rivet
LDFLAGS += -Wl,--as-needed
CFLAGS = -Wall -g
@@ -28,8 +29,11 @@ clean:
dh_auto_clean
dh_clean
+build: build-arch build-indep
-build: configure build-stamp
+build-arch: build-stamp
+
+build-indep: build-stamp
build-stamp: configure-stamp
dh_testdir
@@ -37,20 +41,18 @@ build-stamp: configure-stamp
( cd doc; $(MAKE) docs )
touch build-stamp
-configure: configure-stamp
-
configure-stamp:
dh_testdir
chmod +x ./configure
CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" \
./configure --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_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 \
+ --with-apache=/usr \
+ --with-apxs=/usr/bin/apxs2 \
+ --with-tclsh=/usr/bin/tclsh$(TCL_VERSION) \
+ --with-apache-version=2 \
+ --with-rivet-target-dir=$(RIVET_LIBRARY_DIR) \
--enable-version-display
touch configure-stamp
@@ -99,4 +101,4 @@ libapache2-mod-rivet-doc: build
dh_md5sums -p$@
dh_builddeb -p$@
-.PHONY: build build-stamp clean binary binary-indep binary-arch configure
+.PHONY: build build-stamp clean binary binary-indep binary-arch
Propchange: tcl/rivet/branches/rivet-namespace/doc/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Oct 8 17:44:00 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-1175897
+/tcl/rivet/trunk/doc:1065843-1180422
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org