From cfa2761407871abfb6dade1107b9b998ea130881 Mon Sep 17 00:00:00 2001
From: lecoanet
Date: Wed, 18 Jan 2006 14:29:26 +0000
Subject: merged patches for the packages by Till Varoquaux.

---
 debian/changelog | 2 +-
 debian/control   | 5 +++--
 debian/rules     | 3 ++-
 tclconfig/tcl.m4 | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index de7270c..475a18b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-    
 zinc-tk (3.3.3) unstable; urgency=low
 
+  * Added fixes to compile the Linux debian packages (Thanks Till Varoquaux)
   * Integrated a patch from D Pavet. This patch keep the angular position
     of the leader in sync when changing the leader position with -labeldx
     and -labeldy.
diff --git a/debian/control b/debian/control
index 4a34871..a709c60 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: zinc-tk
 Section: devel
 Priority: extra
 Maintainer: Patrick Lecoanet <lecoanet@ath.cena.fr>
-Build-Depends: xlibs-dev, xlibmesa-dev, tk8.4-dev, tcl8.4-dev, perl-base, python (>= 2.1), debhelper (>> 3.0.0), tetex-extra (>= 1.0.2+20011202-2), gcc(>= 2.95.4-14), perl (>= 5.6.1-8.2), tex4ht
+# may to change xlibmesa-dev by libglu-dev
+Build-Depends: xlibs-dev, xlibmesa-dev, tk8.4-dev, tcl8.4-dev, perl-base, python (>= 2.1), python-dev, debhelper (>> 3.0.0), tetex-extra (>= 1.0.2+20011202-2), gcc(>= 2.95.4-14), perl (>= 5.6.1-8.2), tex4ht, perl-tk (>= 800.024)
 Standards-Version: 2.3.0.0
 
 Package: zinc-tk
 Architecture: i386
-#Depends: xlibmesa3
+# may to change xlibmesa3 by libglu1
 Depends: tk8.4 (>= 8.4.3), xlibmesa3
 Conflicts: xradar3-tk
 Description: The Tk zinc widget.
diff --git a/debian/rules b/debian/rules
index 9080ef5..f443580 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,7 +44,8 @@ install: build
 # Configuring/compiling/installing for Tcl.
 	./configure --prefix=/usr --enable-gl=damage
 	make binaries
-	make install prefix=$(TMP)/usr
+#	make install prefix=$(TMP)/usr
+	make install DESTDIR=$(TMP)
 #
 # Making/installing the documentation
 	make pdf html
diff --git a/tclconfig/tcl.m4 b/tclconfig/tcl.m4
index 9a7e253..1f76ea8 100644
--- a/tclconfig/tcl.m4
+++ b/tclconfig/tcl.m4
@@ -752,7 +752,7 @@ AC_DEFUN(TEA_CONFIG_CFLAGS, [
 	    # results, and the version is kept in special file).
 	
 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
+		system=MP-RAS-`awk '{print $3}' /etc/.relid`
 	    fi
 	    if test "`uname -s`" = "AIX" ; then
 		system=AIX-`uname -v`.`uname -r`
-- 
cgit v1.1