[Pkg-tcltk-commits] r259 - tk8.4/trunk/debian

[sgolovan-guest at alioth.debian.org]

Author: sgolovan-guest
Date: 2007-10-14 16:34:26 +0000 (Sun, 14 Oct 2007)
New Revision: 259

Removed:
   tk8.4/trunk/debian/tk8.4.preinst
Modified:
   tk8.4/trunk/debian/changelog
   tk8.4/trunk/debian/control
   tk8.4/trunk/debian/rules
Log:
[tk8.4]
Removed /usr/lib/tcl8.4 symlink.


Modified: tk8.4/trunk/debian/changelog
===================================================================
--- tk8.4/trunk/debian/changelog	2007-10-14 16:31:03 UTC (rev 258)
+++ tk8.4/trunk/debian/changelog	2007-10-14 16:34:26 UTC (rev 259)
@@ -3,11 +3,10 @@
   * Removed TK_INC_DIR from tkConfig.sh and tcl.m4.
   * Added -fno-unit-at-a-time option to match tcl8.4 build options.
   * Moved architecture independent files from /usr/lib/tk8.4 to
-    /usr/share/tcltk/tk8.4 leaving /usr/lib/tk8.4 as a symlink to maintain
-    backward compatibility. Eventually, the symlink will be removed.
+    /usr/share/tcltk/tk8.4 breaking backward compatibility.
   * Fixed bug with update-alternatives in prerm script.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 13 Oct 2007 20:28:52 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 14 Oct 2007 20:32:13 +0400
 
 tk8.4 (8.4.16-1) unstable; urgency=low
 

Modified: tk8.4/trunk/debian/control
===================================================================
--- tk8.4/trunk/debian/control	2007-10-14 16:31:03 UTC (rev 258)
+++ tk8.4/trunk/debian/control	2007-10-14 16:34:26 UTC (rev 259)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Chris Waters <xtifr at debian.org>, Anselm Lingnau <lingnau at debian.org>, Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), quilt
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.16-2), quilt
 Standards-Version: 3.7.2
 
 Package: tk8.4
@@ -40,7 +40,7 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.2), tk8.4 (= ${binary:Version})
+Depends: x11proto-core-dev | x-dev, libx11-dev, libxt-dev, tcl8.4-dev (>= 8.4.16-2), tk8.4 (= ${binary:Version})
 Conflicts: tk
 Provides: tk-dev
 Suggests: tk8.4-doc

Modified: tk8.4/trunk/debian/rules
===================================================================
--- tk8.4/trunk/debian/rules	2007-10-14 16:31:03 UTC (rev 258)
+++ tk8.4/trunk/debian/rules	2007-10-14 16:34:26 UTC (rev 259)
@@ -34,7 +34,7 @@
 	  TK_LIBRARY="/usr/share/tcltk/tk$(v)" \
 	  ./configure --prefix=/usr \
 		      --includedir=/usr/include/tcl$(v) \
-		      --with-tcl=/usr/lib/tcl$(v) \
+		      --with-tcl=/usr/share/tcltk/tcl$(v) \
 		      --enable-shared \
 		      --enable-threads \
 		      --enable-man-symlinks \
@@ -142,9 +142,6 @@
 	mv debian/tk$(v)/usr/share/tcltk/tk$(v)/*.sh \
 	   debian/tk$(v)-dev/usr/share/tcltk/tk$(v)
 
-# Link /usr/share/tk8.4 to /usr/lib/tk8.4 for backward compatibility
-	ln -sf ../share/tcltk/tk$(v) debian/tk$(v)/usr/lib/tk$(v)
-
 	dh_installdocs -a
 	install -d `pwd`/debian/tk$(v)/usr/share/doc/tk$(v)/examples/
 # move around the demos

Deleted: tk8.4/trunk/debian/tk8.4.preinst
===================================================================
--- tk8.4/trunk/debian/tk8.4.preinst	2007-10-14 16:31:03 UTC (rev 258)
+++ tk8.4/trunk/debian/tk8.4.preinst	2007-10-14 16:34:26 UTC (rev 259)
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# remove the /usr/lib/tk8.4 directory, so we can replace it with a symlink
-if [ -d /usr/lib/tk8.4 ] && [ ! -L /usr/lib/tk8.4 ]; then
-    rm -rf /usr/lib/tk8.4
-fi
-
-#DEBHELPER#