[Pkg-tcltk-commits] r522 - in tcl8.4/trunk/debian: . patches
sgolovan-guest at alioth.debian.org
sgolovan-guest at alioth.debian.org
Mon Feb 25 07:33:44 UTC 2008
Author: sgolovan-guest
Date: 2008-02-25 07:33:43 +0000 (Mon, 25 Feb 2008)
New Revision: 522
Modified:
tcl8.4/trunk/debian/changelog
tcl8.4/trunk/debian/patches/tcllibrary.diff
tcl8.4/trunk/debian/rules
Log:
[tcl8.4]
* Removed experimental removal of /usr/lib from auto_path.
* Quoted CFLAGS in debian/rules when passing to the shell, not when
assigning to a make variable; otherwise the quotes end up as part of
the variable and many things go wrong, leading to a build failure
(closes: #467397).
* Explicitly specified configure options --host and --build to make build
results more predictable.
* Cleaned up debian/rules.
Modified: tcl8.4/trunk/debian/changelog
===================================================================
--- tcl8.4/trunk/debian/changelog 2008-02-25 07:32:51 UTC (rev 521)
+++ tcl8.4/trunk/debian/changelog 2008-02-25 07:33:43 UTC (rev 522)
@@ -1,15 +1,15 @@
-tcl8.4 (8.4.18-2exp2) UNRELEASED; urgency=low
+tcl8.4 (8.4.18-3) unstable; urgency=low
- * NOT RELEASED YET
+ * Quoted CFLAGS in debian/rules when passing to the shell, not when
+ assigning to a make variable; otherwise the quotes end up as part of
+ the variable and many things go wrong, leading to a build failure
+ (closes: #467397).
+ * Explicitly specified configure options --host and --build to make build
+ results more predictable.
+ * Cleaned up debian/rules.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 11 Feb 2008 16:50:36 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Mon, 25 Feb 2008 10:28:15 +0300
-tcl8.4 (8.4.18-2exp1) experimental; urgency=low
-
- * Removed /usr/lib from auto_path for testing purposes.
-
- -- Sergei Golovan <sgolovan at debian.org> Mon, 11 Feb 2008 16:37:30 +0300
-
tcl8.4 (8.4.18-2) unstable; urgency=low
* Upload to unstable.
Modified: tcl8.4/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.4/trunk/debian/patches/tcllibrary.diff 2008-02-25 07:32:51 UTC (rev 521)
+++ tcl8.4/trunk/debian/patches/tcllibrary.diff 2008-02-25 07:33:43 UTC (rev 522)
@@ -28,7 +28,7 @@
===================================================================
--- tcl8.4-8.4.16.orig/library/init.tcl 2007-07-05 22:03:45.000000000 +0400
+++ tcl8.4-8.4.16/library/init.tcl 2007-10-18 20:28:54.000000000 +0400
-@@ -49,17 +49,12 @@
+@@ -49,7 +49,7 @@
namespace eval tcl {
variable Dir
if {[info library] ne ""} {
@@ -37,13 +37,3 @@
if {[lsearch -exact $::auto_path $Dir] < 0} {
lappend ::auto_path $Dir
}
- }
- }
-- set Dir [file join [file dirname [file dirname \
-- [info nameofexecutable]]] lib]
-- if {[lsearch -exact $::auto_path $Dir] < 0} {
-- lappend ::auto_path $Dir
-- }
- if {[info exists ::tcl_pkgPath]} {
- foreach Dir $::tcl_pkgPath {
- if {[lsearch -exact $::auto_path $Dir] < 0} {
Modified: tcl8.4/trunk/debian/rules
===================================================================
--- tcl8.4/trunk/debian/rules 2008-02-25 07:32:51 UTC (rev 521)
+++ tcl8.4/trunk/debian/rules 2008-02-25 07:33:43 UTC (rev 522)
@@ -4,15 +4,18 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
export QUILT_PATCHES := debian/patches
v = 8.4
ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS="-g -O0"
+CFLAGS=-g -O0
else
# See bug #446335
-CFLAGS="-g -O2 -fno-unit-at-a-time"
+CFLAGS=-g -O2 -fno-unit-at-a-time
endif
unpatch:
@@ -34,16 +37,18 @@
touch generic/tclStubInit.c
cd unix && \
TCL_LIBRARY="/usr/share/tcltk/tcl$(v)" \
- TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk" \
- ./configure --prefix=/usr \
+ TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib" \
+ ./configure --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr \
--includedir=/usr/include/tcl$(v) \
- --enable-shared \
+ --enable-shared \
--enable-threads \
- --mandir=/usr/share/man \
+ --mandir=/usr/share/man \
--enable-man-symlinks \
- --enable-man-compression=gzip && \
+ --enable-man-compression=gzip && \
touch ../generic/tclStubInit.c && \
- $(MAKE) CFLAGS=$(CFLAGS)
+ $(MAKE) CFLAGS="$(CFLAGS)"
# Build the static library.
cd unix && \
@@ -72,9 +77,10 @@
cd unix && \
GZIP=-9 \
- make INSTALL_ROOT=`pwd`/../debian/tmp \
- MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
- MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 install
+ $(MAKE) INSTALL_ROOT=`pwd`/../debian/tmp \
+ MAN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man \
+ MANN_INSTALL_DIR=`pwd`/../debian/tmp/usr/share/man/man3 \
+ install
# Fix up the libraries.
cp unix/libtcl$(v).a debian/tmp/usr/lib
mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.0
@@ -97,11 +103,11 @@
for f in *.[3n].gz ; do \
f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \
if [ -L $$f ]; then \
- l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
- rm $$f ; \
- ln -sf $$l $$f2 ; \
+ l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
+ rm $$f ; \
+ ln -sf $$l $$f2 ; \
else \
- zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
+ zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
-e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
-e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
-e 's/send(n)/send(3tk)/g' \
@@ -110,7 +116,7 @@
-e 's/winfo(n)/winfo(3tk)/g' \
-e 's/(n)/(3tcl)/g' \
| gzip -9 >$$f2 ; \
- rm $$f ; \
+ rm $$f ; \
fi ; \
done
More information about the Pkg-tcltk-commits
mailing list