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/22 15:25:15 UTC
svn commit: r1026317 - in /tcl/rivet/branches/2_0/debian: changelog
libapache2-mod-rivet.docs rules
Author: mxmanghi
Date: Fri Oct 22 13:25:15 2010
New Revision: 1026317
URL: http://svn.apache.org/viewvc?rev=1026317&view=rev
Log:
final commit before releasing
Modified:
tcl/rivet/branches/2_0/debian/changelog
tcl/rivet/branches/2_0/debian/libapache2-mod-rivet.docs
tcl/rivet/branches/2_0/debian/rules
Modified: tcl/rivet/branches/2_0/debian/changelog
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/changelog?rev=1026317&r1=1026316&r2=1026317&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/changelog (original)
+++ tcl/rivet/branches/2_0/debian/changelog Fri Oct 22 13:25:15 2010
@@ -1,4 +1,4 @@
-libapache2-mod-rivet (2.0.1-1) unstable; urgency=low
+libapache2-mod-rivet (2.0.2-1) unstable; urgency=low
* Initial package of Rivet for Debian
* Closes: #599446, #599447
Modified: tcl/rivet/branches/2_0/debian/libapache2-mod-rivet.docs
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/libapache2-mod-rivet.docs?rev=1026317&r1=1026316&r2=1026317&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/libapache2-mod-rivet.docs (original)
+++ tcl/rivet/branches/2_0/debian/libapache2-mod-rivet.docs Fri Oct 22 13:25:15 2010
@@ -1,6 +1,4 @@
BUGS
-form.txt
README
-README.configure
TODO
CHANGES
Modified: tcl/rivet/branches/2_0/debian/rules
URL: http://svn.apache.org/viewvc/tcl/rivet/branches/2_0/debian/rules?rev=1026317&r1=1026316&r2=1026317&view=diff
==============================================================================
--- tcl/rivet/branches/2_0/debian/rules (original)
+++ tcl/rivet/branches/2_0/debian/rules Fri Oct 22 13:25:15 2010
@@ -1,10 +1,22 @@
#!/usr/bin/make -f
# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+#export DH_VERBOSE=1
TCL_VERSION=8.5
package=libapache2-mod-rivet
+LDFLAGS += -Wl,--as-needed
+CFLAGS = -Wall -g
+
+# Don't let the configure script guess our platform.
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
export DH_OPTIONS
@@ -12,6 +24,7 @@ clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
+ rm -f _configs.sed
dh_auto_clean
dh_clean
@@ -29,12 +42,15 @@ configure: configure-stamp
configure-stamp:
dh_testdir
chmod +x ./configure
- ./configure --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/rivet2.0 \
+ 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.0 \
--enable-version-display
touch configure-stamp
@@ -54,6 +70,10 @@ libapache2-mod-rivet: build
dh_install -a
dh_installexamples -a -p$@
dh_auto_install -a -p$@ --destdir=$(CURDIR)/debian/$@
+
+ # Remove README* files in bogus places.
+ find $(CURDIR)/debian/$@/usr/lib/tcltk -name 'README*' -exec rm -v {} \;
+
dh_install -a -p$@
dh_installman -p$@
dh_link -p$@
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org