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

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2009-03-01 08:45:40 +0000 (Sun, 01 Mar 2009)
New Revision: 820

Added:
   tcl8.6/trunk/debian/patches/tdbc.diff
Modified:
   tcl8.6/trunk/debian/changelog
   tcl8.6/trunk/debian/patches/series
   tcl8.6/trunk/debian/tcl8.6.prerm
Log:
[tcl8.6]
  * Added a compiler directive which helps to build tdbc extension
    (closes: #510153).
  * Don't remove tclsh alternative in case of package upgrade because the
    manually installed alternative is also removed which isn't desirable.


Modified: tcl8.6/trunk/debian/changelog
===================================================================
--- tcl8.6/trunk/debian/changelog	2009-03-01 08:44:29 UTC (rev 819)
+++ tcl8.6/trunk/debian/changelog	2009-03-01 08:45:40 UTC (rev 820)
@@ -1,8 +1,11 @@
-tcl8.6 (8.6.0~b1-2) UNRELEASED; urgency=low
+tcl8.6 (8.6.0~b1-2) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * Added a compiler directive which helps to build tdbc extension
+    (closes: #510153).
+  * Don't remove tclsh alternative in case of package upgrade because the
+    manually installed alternative is also removed which isn't desirable.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Dec 2008 19:44:05 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 01 Mar 2009 10:36:35 +0300
 
 tcl8.6 (8.6.0~b1-1) experimental; urgency=low
 

Modified: tcl8.6/trunk/debian/patches/series
===================================================================
--- tcl8.6/trunk/debian/patches/series	2009-03-01 08:44:29 UTC (rev 819)
+++ tcl8.6/trunk/debian/patches/series	2009-03-01 08:45:40 UTC (rev 820)
@@ -6,3 +6,4 @@
 rpath.diff
 non-linux.diff
 manpages.diff
+tdbc.diff

Added: tcl8.6/trunk/debian/patches/tdbc.diff
===================================================================
--- tcl8.6/trunk/debian/patches/tdbc.diff	                        (rev 0)
+++ tcl8.6/trunk/debian/patches/tdbc.diff	2009-03-01 08:45:40 UTC (rev 820)
@@ -0,0 +1,14 @@
+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/tcl8.6.prerm
===================================================================
--- tcl8.6/trunk/debian/tcl8.6.prerm	2009-03-01 08:44:29 UTC (rev 819)
+++ tcl8.6/trunk/debian/tcl8.6.prerm	2009-03-01 08:45:40 UTC (rev 820)
@@ -2,6 +2,8 @@
 
 set -e
 
-update-alternatives --remove tclsh /usr/bin/tclsh8.6
+if [ $1 != "upgrade" ] ; then
+    update-alternatives --remove tclsh /usr/bin/tclsh8.6
+fi
 
 #DEBHELPER#