[Pkg-tcltk-devel] Bug#611650: Acknowledgement (tcl8.5-dev contains arch-dependent file in /usr/share/ (tcltk/tcl8.5/tclConfig.sh))

[Wookey]

+++ Debian Bug Tracking System [2011-01-31 17:09 +0000]:

And here's the patch I forgot:

diff -u /home/wookey/debian/squeeze/tcl8.5-8.5.8/debian/changelog /home/wookey/ubuntu/maverick/build/tcl8.5-8.5.8/debian/changelog
--- /home/wookey/debian/squeeze/tcl8.5-8.5.8/debian/changelog	2011-01-31 15:08:56.000000000 +0000
+++ /home/wookey/ubuntu/maverick/build/tcl8.5-8.5.8/debian/changelog	2011-01-31 15:04:13.844713996 +0000
@@ -1,3 +1,10 @@
+tcl8.5 (8.5.8-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Move arch-dependent /usr/share/tcltk/tcl8.5/tclConfig.sh to /usr/lib
+
+ -- Wookey <wookey at debian.org>  Mon, 31 Jan 2011 15:03:12 +0000
+
 tcl8.5 (8.5.8-2) unstable; urgency=low
 
   * Fixed building on MIPS architectures. The upstream changes in 8.5.8
diff -u /home/wookey/debian/squeeze/tcl8.5-8.5.8/debian/rules /home/wookey/ubuntu/maverick/build/tcl8.5-8.5.8/debian/rules
--- /home/wookey/debian/squeeze/tcl8.5-8.5.8/debian/rules	2011-01-31 15:08:56.000000000 +0000
+++ /home/wookey/ubuntu/maverick/build/tcl8.5-8.5.8/debian/rules	2011-01-31 15:33:42.180713997 +0000
@@ -98,8 +98,8 @@
 	cp unix/libtcl$(v).a debian/tmp/usr/lib
 	#mv debian/tmp/usr/lib/libtcl$(v).so debian/tmp/usr/lib/libtcl$(v).so.0
 	#ln -sf libtcl$(v).so.0 debian/tmp/usr/lib/libtcl$(v).so
-	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
+	mv debian/tmp/usr/lib/*.sh debian/tcl$(v)-dev/usr/lib/tcl$(v)
+	cp unix/tcl.m4 debian/tcl$(v)-dev/usr/share/aclocal/tcl.m4
 	rm -f debian/tmp/usr/share/tcltk/tcl$(v)/ldAix
 	# Fix up the include files.
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/generic
@@ -158,13 +158,6 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_movefiles -a
-	# now, fix up file locations for .sh and .m4
-	mv debian/tcl$(v)/usr/share/tcltk/tcl$(v)/tcl.m4 \
-	   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)
-	ln -s ../../share/tcltk/tcl$(v)/tclConfig.sh \
-	      debian/tcl$(v)-dev/usr/lib/tcl$(v)/tclConfig.sh
 	dh_installdocs -a
 	dh_installmenu -a
 	dh_installchangelogs -a ChangeLog
diff -u /home/wookey/debian/squeeze/tcl8.5-8.5.8/debian/tcl8.5-dev.dirs /home/wookey/ubuntu/maverick/build/tcl8.5-8.5.8/debian/tcl8.5-dev.dirs
--- /home/wookey/debian/squeeze/tcl8.5-8.5.8/debian/tcl8.5-dev.dirs	2011-01-31 15:08:56.000000000 +0000
+++ /home/wookey/ubuntu/maverick/build/tcl8.5-8.5.8/debian/tcl8.5-dev.dirs	2011-01-31 16:59:19.572713996 +0000
@@ -1,3 +1,2 @@
 usr/lib/tcl8.5
 usr/share/aclocal
-usr/share/tcltk/tcl8.5

Wookey
-- 
Principal hats:  Linaro, Emdebian, Wookware, Balloonboard, ARM
http://wookware.org/