diff -urN origs/tcl8.5-8.5.13/debian/changelog tcl8.5-8.5.13/debian/changelog --- origs/tcl8.5-8.5.13/debian/changelog 2012-12-05 13:38:03.000000000 +0000 +++ tcl8.5-8.5.13/debian/changelog 2013-02-11 15:03:56.000000000 +0000 @@ -1,3 +1,11 @@ +tcl8.5 (8.5.13-1ubuntu1ma1) precise; urgency=low + + * Multiarchify package: split libs and tclConfig.sh into -lib + package and use multiarch paths + * Fix failure to clean and build twice + + -- Wookey Tue, 22 Jan 2013 00:13:23 +0000 + tcl8.5 (8.5.13-1ubuntu1) raring; urgency=low * Resynchronise with Debian. diff -urN origs/tcl8.5-8.5.13/debian/compat tcl8.5-8.5.13/debian/compat --- origs/tcl8.5-8.5.13/debian/compat 2012-05-28 14:32:31.000000000 +0100 +++ tcl8.5-8.5.13/debian/compat 2013-01-21 23:52:17.000000000 +0000 @@ -1 +1 @@ -8 +9 diff -urN origs/tcl8.5-8.5.13/debian/control tcl8.5-8.5.13/debian/control --- origs/tcl8.5-8.5.13/debian/control 2012-12-05 13:38:10.000000000 +0000 +++ tcl8.5-8.5.13/debian/control 2013-01-22 02:53:51.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Tcl/Tk Debian Packagers Uploaders: Sergei Golovan -Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~) +Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~) Standards-Version: 3.9.3 Homepage: http://www.tcl.tk/ @@ -12,15 +12,29 @@ Section: interpreters Priority: optional Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${misc:Depends}, tcl8.5-lib (= ${binary:Version}) Conflicts: tcl74 (<= 7.4p3-2) Provides: tclsh Suggests: tcl-tclreadline +Multi-Arch: foreign Description: Tcl (the Tool Command Language) v8.5 - run-time files Tcl is a powerful, easy to use, embeddable, cross-platform interpreted scripting language. This package contains everything you need to run Tcl scripts and Tcl-enabled apps. This version includes thread support. +Package: tcl8.5-lib +Section: interpreters +Priority: optional +Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} +Conflicts: tcl74 (<= 7.4p3-2) +Multi-Arch: same +Description: Tcl (the Tool Command Language) v8.5 - run-time library files + Tcl is a powerful, easy to use, embeddable, cross-platform interpreted + scripting language. This package contains the tcl library. This version + includes thread support. + Package: tcl8.5-doc Section: doc Priority: optional @@ -29,6 +43,7 @@ Suggests: tcl8.5 Conflicts: tcldoc, tcl8.3-doc, tcl8.4-doc Provides: tcldoc +Multi-Arch: foreign Description: Tcl (the Tool Command Language) v8.5 - manual pages Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted scripting language. This package contains the man pages for Tcl commands. @@ -37,8 +52,9 @@ Section: devel Priority: optional Architecture: any -Depends: tcl8.5 (= ${binary:Version}), ${misc:Depends} +Depends: tcl8.5-lib (= ${binary:Version}), tcl8.5 (= ${binary:Version}), ${misc:Depends} Suggests: tcl8.5-doc +Multi-Arch: same Description: Tcl (the Tool Command Language) v8.5 - development files Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted scripting language. This package contains the headers and libraries diff -urN origs/tcl8.5-8.5.13/debian/rules tcl8.5-8.5.13/debian/rules --- origs/tcl8.5-8.5.13/debian/rules 2012-11-24 08:00:28.000000000 +0000 +++ tcl8.5-8.5.13/debian/rules 2013-02-11 15:10:39.000000000 +0000 @@ -5,6 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1 include /usr/share/dpkg/buildflags.mk +include /usr/share/dpkg/architecture.mk LDFLAGS = $(shell dpkg-buildflags --get LDFLAGS) export LDFLAGS @@ -22,6 +23,12 @@ %: dh $@ +override_dh_auto_clean: + dh_testdir + -make -C unix distclean + dh_clean + + override_dh_auto_configure: # So so ugly but it works... touch generic/tclStubInit.c @@ -59,11 +66,11 @@ install -d -m 755 $(DIR)/usr/share/tcltk/tcl$(v)/tcl8 mv $(DIR)/usr/share/tcltk/tcl8/*/* $(DIR)/usr/share/tcltk/tcl$(v)/tcl8 # Fix up the libraries. - cp unix/libtcl$(v).a $(DIR)/usr/lib + cp unix/libtcl$(v).a $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH) #mv $(DIR)/usr/lib/libtcl$(v).so $(DIR)/usr/lib/libtcl$(v).so.0 #ln -sf libtcl$(v).so.0 $(DIR)/usr/lib/libtcl$(v).so - install -d -m 755 $(DIR)/usr/lib/tcl$(v) - mv $(DIR)/usr/lib/*.sh $(DIR)/usr/lib/tcl$(v) + install -d -m 755 $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(v) + mv $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.sh $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(v) install -d -m 755 $(DIR)/usr/share/aclocal cp unix/tcl.m4 $(DIR)/usr/share/aclocal/tcl$(v).m4 rm -f $(DIR)/usr/share/tcltk/tcl$(v)/ldAix @@ -109,7 +116,7 @@ dh_makeshlibs -V 'tcl$(v) (>= 8.5.0)' -XTcltest override_dh_shlibdeps: - dh_shlibdeps -ldebian/tcl$(v)/usr/lib + dh_shlibdeps -ldebian/tcl$(v)/usr/lib/$(DEB_HOST_MULTIARCH) get-orig-source: wget -O tcl8.5_8.5.13.orig.tar.gz \ diff -urN origs/tcl8.5-8.5.13/debian/tcl8.5-dev.dirs tcl8.5-8.5.13/debian/tcl8.5-dev.dirs --- origs/tcl8.5-8.5.13/debian/tcl8.5-dev.dirs 2007-10-19 13:06:07.000000000 +0100 +++ tcl8.5-8.5.13/debian/tcl8.5-dev.dirs 2013-01-22 02:17:02.000000000 +0000 @@ -1,3 +1,2 @@ -usr/lib/tcl8.5 usr/share/aclocal usr/share/tcltk/tcl8.5 diff -urN origs/tcl8.5-8.5.13/debian/tcl8.5-dev.install tcl8.5-8.5.13/debian/tcl8.5-dev.install --- origs/tcl8.5-8.5.13/debian/tcl8.5-dev.install 2012-05-28 14:32:31.000000000 +0100 +++ tcl8.5-8.5.13/debian/tcl8.5-dev.install 2013-01-21 23:33:45.000000000 +0000 @@ -1,5 +1,5 @@ usr/include -usr/lib/*.a -usr/lib/*.so -usr/lib/tcl* +usr/lib/*/*.a +usr/lib/*/*.so +usr/lib/*/tcl* usr/share/aclocal/*.m4 diff -urN origs/tcl8.5-8.5.13/debian/tcl8.5.install tcl8.5-8.5.13/debian/tcl8.5.install --- origs/tcl8.5-8.5.13/debian/tcl8.5.install 2012-05-28 14:32:31.000000000 +0100 +++ tcl8.5-8.5.13/debian/tcl8.5.install 2013-01-22 02:24:25.000000000 +0000 @@ -1,5 +1,4 @@ usr/bin usr/share/tcltk/tcl8 usr/share/tcltk/tcl8.5 -usr/lib/*.so.* usr/share/man/man1 diff -urN origs/tcl8.5-8.5.13/debian/tcl8.5-lib.install tcl8.5-8.5.13/debian/tcl8.5-lib.install --- origs/tcl8.5-8.5.13/debian/tcl8.5-lib.install 1970-01-01 01:00:00.000000000 +0100 +++ tcl8.5-8.5.13/debian/tcl8.5-lib.install 2013-01-22 00:00:01.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/*.so.* diff -urN origs/tcl8.5-8.5.13/debian/tcl8.5-lib.lintian-overrides tcl8.5-8.5.13/debian/tcl8.5-lib.lintian-overrides --- origs/tcl8.5-8.5.13/debian/tcl8.5-lib.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 +++ tcl8.5-8.5.13/debian/tcl8.5-lib.lintian-overrides 2012-05-28 14:32:31.000000000 +0100 @@ -0,0 +1 @@ +tcl8.5: package-name-doesnt-match-sonames diff -urN origs/tcl8.5-8.5.13/debian/tcl8.5.lintian-overrides tcl8.5-8.5.13/debian/tcl8.5.lintian-overrides --- origs/tcl8.5-8.5.13/debian/tcl8.5.lintian-overrides 2012-05-28 14:32:31.000000000 +0100 +++ tcl8.5-8.5.13/debian/tcl8.5.lintian-overrides 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -tcl8.5: package-name-doesnt-match-sonames