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

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-07-28 15:31:04 +0000 (Wed, 28 Jul 2010)
New Revision: 1058

Removed:
   tcl8.6/trunk/debian/patches/tdbc.diff
   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]
  * Removed tcl8.6-tdbc package because TDBC is to be packaged separately.


Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog	2010-07-17 06:27:38 UTC (rev 1057)
+++ tcl8.6/trunk/debian/changelog	2010-07-28 15:31:04 UTC (rev 1058)
@@ -1,8 +1,8 @@
-tcl8.6 (8.6.0~b1-4) UNRELEASED; urgency=low
+tcl8.6 (8.6.0~b1-4) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Removed tcl8.6-tdbc package because TDBC is to be packaged separately.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 18 May 2009 10:01:49 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 28 Jul 2010 19:10:28 +0400
 
 tcl8.6 (8.6.0~b1-3) experimental; urgency=low
 

Modified: tcl8.6/trunk/debian/control
===================================================================
--- tcl8.6/trunk/debian/control	2010-07-17 06:27:38 UTC (rev 1057)
+++ tcl8.6/trunk/debian/control	2010-07-28 15:31:04 UTC (rev 1058)
@@ -20,21 +20,11 @@
  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, tcl8.6-tdbc
+Suggests: tcl8.6
 Conflicts: tcldoc
 Provides: tcldoc
 Description: Tcl (the Tool Command Language) v8.6 - manual pages
@@ -45,7 +35,7 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: tcl8.6 (= ${binary:Version}), tcl8.6-tdbc (= ${binary:Version})
+Depends: tcl8.6 (= ${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

Modified: tcl8.6/trunk/debian/patches/series
===================================================================
--- tcl8.6/trunk/debian/patches/series	2010-07-17 06:27:38 UTC (rev 1057)
+++ tcl8.6/trunk/debian/patches/series	2010-07-28 15:31:04 UTC (rev 1058)
@@ -6,4 +6,3 @@
 rpath.diff
 non-linux.diff
 manpages.diff
-tdbc.diff

Deleted: tcl8.6/trunk/debian/patches/tdbc.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tdbc.diff	2010-07-17 06:27:38 UTC (rev 1057)
+++ tcl8.6/trunk/debian/patches/tdbc.diff	2010-07-28 15:31:04 UTC (rev 1058)
@@ -1,14 +0,0 @@
-Patch by upstream adds a directive which allows to build tdbc extension
-(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=510153).
-
---- tcl8.6-8.6.0~b1.orig/pkgs/tdbc1.0b1/generic/tdbcStubInit.c
-+++ tcl8.6-8.6.0~b1/pkgs/tdbc1.0b1/generic/tdbcStubInit.c
-@@ -15,6 +15,8 @@
- 
- #include "tdbcInt.h"
- 
-+MODULE_SCOPE TdbcStubs tdbcStubs;
-+
- /* !BEGIN!: Do not edit below this line. */
- 
- TdbcStubs tdbcStubs = {

Modified: tcl8.6/trunk/debian/rules
===================================================================
--- tcl8.6/trunk/debian/rules	2010-07-17 06:27:38 UTC (rev 1057)
+++ tcl8.6/trunk/debian/rules	2010-07-28 15:31:04 UTC (rev 1058)
@@ -102,12 +102,6 @@
 	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
@@ -115,6 +109,7 @@
 	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
+	rm debian/tmp/usr/include/tcl$(v)/tdbc*.h
 	#
 	# 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

Modified: tcl8.6/trunk/debian/tcl8.6-dev.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-dev.files	2010-07-17 06:27:38 UTC (rev 1057)
+++ tcl8.6/trunk/debian/tcl8.6-dev.files	2010-07-28 15:31:04 UTC (rev 1058)
@@ -1,5 +1,3 @@
 usr/include
 usr/lib/*.a
 usr/lib/*.so
-usr/lib/tcltk/tcl8.6/tdbc*/*.a
-usr/lib/tcltk/tcl8.6/tdbc*/*.sh

Deleted: tcl8.6/trunk/debian/tcl8.6-tdbc.files
===================================================================
--- tcl8.6/trunk/debian/tcl8.6-tdbc.files	2010-07-17 06:27:38 UTC (rev 1057)
+++ tcl8.6/trunk/debian/tcl8.6-tdbc.files	2010-07-28 15:31:04 UTC (rev 1058)
@@ -1,2 +0,0 @@
-usr/lib/tcltk/tcl8.6/tdbc*/*.so
-usr/lib/tcltk/tcl8.6/tdbc*/*.tcl