Hi!

Could you try the attached patch? Is it enough, or there's something
else which should be changed for cross-compilation to work?

Cheers!
-- 
Sergei Golovan
diff -u tcl8.5-8.5.8/debian/changelog tcl8.5-8.5.8/debian/changelog
--- tcl8.5-8.5.8/debian/changelog
+++ tcl8.5-8.5.8/debian/changelog
@@ -1,3 +1,10 @@
+tcl8.5 (8.5.8-3) unstable; urgency=low
+
+  * Moved /usr/share/tcltk/tcl8.5/tclConfig.sh back to the /usr/lib/tcl8.5
+    directory because it is architecture dependent (closes: #611650).
+
+ -- Sergei Golovan <sgolo...@debian.org>  Tue, 01 Feb 2011 11:52:39 +0300
+
 tcl8.5 (8.5.8-2) unstable; urgency=low
 
   * Fixed building on MIPS architectures. The upstream changes in 8.5.8
diff -u tcl8.5-8.5.8/debian/rules tcl8.5-8.5.8/debian/rules
--- tcl8.5-8.5.8/debian/rules
+++ tcl8.5-8.5.8/debian/rules
@@ -98,7 +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)
+	mkdir debian/tmp/usr/lib/tcl$(v)
+	mv debian/tmp/usr/lib/*.sh debian/tmp/usr/lib/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
 	# Fix up the include files.
@@ -158,13 +159,9 @@
 	dh_testdir -a
 	dh_testroot -a
 	dh_movefiles -a
-	# now, fix up file locations for .sh and .m4
+	# now, fix up file locations for .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 tcl8.5-8.5.8/debian/tcl8.5-dev.files tcl8.5-8.5.8/debian/tcl8.5-dev.files
--- tcl8.5-8.5.8/debian/tcl8.5-dev.files
+++ tcl8.5-8.5.8/debian/tcl8.5-dev.files
@@ -3,0 +4 @@
+usr/lib/tcl8.5

Reply via email to