[Pkg-tcltk-commits] r798 - in tcl8.6/trunk/debian: . patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Dec 27 11:14:22 UTC 2008 

Author: sgolovan-guest
Date: 2008-12-27 11:14:22 +0000 (Sat, 27 Dec 2008)
New Revision: 798

Added:
   tcl8.6/trunk/debian/filterconfig
   tcl8.6/trunk/debian/tcl8.6-tdbc.files
Modified:
   tcl8.6/trunk/debian/changelog
   tcl8.6/trunk/debian/control
   tcl8.6/trunk/debian/patches/series
   tcl8.6/trunk/debian/rules
   tcl8.6/trunk/debian/tcl8.6-dev.files
Log:
[tcl8.6]
  * New upstream beta release.
  * Separated new TDBC package which is bundled with the Tcl distribution to
    tcl8.6-tdbc package, and added directory /usr/lib/tcltk/tcl8.6 to the
    list of paths where Tcl packages are searched.


Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog	2008-12-24 11:47:59 UTC (rev 797)
+++ tcl8.6/trunk/debian/changelog	2008-12-27 11:14:22 UTC (rev 798)
@@ -1,8 +1,11 @@
-tcl8.6 (8.6.0~a3-2) UNRELEASED; urgency=low
+tcl8.6 (8.6.0~b1-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream beta release.
+  * Separated new TDBC package which is bundled with the Tcl distribution to
+    tcl8.6-tdbc package, and added directory /usr/lib/tcltk/tcl8.6 to the
+    list of paths where Tcl packages are searched.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 17 Oct 2008 13:38:19 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Dec 2008 13:47:14 +0300
 
 tcl8.6 (8.6.0~a3-1) experimental; urgency=low
 

Modified: tcl8.6/trunk/debian/control
===================================================================
--- tcl8.6/trunk/debian/control	2008-12-24 11:47:59 UTC (rev 797)
+++ tcl8.6/trunk/debian/control	2008-12-27 11:14:22 UTC (rev 798)
@@ -20,11 +20,21 @@
  scripting language.  This package contains everything you need to run
  Tcl scripts and Tcl-enabled apps.  This version includes thread support.
 
+Package: tcl8.6-tdbc
+Section: interpreters
+Priority: optional
+Architecture: any
+Depends: tcl8.6 (= ${binary:Version}), ${shlibs:Depends}
+Description: Tcl (the Tool Command Language) v8.6 - database connectivity
+ Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
+ scripting language.  This package contains TDBC - Tcl database connectivity
+ package.
+
 Package: tcl8.6-doc
 Section: doc
 Priority: optional
 Architecture: all
-Suggests: tcl8.6
+Suggests: tcl8.6, tcl8.6-tdbc
 Conflicts: tcldoc
 Provides: tcldoc
 Description: Tcl (the Tool Command Language) v8.6 - manual pages
@@ -35,7 +45,7 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: tcl8.6 (= ${binary:Version})
+Depends: tcl8.6 (= ${binary:Version}), tcl8.6-tdbc (= ${binary:Version})
 Suggests: tcl8.6-doc
 Description: Tcl (the Tool Command Language) v8.6 - development files
  Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted

Added: tcl8.6/trunk/debian/filterconfig
===================================================================
--- tcl8.6/trunk/debian/filterconfig	                        (rev 0)
+++ tcl8.6/trunk/debian/filterconfig	2008-12-27 11:14:22 UTC (rev 798)
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+. $1
+
+sed -i -e "s:^TCL_BUILD_LIB_SPEC=.*:TCL_BUILD_LIB_SPEC='$TCL_LIB_SPEC':" \
+       -e "s:^TCL_BUILD_STUB_LIB_SPEC=.*:TCL_BUILD_STUB_LIB_SPEC='$TCL_STUB_LIB_SPEC':" \
+       -e "s:^TCL_BUILD_STUB_LIB_PATH=.*:TCL_BUILD_STUB_LIB_PATH='$TCL_STUB_LIB_PATH':" \
+       -e "s:^TCL_SRC_DIR=.*:TCL_SRC_DIR='/usr/include/tcl$TCL_VERSION/tcl-private':" \
+       $1

Modified: tcl8.6/trunk/debian/patches/series
===================================================================
--- tcl8.6/trunk/debian/patches/series	2008-12-24 11:47:59 UTC (rev 797)
+++ tcl8.6/trunk/debian/patches/series	2008-12-27 11:14:22 UTC (rev 798)
@@ -1,7 +1,7 @@
 tclport.diff
 tcllibrary.diff
 tclpackagepath.diff
-tclprivate.diff
+#tclprivate.diff
 confsearch.diff
 rpath.diff
 non-linux.diff

Modified: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules	2008-12-24 11:47:59 UTC (rev 797)
+++ tcl8.6/trunk/debian/rules	2008-12-27 11:14:22 UTC (rev 798)
@@ -42,7 +42,7 @@
 	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 /usr/lib" \
+	  TCL_PACKAGE_PATH="/usr/local/lib/tcltk /usr/local/share/tcltk /usr/lib/tcltk /usr/share/tcltk /usr/lib/tcltk/tcl$(v) /usr/lib" \
 	  ./configure --host=$(DEB_HOST_GNU_TYPE) \
 		      --build=$(DEB_BUILD_GNU_TYPE) \
 		      --prefix=/usr \
@@ -101,6 +101,13 @@
 	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/share/tcltk/tcl$(v)
 	cp unix/tcl.m4 debian/tmp/usr/share/tcltk/tcl$(v)/tcl.m4
 	rm -f debian/tmp/usr/share/tcltk/tcl$(v)/ldAix
+	#
+	# Move bundled external packages from /usr/lib to /usr/lib/tcltk/tcl$(v)
+	install -d -m 755 `pwd`/debian/tmp/usr/lib/tcltk/tcl$(v)
+	mv debian/tmp/usr/lib/tdbc* debian/tmp/usr/lib/tcltk/tcl$(v)
+	sed -i -e 's:/usr/lib/:/usr/lib/tcltk/tcl$(v)/:g' \
+	    debian/tmp/usr/lib/tcltk/tcl$(v)/*/tdbcConfig.sh
+	#
 	# Fix up the include files.
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
 	cp generic/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/generic
@@ -108,6 +115,9 @@
 	cp unix/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/unix
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
 	cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
+	#
+	# External packages manpages don't follow MANN_INSTALL_DIR, so move them.
+	mv debian/tmp/usr/share/man/mann/* debian/tmp/usr/share/man/man3
 	# Fix up the manpages.
 	cd debian/tmp/usr/share/man/man1 && \
 	  zcat tclsh.1.gz | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
@@ -159,6 +169,8 @@
 	   debian/tcl$(v)-dev/usr/share/aclocal/tcl$(v).m4
 	mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tclConfig.sh \
 	   debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)
+	sh debian/filterconfig \
+	   debian/tcl$(v)-dev/usr/share/tcltk/tcl$(v)/tclConfig.sh
 	ln -s ../../share/tcltk/tcl$(v)/tclConfig.sh \
 	      debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
 	dh_installdocs -a
@@ -182,8 +194,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.6_8.6.0~a3.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.6a3-src.tar.gz
+	wget -O tcl8.6_8.6.0~b1.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.6b1-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
 

Modified: tcl8.6/trunk/debian/tcl8.6-dev.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.files	2008-12-24 11:47:59 UTC (rev 797)
+++ tcl8.6/trunk/debian/tcl8.6-dev.files	2008-12-27 11:14:22 UTC (rev 798)
@@ -1,3 +1,5 @@
 usr/include
 usr/lib/*.a
 usr/lib/*.so
+usr/lib/tcltk/tcl8.6/tdbc*/*.a
+usr/lib/tcltk/tcl8.6/tdbc*/*.sh

Added: tcl8.6/trunk/debian/tcl8.6-tdbc.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-tdbc.files	                        (rev 0)
+++ tcl8.6/trunk/debian/tcl8.6-tdbc.files	2008-12-27 11:14:22 UTC (rev 798)
@@ -0,0 +1,2 @@
+usr/lib/tcltk/tcl8.6/tdbc*/*.so
+usr/lib/tcltk/tcl8.6/tdbc*/*.tcl

More information about the Pkg-tcltk-commits mailing list