--- Begin Message ---
Package: tk8.5
Version: 8.5.11-2
Severity: wishlist
Tags: patch
User: [email protected]
Usertag: multiarch
#698674 (CCed) calls for adding multiarch support to tcl8.5. Doing this
without also multiarching tk8.5 causes some problems, because build
systems that attempt to detect Tcl/Tk aren't always very clever: for
instance, the Tk extension in ruby1.8 firstly needs to be updated to
look in /usr/lib/$(DEB_HOST_MULTIARCH) in the first place, but even then
falls over because it can't really cope with the idea that Tcl and Tk
might be installed in different directories. Changing Tcl and Tk
packaging in sync seems like the path of wisdom here.
(Not to mention that multiarching tcl8.5 without any changes to tk8.5 at
all causes the latter to fail to build ...)
I've attached patches for tk8.5 and tcltk-defaults (the latter of which
includes previous changes by Dmitrijs Ledkovs). I expect you will want
to adjust the Breaks: version in tk8.5-dev. You probably ought to also
add a similar Breaks: in tcl8.5-dev.
Thanks,
--
Colin Watson [[email protected]]
* Cope with multiarch tcl8.5.
* Convert to multiarch, splitting out libtk8.5.so.0 into a tk8.5-lib
package and using multiarch paths (LP: #1122120).
diff -Nru tk8.5-8.5.11/debian/compat tk8.5-8.5.11/debian/compat
--- tk8.5-8.5.11/debian/compat 2012-05-29 16:44:19.000000000 +0100
+++ tk8.5-8.5.11/debian/compat 2013-03-14 16:22:17.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru tk8.5-8.5.11/debian/control tk8.5-8.5.11/debian/control
--- tk8.5-8.5.11/debian/control 2012-12-08 07:59:09.000000000 +0000
+++ tk8.5-8.5.11/debian/control 2013-03-18 17:44:19.000000000 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Tcl/Tk Debian Packagers <[email protected]>
Uploaders: Sergei Golovan <[email protected]>
-Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.0)
+Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.13-1ubuntu2)
Standards-Version: 3.9.3
Homepage: http://www.tcl.tk/
@@ -11,16 +11,30 @@
Section: libs
Priority: optional
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, tcl8.5, tk8.5-lib
Recommends: xterm | x-terminal-emulator
Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5)
Provides: wish
+Multi-Arch: foreign
Description: Tk toolkit for Tcl and X11, v8.5 - run-time files
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
This package contains everything you need to run Tk (wish) scripts
and Tk-enabled apps.
+Package: tk8.5-lib
+Section: libs
+Priority: optional
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: tk40 (<= 4.0p3-2), libtk-img (<< 1.2.5)
+Multi-Arch: same
+Description: Tk toolkit for Tcl and X11, v8.5 - run-time library files
+ Tk is a cross-platform graphical toolkit which provides the Motif
+ look-and-feel and is implemented using the Tcl scripting language.
+ This package contains the tk library.
+
Package: tk8.5-doc
Section: doc
Priority: optional
@@ -40,6 +54,8 @@
Architecture: any
Depends: x11proto-core-dev, libx11-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.5-dev (>= 8.5.0), tk8.5 (= ${binary:Version}), ${misc:Depends}
Suggests: tk8.5-doc
+Breaks: tk-dev (<< 8.5.0-2ubuntu3)
+Multi-Arch: same
Description: Tk toolkit for Tcl and X11, v8.5 - development files
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
diff -Nru tk8.5-8.5.11/debian/rules tk8.5-8.5.11/debian/rules
--- tk8.5-8.5.11/debian/rules 2012-12-08 07:58:39.000000000 +0000
+++ tk8.5-8.5.11/debian/rules 2013-03-14 18:22:28.000000000 +0000
@@ -12,6 +12,7 @@
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/architecture.mk
ifeq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
# See bug #446335
@@ -21,12 +22,15 @@
%:
dh $@
+override_dh_auto_clean:
+ [ ! -e unix/Makefile ] || $(MAKE) -C unix distclean
+
override_dh_auto_configure:
TK_LIBRARY="/usr/share/tcltk/tk$(v)" $(CROSSCONF) \
CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
dh_auto_configure -Dunix -- \
--includedir=/usr/include/tcl$(v) \
- --with-tcl=/usr/lib/tcl$(v) \
+ --with-tcl=/usr/lib/$(DEB_HOST_MULTIARCH)/tcl$(v) \
--enable-shared \
--enable-threads \
--disable-rpath \
@@ -47,12 +51,15 @@
MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \
install
# Fix up pkgInstall.tcl
- cp $(DIR)/usr/lib/tk$(v)/* $(DIR)/usr/share/tcltk/tk$(v)
+ cp $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(v)/* \
+ $(DIR)/usr/share/tcltk/tk$(v)
# Fix up the libraries
- cp unix/libtk$(v).a $(DIR)/usr/lib
- mv $(DIR)/usr/lib/libtk$(v).so $(DIR)/usr/lib/libtk$(v).so.0
- ln -sf libtk$(v).so.0 $(DIR)/usr/lib/libtk$(v).so
- mv $(DIR)/usr/lib/*.sh $(DIR)/usr/lib/tk$(v)
+ cp unix/libtk$(v).a $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)
+ mv $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libtk$(v).so \
+ $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libtk$(v).so.0
+ ln -sf libtk$(v).so.0 $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/libtk$(v).so
+ mv $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/*.sh \
+ $(DIR)/usr/lib/$(DEB_HOST_MULTIARCH)/tk$(v)
# Fix up the include files
install -d -m 755 $(DIR)/usr/include/tcl$(v)/tk-private/generic/ttk
cp generic/*.h $(DIR)/usr/include/tcl$(v)/tk-private/generic
@@ -106,7 +113,7 @@
dh_makeshlibs -V 'tk$(v) (>= 8.5.0)'
override_dh_shlibdeps:
- dh_shlibdeps -ldebian/tk$(v)/usr/lib
+ dh_shlibdeps -ldebian/tk$(v)-lib/usr/lib/$(DEB_HOST_MULTIARCH)
get-orig-source:
wget -O tk8.5_8.5.11.orig.tar.gz \
diff -Nru tk8.5-8.5.11/debian/tk8.5-dev.dirs tk8.5-8.5.11/debian/tk8.5-dev.dirs
--- tk8.5-8.5.11/debian/tk8.5-dev.dirs 2007-10-19 13:06:59.000000000 +0100
+++ tk8.5-8.5.11/debian/tk8.5-dev.dirs 2013-03-14 16:36:23.000000000 +0000
@@ -1,2 +1 @@
-usr/lib/tk8.5
usr/share/tcltk/tk8.5
diff -Nru tk8.5-8.5.11/debian/tk8.5-dev.install tk8.5-8.5.11/debian/tk8.5-dev.install
--- tk8.5-8.5.11/debian/tk8.5-dev.install 2012-05-29 16:45:44.000000000 +0100
+++ tk8.5-8.5.11/debian/tk8.5-dev.install 2013-03-14 16:36:40.000000000 +0000
@@ -1,4 +1,4 @@
usr/include
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/tk*/*.sh
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/tk*/*.sh
diff -Nru tk8.5-8.5.11/debian/tk8.5-lib.install tk8.5-8.5.11/debian/tk8.5-lib.install
--- tk8.5-8.5.11/debian/tk8.5-lib.install 1970-01-01 01:00:00.000000000 +0100
+++ tk8.5-8.5.11/debian/tk8.5-lib.install 2013-03-14 17:35:35.000000000 +0000
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff -Nru tk8.5-8.5.11/debian/tk8.5-lib.lintian-overrides tk8.5-8.5.11/debian/tk8.5-lib.lintian-overrides
--- tk8.5-8.5.11/debian/tk8.5-lib.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ tk8.5-8.5.11/debian/tk8.5-lib.lintian-overrides 2013-03-14 16:37:22.000000000 +0000
@@ -0,0 +1 @@
+tk8.5-lib: package-name-doesnt-match-sonames
diff -Nru tk8.5-8.5.11/debian/tk8.5.install tk8.5-8.5.11/debian/tk8.5.install
--- tk8.5-8.5.11/debian/tk8.5.install 2012-05-29 16:46:17.000000000 +0100
+++ tk8.5-8.5.11/debian/tk8.5.install 2013-03-14 16:37:02.000000000 +0000
@@ -1,5 +1,4 @@
usr/bin
usr/share/tcltk/tk*
-usr/lib/*.so.*
usr/share/man/man1
usr/share/doc/tk*/examples
diff -Nru tk8.5-8.5.11/debian/tk8.5.lintian-overrides tk8.5-8.5.11/debian/tk8.5.lintian-overrides
--- tk8.5-8.5.11/debian/tk8.5.lintian-overrides 2012-05-29 16:44:00.000000000 +0100
+++ tk8.5-8.5.11/debian/tk8.5.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-tk8.5: package-name-doesnt-match-sonames
* Convert to multiarch.
diff -Nru tcltk-defaults-8.5.0/debian/compat tcltk-defaults-8.5.0/debian/compat
--- tcltk-defaults-8.5.0/debian/compat 2009-09-18 08:37:21.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/compat 2013-03-12 15:59:49.000000000 +0000
@@ -1 +1 @@
-5
+9
diff -Nru tcltk-defaults-8.5.0/debian/control tcltk-defaults-8.5.0/debian/control
--- tcltk-defaults-8.5.0/debian/control 2011-02-06 14:29:23.000000000 +0000
+++ tcltk-defaults-8.5.0/debian/control 2013-03-18 17:33:14.000000000 +0000
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Tcl/Tk Packagers <[email protected]>
Uploaders: Francesco Paolo Lovergine <[email protected]>, Sergei Golovan <[email protected]>
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 9), dh-exec
Build-Depends-Indep: subversion, debiandoc-sgml,
texlive-fonts-recommended | tetex-extra,
texlive-latex-extra | tetex-extra,
@@ -13,8 +13,9 @@
Package: tcl
Section: interpreters
Priority: optional
-Architecture: all
-Depends: tcl8.5 (>= 8.5.0-1), ${misc:Depends}
+Architecture: any
+Multi-Arch: foreign
+Depends: tcl8.5 (>= 8.5.0-1), tcl-lib (= ${binary:Version}), ${misc:Depends}
Conflicts: tcl8.3 (<< 8.3.5-8), tcl8.4 (<< 8.4.16-2), tcl8.5 (<< 0.b1-2)
Description: The Tool Command Language (default version) - run-time files
Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
@@ -23,6 +24,21 @@
This package is a dependency package, which depends on Debian's default
Tcl version (currently 8.5).
+Package: tcl-lib
+Section: interpreters
+Priority: optional
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: tcl8.5-lib (>= 8.5.0-1), ${misc:Depends}
+Multi-Arch: same
+Description: Tcl (the Tool Command Language) 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.
+ .
+ This package is a dependency package, which depends on Debian's default
+ Tcl version (currently 8.5).
+
Package: tcl-doc
Section: doc
Priority: optional
@@ -40,9 +56,10 @@
Package: tcl-dev
Section: devel
Priority: optional
-Architecture: all
+Architecture: any
Depends: tcl8.5-dev (>= 8.5.0-1), tcl (= ${binary:Version}), ${misc:Depends}
Suggests: tcl-doc
+Multi-Arch: same
Description: The Tool Command Language (default version) - development files
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
scripting language.
@@ -53,8 +70,9 @@
Package: tk
Section: libs
Priority: optional
-Architecture: all
-Depends: tk8.5 (>= 8.5.0-1), tcl (= ${binary:Version}), ${misc:Depends}
+Architecture: any
+Multi-Arch: foreign
+Depends: tk8.5 (>= 8.5.0-1), tk-lib (= ${binary:Version}), tcl (= ${binary:Version}), ${misc:Depends}
Conflicts: tk8.3 (<< 8.3.5-11), tk8.4 (<< 8.4.16-2), tk8.5 (<< 0.b1-2)
Description: The Tk toolkit for Tcl and X11 (default version) - run-time files
Tk is a cross-platform graphical toolkit which provides the Motif
@@ -63,6 +81,21 @@
This package is a dependency package, which depends on Debian's default
Tk version (currently 8.5).
+Package: tk-lib
+Section: libs
+Priority: optional
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: tk8.5-lib (>= 8.5.0-1), ${misc:Depends}
+Multi-Arch: same
+Description: The Tk toolkit for Tcl and X11 (default version) - run-time files
+ Tk is a cross-platform graphical toolkit which provides the Motif
+ look-and-feel and is implemented using the Tcl scripting language. This
+ package contains the tk library.
+ .
+ This package is a dependency package, which depends on Debian's default
+ Tk version (currently 8.5).
+
Package: tk-doc
Section: doc
Priority: optional
@@ -80,9 +113,10 @@
Package: tk-dev
Section: devel
Priority: optional
-Architecture: all
+Architecture: any
Depends: tk8.5-dev (>= 8.5.0-1), tk (= ${binary:Version}), tcl-dev (= ${binary:Version}), ${misc:Depends}
Suggests: tk-doc
+Multi-Arch: same
Description: The Tk toolkit for Tcl and X11 (default version) - development files
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
diff -Nru tcltk-defaults-8.5.0/debian/control.in tcltk-defaults-8.5.0/debian/control.in
--- tcltk-defaults-8.5.0/debian/control.in 2011-02-06 14:26:33.000000000 +0000
+++ tcltk-defaults-8.5.0/debian/control.in 2013-03-18 17:31:14.000000000 +0000
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Tcl/Tk Packagers <[email protected]>
Uploaders: Francesco Paolo Lovergine <[email protected]>, Sergei Golovan <[email protected]>
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 9), dh-exec
Build-Depends-Indep: subversion, debiandoc-sgml,
texlive-fonts-recommended | tetex-extra,
texlive-latex-extra | tetex-extra,
@@ -13,8 +13,9 @@
Package: tcl
Section: interpreters
Priority: optional
-Architecture: all
-Depends: tcl@VER@ (>= @TCLVER@), ${misc:Depends}
+Architecture: any
+Multi-Arch: foreign
+Depends: tcl@VER@ (>= @TCLVER@), tcl-lib (= ${binary:Version}), ${misc:Depends}
Conflicts: tcl8.3 (<< 8.3.5-8), tcl8.4 (<< 8.4.16-2), tcl8.5 (<< 0.b1-2)
Description: The Tool Command Language (default version) - run-time files
Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
@@ -23,6 +24,21 @@
This package is a dependency package, which depends on Debian's default
Tcl version (currently @VER@).
+Package: tcl-lib
+Section: interpreters
+Priority: optional
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: tcl@VER@-lib (>= @TCLVER@), ${misc:Depends}
+Multi-Arch: same
+Description: Tcl (the Tool Command Language) 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.
+ .
+ This package is a dependency package, which depends on Debian's default
+ Tcl version (currently @VER@).
+
Package: tcl-doc
Section: doc
Priority: optional
@@ -40,9 +56,10 @@
Package: tcl-dev
Section: devel
Priority: optional
-Architecture: all
+Architecture: any
Depends: tcl@VER@-dev (>= @TCLVER@), tcl (= ${binary:Version}), ${misc:Depends}
Suggests: tcl-doc
+Multi-Arch: same
Description: The Tool Command Language (default version) - development files
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
scripting language.
@@ -53,8 +70,9 @@
Package: tk
Section: libs
Priority: optional
-Architecture: all
-Depends: tk@VER@ (>= @TKVER@), tcl (= ${binary:Version}), ${misc:Depends}
+Architecture: any
+Multi-Arch: foreign
+Depends: tk@VER@ (>= @TKVER@), tk-lib (= ${binary:Version}), tcl (= ${binary:Version}), ${misc:Depends}
Conflicts: tk8.3 (<< 8.3.5-11), tk8.4 (<< 8.4.16-2), tk8.5 (<< 0.b1-2)
Description: The Tk toolkit for Tcl and X11 (default version) - run-time files
Tk is a cross-platform graphical toolkit which provides the Motif
@@ -63,6 +81,21 @@
This package is a dependency package, which depends on Debian's default
Tk version (currently @VER@).
+Package: tk-lib
+Section: libs
+Priority: optional
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: tk@VER@-lib (>= @TKVER@), ${misc:Depends}
+Multi-Arch: same
+Description: The Tk toolkit for Tcl and X11 (default version) - run-time files
+ Tk is a cross-platform graphical toolkit which provides the Motif
+ look-and-feel and is implemented using the Tcl scripting language. This
+ package contains the tk library.
+ .
+ This package is a dependency package, which depends on Debian's default
+ Tk version (currently @VER@).
+
Package: tk-doc
Section: doc
Priority: optional
@@ -80,9 +113,10 @@
Package: tk-dev
Section: devel
Priority: optional
-Architecture: all
+Architecture: any
Depends: tk@VER@-dev (>= @TKVER@), tk (= ${binary:Version}), tcl-dev (= ${binary:Version}), ${misc:Depends}
Suggests: tk-doc
+Multi-Arch: same
Description: The Tk toolkit for Tcl and X11 (default version) - development files
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
diff -Nru tcltk-defaults-8.5.0/debian/rules tcltk-defaults-8.5.0/debian/rules
--- tcltk-defaults-8.5.0/debian/rules 2009-09-18 08:46:16.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/rules 2013-03-12 15:59:49.000000000 +0000
@@ -5,10 +5,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-VER := 8.5
-TCLVER := 8.5.0-1
-TKVER := 8.5.0-1
-COMPATVER := 8.5.0-1
+export VER=8.5
+export TCLVER=8.5.0-1
+export TKVER=8.5.0-1
+export COMPATVER=8.5.0-1
DOCS = tcltk-policy.html tcltk-policy.txt tcltk-policy.pdf
@@ -40,61 +40,36 @@
-e "s/@TKVER@/$(TKVER)/g" \
<debian/control.in >debian/control
-clean: debian/control
+%:
+ dh $@
+
+override_dh_clean: debian/control
dh_testdir
dh_testroot
rm -f *-stamp
rm -f debian/tcltk-depends
- rm -f debian/*.links
rm -f debian/*.postinst
rm -f debian/*.prerm
rm -f $(DOCS)
dh_clean
-build: build-stamp
-build-stamp: debian/control build-policy
- touch build-stamp
+build: debian/control build-policy
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
+override_dh_installdirs:
dh_installdirs
-
- for f in debian/*.links.in debian/*.p*.in debian/tcltk-depends.in; do \
+ for f in debian/*.p*.in debian/tcltk-depends.in; do \
sed -e "s/@VER@/$(VER)/g" \
-e "s/@COMPATVER@/$(COMPATVER)/g" \
<$$f >$${f%%.in} ; \
done
- touch install-stamp
+override_dh_installdocs:
+ dh_installdocs -A debian/README.Debian -Ntk-doc
-# Build architecture-independent files here.
-binary-indep: install-stamp
- dh_testdir -i
- dh_testroot -i
- dh_install -i
- install -m 644 debian/tcl.lintian-override \
- debian/tcl/usr/share/lintian/overrides/tcl
- install -m 644 debian/tk.lintian-override \
- debian/tk/usr/share/lintian/overrides/tk
- dh_installdocs -i -A debian/README.Debian -Ntk-doc
- dh_installchangelogs -i -Ntk-doc
- dh_installman -i
- dh_installmenu -i
- dh_link -i
- dh_compress -i -X.pdf
- dh_fixperms -i
- dh_installdeb -i
- dh_gencontrol -i
- dh_md5sums -i
- dh_builddeb -i
-
-# Build architecture-dependent files here.
-binary-arch:
-# nothing to do
+override_dh_installchangelogs:
+ dh_installchangelogs -Ntk-doc
-binary: binary-indep binary-arch
+override_dh_compress:
+ dh_compress -X.pdf
-.PHONY: configure build clean binary-indep binary-arch binary install get-policy build-policy
+.PHONY: build get-policy build-policy
diff -Nru tcltk-defaults-8.5.0/debian/tcl-dev.links tcltk-defaults-8.5.0/debian/tcl-dev.links
--- tcltk-defaults-8.5.0/debian/tcl-dev.links 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tcl-dev.links 2013-03-12 15:59:49.000000000 +0000
@@ -0,0 +1,6 @@
+#! /usr/bin/dh-exec --with=subst
+/usr/include/tcl${VER} /usr/include/tcl
+/usr/lib/${DEB_HOST_MULTIARCH}/libtcl${VER}.a /usr/lib/${DEB_HOST_MULTIARCH}/libtcl.a
+/usr/lib/${DEB_HOST_MULTIARCH}/libtclstub${VER}.a /usr/lib/${DEB_HOST_MULTIARCH}/libtclstub.a
+/usr/lib/${DEB_HOST_MULTIARCH}/tcl${VER}/tclConfig.sh /usr/lib/${DEB_HOST_MULTIARCH}/tclConfig.sh
+/usr/share/aclocal/tcl${VER}.m4 /usr/share/aclocal/tcl.m4
diff -Nru tcltk-defaults-8.5.0/debian/tcl-dev.links.in tcltk-defaults-8.5.0/debian/tcl-dev.links.in
--- tcltk-defaults-8.5.0/debian/tcl-dev.links.in 2011-02-06 14:06:24.000000000 +0000
+++ tcltk-defaults-8.5.0/debian/tcl-dev.links.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-/usr/include/tcl@VER@ /usr/include/tcl
-/usr/lib/libtcl@[email protected] /usr/lib/libtcl.a
-/usr/lib/libtcl@[email protected] /usr/lib/libtcl.so
-/usr/lib/libtclstub@[email protected] /usr/lib/libtclstub.a
-/usr/lib/tcl@VER@/tclConfig.sh /usr/lib/tclConfig.sh
-/usr/share/aclocal/tcl@[email protected] /usr/share/aclocal/tcl.m4
diff -Nru tcltk-defaults-8.5.0/debian/tcl-lib.links tcltk-defaults-8.5.0/debian/tcl-lib.links
--- tcltk-defaults-8.5.0/debian/tcl-lib.links 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tcl-lib.links 2013-03-12 15:59:49.000000000 +0000
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec --with=subst
+/usr/lib/${DEB_HOST_MULTIARCH}/libtcl${VER}.so /usr/lib/${DEB_HOST_MULTIARCH}/libtcl.so
+
diff -Nru tcltk-defaults-8.5.0/debian/tcl.links tcltk-defaults-8.5.0/debian/tcl.links
--- tcltk-defaults-8.5.0/debian/tcl.links 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tcl.links 2013-03-12 15:59:49.000000000 +0000
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec --with=subst
+/usr/bin/tclsh${VER} /usr/bin/tclsh-default
+/usr/share/man/man1/tclsh${VER}.1.gz /usr/share/man/man1/tclsh-default.1.gz
diff -Nru tcltk-defaults-8.5.0/debian/tcl.links.in tcltk-defaults-8.5.0/debian/tcl.links.in
--- tcltk-defaults-8.5.0/debian/tcl.links.in 2009-09-18 08:37:21.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tcl.links.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-/usr/bin/tclsh@VER@ /usr/bin/tclsh-default
-/usr/share/man/man1/tclsh@[email protected] /usr/share/man/man1/tclsh-default.1.gz
diff -Nru tcltk-defaults-8.5.0/debian/tcl.lintian-override tcltk-defaults-8.5.0/debian/tcl.lintian-override
--- tcltk-defaults-8.5.0/debian/tcl.lintian-override 2009-09-18 08:37:21.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tcl.lintian-override 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-tcl: package-depends-on-multiple-tcl-versions
diff -Nru tcltk-defaults-8.5.0/debian/tcl.lintian-overrides tcltk-defaults-8.5.0/debian/tcl.lintian-overrides
--- tcltk-defaults-8.5.0/debian/tcl.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tcl.lintian-overrides 2013-03-12 15:59:49.000000000 +0000
@@ -0,0 +1 @@
+tcl: package-depends-on-multiple-tcl-versions
diff -Nru tcltk-defaults-8.5.0/debian/tk-dev.links tcltk-defaults-8.5.0/debian/tk-dev.links
--- tcltk-defaults-8.5.0/debian/tk-dev.links 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tk-dev.links 2013-03-18 17:25:22.000000000 +0000
@@ -0,0 +1,6 @@
+#! /usr/bin/dh-exec --with=subst
+/usr/include/tcl${VER} /usr/include/tk
+/usr/lib/${DEB_HOST_MULTIARCH}/libtk${VER}.a /usr/lib/${DEB_HOST_MULTIARCH}/libtk.a
+/usr/lib/${DEB_HOST_MULTIARCH}/libtk${VER}.so /usr/lib/${DEB_HOST_MULTIARCH}/libtk.so
+/usr/lib/${DEB_HOST_MULTIARCH}/libtkstub${VER}.a /usr/lib/${DEB_HOST_MULTIARCH}/libtkstub.a
+/usr/lib/${DEB_HOST_MULTIARCH}/tk${VER}/tkConfig.sh /usr/lib/${DEB_HOST_MULTIARCH}/tkConfig.sh
diff -Nru tcltk-defaults-8.5.0/debian/tk-dev.links.in tcltk-defaults-8.5.0/debian/tk-dev.links.in
--- tcltk-defaults-8.5.0/debian/tk-dev.links.in 2011-02-06 14:07:08.000000000 +0000
+++ tcltk-defaults-8.5.0/debian/tk-dev.links.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-/usr/include/tcl@VER@ /usr/include/tk
-/usr/lib/libtk@[email protected] /usr/lib/libtk.a
-/usr/lib/libtk@[email protected] /usr/lib/libtk.so
-/usr/lib/libtkstub@[email protected] /usr/lib/libtkstub.a
-/usr/lib/tk@VER@/tkConfig.sh /usr/lib/tkConfig.sh
diff -Nru tcltk-defaults-8.5.0/debian/tk-doc.links tcltk-defaults-8.5.0/debian/tk-doc.links
--- tcltk-defaults-8.5.0/debian/tk-doc.links 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tk-doc.links 2013-03-12 15:59:49.000000000 +0000
@@ -0,0 +1 @@
+/usr/share/doc/tcl-doc /usr/share/doc/tk-doc
diff -Nru tcltk-defaults-8.5.0/debian/tk-doc.links.in tcltk-defaults-8.5.0/debian/tk-doc.links.in
--- tcltk-defaults-8.5.0/debian/tk-doc.links.in 2009-09-18 08:37:21.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tk-doc.links.in 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/usr/share/doc/tcl-doc /usr/share/doc/tk-doc
diff -Nru tcltk-defaults-8.5.0/debian/tk.links tcltk-defaults-8.5.0/debian/tk.links
--- tcltk-defaults-8.5.0/debian/tk.links 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tk.links 2013-03-12 15:59:49.000000000 +0000
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec --with=subst
+/usr/bin/wish${VER} /usr/bin/wish-default
+/usr/share/man/man1/wish${VER}.1.gz /usr/share/man/man1/wish-default.1.gz
diff -Nru tcltk-defaults-8.5.0/debian/tk.links.in tcltk-defaults-8.5.0/debian/tk.links.in
--- tcltk-defaults-8.5.0/debian/tk.links.in 2009-09-18 08:37:21.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tk.links.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-/usr/bin/wish@VER@ /usr/bin/wish-default
-/usr/share/man/man1/wish@[email protected] /usr/share/man/man1/wish-default.1.gz
diff -Nru tcltk-defaults-8.5.0/debian/tk.lintian-override tcltk-defaults-8.5.0/debian/tk.lintian-override
--- tcltk-defaults-8.5.0/debian/tk.lintian-override 2009-09-18 08:37:21.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tk.lintian-override 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-tk: package-depends-on-multiple-tk-versions
diff -Nru tcltk-defaults-8.5.0/debian/tk.lintian-overrides tcltk-defaults-8.5.0/debian/tk.lintian-overrides
--- tcltk-defaults-8.5.0/debian/tk.lintian-overrides 1970-01-01 01:00:00.000000000 +0100
+++ tcltk-defaults-8.5.0/debian/tk.lintian-overrides 2013-03-12 15:59:49.000000000 +0000
@@ -0,0 +1 @@
+tk: package-depends-on-multiple-tk-versions
--- End Message ---
