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 2013/01/22 00:39:42 UTC
svn commit: r1436689 - in /tcl/rivet/branches/debian-apache2.2: changelog
control patches/librivet-pkg-version.patch rules
Author: mxmanghi
Date: Mon Jan 21 23:39:42 2013
New Revision: 1436689
URL: http://svn.apache.org/viewvc?rev=1436689&view=rev
Log:
various changes to package Rivet for Debian/Ubuntu
Modified:
tcl/rivet/branches/debian-apache2.2/changelog
tcl/rivet/branches/debian-apache2.2/control
tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.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=1436689&r1=1436688&r2=1436689&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/changelog (original)
+++ tcl/rivet/branches/debian-apache2.2/changelog Mon Jan 21 23:39:42 2013
@@ -1,3 +1,16 @@
+libapache2-mod-rivet (2.1.0-3) unstable; urgency=low
+
+ * add command removing .la files generated by the build process for
+ librivet and librivetparser
+
+ -- Massimo Manghi <mx...@apache.org> Mon, 21 Jan 2013 23:59:58 +0100
+
+libapache2-mod-rivet (2.1.0-2) unstable; urgency=low
+
+ * Adding docbook-xml to build depends line in control
+
+ -- Massimo Manghi <mx...@apache.org> Tue, 15 Jan 2013 01:49:18 +0100
+
libapache2-mod-rivet (2.1.0-1) unstable; urgency=low
* New upstream release 2.1.0
Modified: tcl/rivet/branches/debian-apache2.2/control
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/control?rev=1436689&r1=1436688&r2=1436689&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/control (original)
+++ tcl/rivet/branches/debian-apache2.2/control Mon Jan 21 23:39:42 2013
@@ -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~), docbook-xsl, xsltproc
+Build-Depends: tcl8.5-dev, apache2-prefork-dev, automake, debhelper (>= 7.0.50~), dpkg-dev (>= 1.16.1~), docbook-xsl, xsltproc, docbook-xml
Standards-Version: 3.9.3
Homepage: http://tcl.apache.org/rivet/
Modified: tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch?rev=1436689&r1=1436688&r2=1436689&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch (original)
+++ tcl/rivet/branches/debian-apache2.2/patches/librivet-pkg-version.patch Mon Jan 21 23:39:42 2013
@@ -1,3 +1,4 @@
+package version must be more consistently taken from the RIVET_SESSION preprocessor symbol
--- a/src/librivet/rivetPkgInit.c
+++ b/src/librivet/rivetPkgInit.c
@@ -110,7 +110,7 @@
Modified: tcl/rivet/branches/debian-apache2.2/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/debian-apache2.2/rules?rev=1436689&r1=1436688&r2=1436689&view=diff
==============================================================================
--- tcl/rivet/branches/debian-apache2.2/rules (original)
+++ tcl/rivet/branches/debian-apache2.2/rules Mon Jan 21 23:39:42 2013
@@ -5,6 +5,7 @@
TCL_VERSION=8.5
package=libapache2-mod-rivet
+RIVETLIB_DIR=/usr/lib/tcltk/rivet2.1
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
@@ -14,9 +15,9 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-arch
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
+ CFLAGS += -O0
else
- CFLAGS += -O2
+ CFLAGS += -O2
endif
export DH_OPTIONS
@@ -51,7 +52,7 @@ configure-stamp:
--with-apache=/usr \
--with-apxs=/usr/bin/apxs2 \
--with-tclsh=/usr/bin/tclsh$(TCL_VERSION) \
- --with-rivet-target-dir=/usr/lib/tcltk/rivet2.1 \
+ --with-rivet-target-dir=$(RIVETLIB_DIR) \
--enable-version-display
touch configure-stamp
@@ -74,7 +75,7 @@ libapache2-mod-rivet: build
# Remove README* files in bogus places.
find $(CURDIR)/debian/$@/usr/lib/tcltk -name 'README*' -exec rm -v {} \;
-
+ find $(CURDIR)/debian/$@/usr/lib/tcltk -name '*.la' -exec rm -v {} \;
dh_install -a -p$@
dh_installman -p$@
dh_link -p$@
---------------------------------------------------------------------
To unsubscribe, e-mail: site-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: site-cvs-help@tcl.apache.org