[DebianGIS-dev] r1266 - packages/grass/trunk/debian

frankie at alioth.debian.org frankie at alioth.debian.org
Wed Nov 14 15:33:09 UTC 2007


Author: frankie
Date: 2007-11-14 15:33:09 +0000 (Wed, 14 Nov 2007)
New Revision: 1266

Modified:
   packages/grass/trunk/debian/changelog
   packages/grass/trunk/debian/rules
Log:
Fixing for Tcl/Tk policy and backports compatibility.


Modified: packages/grass/trunk/debian/changelog
===================================================================
--- packages/grass/trunk/debian/changelog	2007-11-14 15:15:47 UTC (rev 1265)
+++ packages/grass/trunk/debian/changelog	2007-11-14 15:33:09 UTC (rev 1266)
@@ -4,10 +4,11 @@
   * Added the new Homepage field to debian/control.
   * Updated obsolete ${Source-Version} to ${binary:Version}.
   * Fixed lintian error: : debian-rules-ignores-make-clean-error
-  * Moved to new Tcl/Tk policy, introducing default -dev packages build-dependencies as alternative 
-    and still depending on versioned ones for backports.
+  * Moved to new Tcl/Tk policy, introducing default -dev packages build-dependencies as alternative
+    and still depending on versioned ones for backports. For backports the
+    Tcl/Tk includes path is found at build time in debian/rules.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 30 Oct 2007 13:56:55 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 14 Nov 2007 16:30:49 +0100
 
 grass (6.2.2-2) unstable; urgency=medium
 

Modified: packages/grass/trunk/debian/rules
===================================================================
--- packages/grass/trunk/debian/rules	2007-11-14 15:15:47 UTC (rev 1265)
+++ packages/grass/trunk/debian/rules	2007-11-14 15:33:09 UTC (rev 1266)
@@ -22,6 +22,16 @@
 	STRIP = strip
 endif
 
+#
+# This is used to test about the use of default tcl-dev, just
+# useful for backports. To be removed after Lenny.
+#
+ifeq (0,$(shell test -d /usr/include/tcl; echo $$?))
+	TCLINC = /usr/include/tcl
+else
+	TCLINC = /usr/include/tcl8.4
+endif
+
 include /usr/share/dpatch/dpatch.make
 
 config-stamp: patch
@@ -46,7 +56,7 @@
 		    --with-sqlite \
 		    --enable-largefile \
                     --with-freetype-includes=/usr/include/freetype2 \
-                    --with-tcltk-includes=/usr/include/tcl8.4 \
+                    --with-tcltk-includes=$(TCLINC) \
                     --with-postgres-includes=$(shell pg_config --includedir) \
                     --with-mysql-includes=/usr/include/mysql \
 		    --with-proj-share=/usr/share/proj




More information about the Pkg-grass-devel mailing list