[Pkg-tcltk-commits] r1412 - in tcltk-defaults/branches/experimental/debian: . source
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Jul 13 05:12:02 UTC 2013
Author: sgolovan
Date: 2013-07-13 05:12:01 +0000 (Sat, 13 Jul 2013)
New Revision: 1412
Added:
tcltk-defaults/branches/experimental/debian/source/
tcltk-defaults/branches/experimental/debian/source/format
tcltk-defaults/branches/experimental/debian/tcl.lintian-overrides
tcltk-defaults/branches/experimental/debian/tcl.preinst
tcltk-defaults/branches/experimental/debian/tk.lintian-overrides
tcltk-defaults/branches/experimental/debian/tk.preinst
Removed:
tcltk-defaults/branches/experimental/debian/tcl.lintian-override
tcltk-defaults/branches/experimental/debian/tcl.postinst.in
tcltk-defaults/branches/experimental/debian/tcl.prerm.in
tcltk-defaults/branches/experimental/debian/tk.lintian-override
tcltk-defaults/branches/experimental/debian/tk.postinst.in
tcltk-defaults/branches/experimental/debian/tk.prerm.in
Modified:
tcltk-defaults/branches/experimental/debian/README.Debian
tcltk-defaults/branches/experimental/debian/changelog
tcltk-defaults/branches/experimental/debian/compat
tcltk-defaults/branches/experimental/debian/control
tcltk-defaults/branches/experimental/debian/control.in
tcltk-defaults/branches/experimental/debian/rules
tcltk-defaults/branches/experimental/debian/tcl-dev.links.in
tcltk-defaults/branches/experimental/debian/tcl-doc.docs
tcltk-defaults/branches/experimental/debian/tcl.links.in
tcltk-defaults/branches/experimental/debian/tk-dev.links.in
tcltk-defaults/branches/experimental/debian/tk.links.in
Log:
[tcltk-defaults]
* Converted to 3.0 (native) source package format.
* Don't use the alternatives mechanism for selecting the default Tcl/Tk
version. Use plain symlinks instead. This includes removing all tclsh
and wish alternatives in the preinst scripts.
* Updated conflicts with tcl/tk 8.3, 8.4, 8.5 and 8.6 packages to the
latest versions which stil use alternatives.
* Provide tclsh and wish virtual packages (by tcl and tk respectively)
for backward compatibility with the older Tcl/Tk policy recommendations.
* Rewritten debian/rules to make it work more like a Makefile than like a
series of shell scripts.
* Bumped standards version to 3.9.4.
* Increased debhelper compatibility version to 9.
* Added multi-arch support.
* Bumped compatible Tcl/Tk version to 8.6.0-2.
Modified: tcltk-defaults/branches/experimental/debian/README.Debian
===================================================================
--- tcltk-defaults/branches/experimental/debian/README.Debian 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/README.Debian 2013-07-13 05:12:01 UTC (rev 1412)
@@ -5,17 +5,17 @@
It defines default versions of Debian Tcl and Tk packages and
provides Debian Tcl/Tk policy documents in various formats.
To do that it installs a series of depending packages and
-sets suitable alternatives and symlinks.
+sets suitable symlinks.
-Currently it is not mandatory - though recommended - installing
-this set of packages but in a next future they could
-become all required, as the Tcl/Tk policy will be applied
-by all Tcl/Tk packages.
+Currently installing this set of packages is the only way to
+obtain /usr/bin/tclsh and /usr/bin/wish Tcl/Tk interpreters.
+Otherwise you'll get only versioned ones (e.g. /usr/bin/tclsh8.6
+and /usr/bin/wish8.6).
Current version of Tcl/Tk policy is included into tcl-doc binary
package and can be found in /usr/share/doc/tcl-doc directory.
-Thu, 18 Oct 2007 19:32:54 +0400
+Wed, 10 Jul 2013 13:13:14 +0400
Francesco Paolo Lovergine <frankie at debian.org>
Sergei Golovan <sgolovan at debian.org>
Modified: tcltk-defaults/branches/experimental/debian/changelog
===================================================================
--- tcltk-defaults/branches/experimental/debian/changelog 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/changelog 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,8 +1,21 @@
-tcltk-defaults (8.6.0-2) UNRELEASED; urgency=low
+tcltk-defaults (8.6.0-2) experimental; urgency=low
- * NOT RELEASED YET
+ * Converted to 3.0 (native) source package format.
+ * Don't use the alternatives mechanism for selecting the default Tcl/Tk
+ version. Use plain symlinks instead. This includes removing all tclsh
+ and wish alternatives in the preinst scripts.
+ * Updated conflicts with tcl/tk 8.3, 8.4, 8.5 and 8.6 packages to the
+ latest versions which stil use alternatives.
+ * Provide tclsh and wish virtual packages (by tcl and tk respectively)
+ for backward compatibility with the older Tcl/Tk policy recommendations.
+ * Rewritten debian/rules to make it work more like a Makefile than like a
+ series of shell scripts.
+ * Bumped standards version to 3.9.4.
+ * Increased debhelper compatibility version to 9.
+ * Added multi-arch support.
+ * Bumped compatible Tcl/Tk version to 8.6.0-2.
- -- Sergei Golovan <sgolovan at debian.org> Sun, 04 Sep 2011 12:44:26 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 13 Jul 2013 09:11:07 +0400
tcltk-defaults (8.6.0-1) experimental; urgency=low
Modified: tcltk-defaults/branches/experimental/debian/compat
===================================================================
--- tcltk-defaults/branches/experimental/debian/compat 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/compat 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1 +1 @@
-5
+9
Modified: tcltk-defaults/branches/experimental/debian/control
===================================================================
--- tcltk-defaults/branches/experimental/debian/control 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/control 2013-07-13 05:12:01 UTC (rev 1412)
@@ -3,20 +3,22 @@
Priority: optional
Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~)
Build-Depends-Indep: subversion, debiandoc-sgml,
texlive-fonts-recommended | tetex-extra,
texlive-latex-extra | tetex-extra,
texlive-latex-recommended | tetex-extra
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Package: tcl
Section: interpreters
Priority: optional
-Architecture: all
-Depends: tcl8.6 (>= 8.6.0~b2-1), ${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
+Architecture: any
+Depends: tcl8.6 (>= 8.6.0-2), ${misc:Depends}
+Breaks: tcl8.3 (<< 8.3.5-15), tcl8.4 (<< 8.4.20-2), tcl8.5 (<< 8.5.14-3), tcl8.6 (<< 8.6.0-2)
+Provides: tclsh
+Multi-Arch: foreign
+Description: Tool Command Language (default version) - shell
Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
scripting language.
.
@@ -28,9 +30,9 @@
Priority: optional
Architecture: all
Depends: ${misc:Depends}
-Recommends: tcl8.6-doc (>= 8.6.0~b2-1)
+Recommends: tcl8.6-doc (>= 8.6.0-2)
Suggests: tcl
-Description: The Tool Command Language (default version) - manual pages
+Description: Tool Command Language (default version) - manual pages
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
scripting language. This package contains the man pages for Tcl commands.
.
@@ -40,10 +42,11 @@
Package: tcl-dev
Section: devel
Priority: optional
-Architecture: all
-Depends: tcl8.6-dev (>= 8.6.0~b2-1), tcl (= ${binary:Version}), ${misc:Depends}
+Architecture: any
+Depends: tcl8.6-dev (>= 8.6.0-2), tcl (= ${binary:Version}), ${misc:Depends}
Suggests: tcl-doc
-Description: The Tool Command Language (default version) - development files
+Multi-Arch: same
+Description: Tool Command Language (default version) - development files
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
scripting language.
.
@@ -53,10 +56,12 @@
Package: tk
Section: libs
Priority: optional
-Architecture: all
-Depends: tk8.6 (>= 8.6.0~b2-1), 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
+Architecture: any
+Depends: tk8.6 (>= 8.6.0-2), tcl (= ${binary:Version}), ${misc:Depends}
+Breaks: tk8.3 (<< 8.3.5-16), tk8.4 (<< 8.4.20-2), tk8.5 (<< 8.5.14-3), tk8.6 (<< 8.6.0-2)
+Provides: wish
+Multi-Arch: foreign
+Description: Toolkit for Tcl and X11 (default version) - windowing shell
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
.
@@ -68,9 +73,9 @@
Priority: optional
Architecture: all
Depends: tcl-doc (= ${binary:Version}), ${misc:Depends}
-Recommends: tk8.6-doc (>= 8.6.0~b2-1)
+Recommends: tk8.6-doc (>= 8.6.0-2)
Suggests: tk
-Description: The Tk toolkit for Tcl and X11 (default version) - manual pages
+Description: Toolkit for Tcl and X11 (default version) - manual pages
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
.
@@ -80,10 +85,11 @@
Package: tk-dev
Section: devel
Priority: optional
-Architecture: all
-Depends: tk8.6-dev (>= 8.6.0~b2-1), tk (= ${binary:Version}), tcl-dev (= ${binary:Version}), ${misc:Depends}
+Architecture: any
+Depends: tk8.6-dev (>= 8.6.0-2), tk (= ${binary:Version}), tcl-dev (= ${binary:Version}), ${misc:Depends}
Suggests: tk-doc
-Description: The Tk toolkit for Tcl and X11 (default version) - development files
+Multi-Arch: same
+Description: 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.
.
Modified: tcltk-defaults/branches/experimental/debian/control.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/control.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/control.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -3,20 +3,22 @@
Priority: optional
Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <frankie at debian.org>, Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 5.0.0)
+Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~)
Build-Depends-Indep: subversion, debiandoc-sgml,
texlive-fonts-recommended | tetex-extra,
texlive-latex-extra | tetex-extra,
texlive-latex-recommended | tetex-extra
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
Package: tcl
Section: interpreters
Priority: optional
-Architecture: all
+Architecture: any
Depends: tcl at VER@ (>= @TCLVER@), ${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
+Breaks: tcl8.3 (<< 8.3.5-15), tcl8.4 (<< 8.4.20-2), tcl8.5 (<< 8.5.14-3), tcl8.6 (<< 8.6.0-2)
+Provides: tclsh
+Multi-Arch: foreign
+Description: Tool Command Language (default version) - shell
Tcl is a powerful, easy to use, embeddable, cross-platform interpreted
scripting language.
.
@@ -30,7 +32,7 @@
Depends: ${misc:Depends}
Recommends: tcl at VER@-doc (>= @TCLVER@)
Suggests: tcl
-Description: The Tool Command Language (default version) - manual pages
+Description: Tool Command Language (default version) - manual pages
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
scripting language. This package contains the man pages for Tcl commands.
.
@@ -40,10 +42,11 @@
Package: tcl-dev
Section: devel
Priority: optional
-Architecture: all
+Architecture: any
Depends: tcl at VER@-dev (>= @TCLVER@), tcl (= ${binary:Version}), ${misc:Depends}
Suggests: tcl-doc
-Description: The Tool Command Language (default version) - development files
+Multi-Arch: same
+Description: Tool Command Language (default version) - development files
Tcl is a powerful, easy-to-use, embeddable, cross-platform interpreted
scripting language.
.
@@ -53,10 +56,12 @@
Package: tk
Section: libs
Priority: optional
-Architecture: all
+Architecture: any
Depends: tk at VER@ (>= @TKVER@), 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
+Breaks: tk8.3 (<< 8.3.5-16), tk8.4 (<< 8.4.20-2), tk8.5 (<< 8.5.14-3), tk8.6 (<< 8.6.0-2)
+Provides: wish
+Multi-Arch: foreign
+Description: Toolkit for Tcl and X11 (default version) - windowing shell
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
.
@@ -70,7 +75,7 @@
Depends: tcl-doc (= ${binary:Version}), ${misc:Depends}
Recommends: tk at VER@-doc (>= @TKVER@)
Suggests: tk
-Description: The Tk toolkit for Tcl and X11 (default version) - manual pages
+Description: Toolkit for Tcl and X11 (default version) - manual pages
Tk is a cross-platform graphical toolkit which provides the Motif
look-and-feel and is implemented using the Tcl scripting language.
.
@@ -80,10 +85,11 @@
Package: tk-dev
Section: devel
Priority: optional
-Architecture: all
+Architecture: any
Depends: tk at VER@-dev (>= @TKVER@), tk (= ${binary:Version}), tcl-dev (= ${binary:Version}), ${misc:Depends}
Suggests: tk-doc
-Description: The Tk toolkit for Tcl and X11 (default version) - development files
+Multi-Arch: same
+Description: 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.
.
Modified: tcltk-defaults/branches/experimental/debian/rules
===================================================================
--- tcltk-defaults/branches/experimental/debian/rules 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/rules 2013-07-13 05:12:01 UTC (rev 1412)
@@ -6,12 +6,16 @@
#export DH_VERBOSE=1
VER := 8.6
-TCLVER := 8.6.0~b2-1
-TKVER := 8.6.0~b2-1
-COMPATVER := 8.6.0~b2-1
+TCLVER := 8.6.0-2
+TKVER := 8.6.0-2
+COMPATVER := 8.6.0-2
-DOCS = tcltk-policy.html tcltk-policy.txt tcltk-policy.pdf
+include /usr/share/dpkg/architecture.mk
+DOCS = tcltk-policy.html/tcltk-policy.html tcltk-policy.txt tcltk-policy.pdf
+BINS = debian/tcltk-depends debian/tcl.links debian/tcl-dev.links \
+ debian/tk.links debian/tk-dev.links debian/tk-doc.links
+
#
# A new policy should be get manually and only after agreement
#
@@ -19,82 +23,57 @@
get-policy:
svn export svn://svn.debian.org/svn/pkg-tcltk/policy/tags/$(POLICY)/tcltk-policy.sgml
-tcltk-policy.html: tcltk-policy.sgml
- LANG=C debiandoc2html -1 -x tcltk-policy.sgml
- mv tcltk-policy.html/index.html index.html
- rm -rf tcltk-policy.html
- mv index.html tcltk-policy.html
+build-policy: $(DOCS)
+tcltk-policy.html/tcltk-policy.html: tcltk-policy.sgml
+ LANG=C debiandoc2html -1 -x -t tcltk-policy tcltk-policy.sgml
+
tcltk-policy.txt: tcltk-policy.sgml
LANG=C debiandoc2text tcltk-policy.sgml
tcltk-policy.pdf: tcltk-policy.sgml
LANG=C debiandoc2pdf tcltk-policy.sgml
- rm -f tcltk-policy.tpt
-build-policy: $(DOCS)
-
-debian/control: debian/control.in debian/rules
+define dosubst
sed -e "s/@VER@/$(VER)/g" \
-e "s/@TCLVER@/$(TCLVER)/g" \
-e "s/@TKVER@/$(TKVER)/g" \
- <debian/control.in >debian/control
+ -e "s/@COMPATVER@/$(COMPATVER)/g" \
+ -e "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g" \
+ <$< >$@
+endef
-clean: debian/control
+debian/tcltk-depends: debian/tcltk-depends.in debian/rules
+ $(dosubst)
+
+debian/%.links: debian/%.links.in debian/rules
+ $(dosubst)
+
+debian/control: debian/control.in debian/rules
+ $(dosubst)
+
+%:
+ 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 $(BINS)
rm -f $(DOCS)
+ rm -rf tcltk-policy.html
+ rm -f tcltk-policy.tpt
dh_clean
-build: build-stamp
-build-stamp: debian/control build-policy
- touch build-stamp
+override_dh_auto_build: $(DOCS) $(BINS) debian/control
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
+override_dh_installdocs:
+ dh_installdocs -A debian/README.Debian -Ntk-doc
- for f in debian/*.links.in debian/*.p*.in debian/tcltk-depends.in; do \
- sed -e "s/@VER@/$(VER)/g" \
- -e "s/@COMPATVER@/$(COMPATVER)/g" \
- <$$f >$${f%%.in} ; \
- done
+override_dh_installchangelogs:
+ dh_installchangelogs -Ntk-doc
- touch install-stamp
+override_dh_compress:
+ dh_compress -X.pdf
-# 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
-
-binary: binary-indep binary-arch
-
-.PHONY: configure build clean binary-indep binary-arch binary install get-policy build-policy
+.PHONY: get-policy build-policy override_dh_clean override_dh_auto_build \
+ override_dh_installdocs override_dh_installchangelogs override_dh_compress
Added: tcltk-defaults/branches/experimental/debian/source/format
===================================================================
--- tcltk-defaults/branches/experimental/debian/source/format (rev 0)
+++ tcltk-defaults/branches/experimental/debian/source/format 2013-07-13 05:12:01 UTC (rev 1412)
@@ -0,0 +1 @@
+3.0 (native)
Modified: tcltk-defaults/branches/experimental/debian/tcl-dev.links.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl-dev.links.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tcl-dev.links.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,6 +1,9 @@
-/usr/include/tcl at VER@ /usr/include/tcl
-/usr/lib/libtcl at VER@.a /usr/lib/libtcl.a
-/usr/lib/libtcl at VER@.so /usr/lib/libtcl.so
-/usr/lib/libtclstub at VER@.a /usr/lib/libtclstub.a
-/usr/lib/tcl at VER@/tclConfig.sh /usr/lib/tclConfig.sh
-/usr/share/aclocal/tcl at VER@.m4 /usr/share/aclocal/tcl.m4
+/usr/include/tcl at VER@ /usr/include/tcl
+/usr/lib/@DEB_HOST_MULTIARCH@/libtcl at VER@.a /usr/lib/@DEB_HOST_MULTIARCH@/libtcl.a
+/usr/lib/@DEB_HOST_MULTIARCH@/libtcl at VER@.so /usr/lib/@DEB_HOST_MULTIARCH@/libtcl.so
+/usr/lib/@DEB_HOST_MULTIARCH@/libtclstub at VER@.a /usr/lib/@DEB_HOST_MULTIARCH@/libtclstub.a
+/usr/lib/@DEB_HOST_MULTIARCH@/tcl at VER@/tclConfig.sh /usr/lib/@DEB_HOST_MULTIARCH@/tclConfig.sh
+/usr/lib/@DEB_HOST_MULTIARCH@/tcl at VER@/tclooConfig.sh /usr/lib/@DEB_HOST_MULTIARCH@/tclooConfig.sh
+/usr/lib/tcl at VER@/tclConfig.sh /usr/lib/tclConfig.sh
+/usr/lib/tcl at VER@/tclooConfig.sh /usr/lib/tclooConfig.sh
+/usr/share/aclocal/tcl at VER@.m4 /usr/share/aclocal/tcl.m4
Modified: tcltk-defaults/branches/experimental/debian/tcl-doc.docs
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl-doc.docs 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tcl-doc.docs 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,3 +1,3 @@
-tcltk-policy.html
+tcltk-policy.html/tcltk-policy.html
tcltk-policy.txt
tcltk-policy.pdf
Modified: tcltk-defaults/branches/experimental/debian/tcl.links.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl.links.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tcl.links.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,2 +1,2 @@
-/usr/bin/tclsh at VER@ /usr/bin/tclsh-default
-/usr/share/man/man1/tclsh at VER@.1.gz /usr/share/man/man1/tclsh-default.1.gz
+/usr/bin/tclsh at VER@ /usr/bin/tclsh
+/usr/share/man/man1/tclsh at VER@.1.gz /usr/share/man/man1/tclsh.1.gz
Deleted: tcltk-defaults/branches/experimental/debian/tcl.lintian-override
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl.lintian-override 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tcl.lintian-override 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1 +0,0 @@
-tcl: package-depends-on-multiple-tcl-versions
Copied: tcltk-defaults/branches/experimental/debian/tcl.lintian-overrides (from rev 1379, tcltk-defaults/branches/experimental/debian/tcl.lintian-override)
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl.lintian-overrides (rev 0)
+++ tcltk-defaults/branches/experimental/debian/tcl.lintian-overrides 2013-07-13 05:12:01 UTC (rev 1412)
@@ -0,0 +1 @@
+tcl: package-depends-on-multiple-tcl-versions
Deleted: tcltk-defaults/branches/experimental/debian/tcl.postinst.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl.postinst.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tcl.postinst.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/tclsh tclsh /usr/bin/tclsh-default 10000 \
- --slave /usr/share/man/man1/tclsh.1.gz tclsh.1 \
- /usr/share/man/man1/tclsh-default.1.gz
-fi
-
-#DEBHELPER#
Copied: tcltk-defaults/branches/experimental/debian/tcl.preinst (from rev 1379, tcltk-defaults/branches/experimental/debian/tcl.prerm.in)
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl.preinst (rev 0)
+++ tcltk-defaults/branches/experimental/debian/tcl.preinst 2013-07-13 05:12:01 UTC (rev 1412)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ install|upgrade)
+ # Currently the alternatives mechanism is not used
+ if dpkg --compare-versions "$2" lt-nl "8.6.0-2"; then
+ update-alternatives --remove-all tclsh || true
+ fi
+ ;;
+ abort-upgrade)
+ ;;
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
Deleted: tcltk-defaults/branches/experimental/debian/tcl.prerm.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcl.prerm.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tcl.prerm.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --remove tclsh /usr/bin/tclsh-default
-
-#DEBHELPER#
Modified: tcltk-defaults/branches/experimental/debian/tk-dev.links.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tk-dev.links.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tk-dev.links.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,5 +1,6 @@
-/usr/include/tcl at VER@ /usr/include/tk
-/usr/lib/libtk at VER@.a /usr/lib/libtk.a
-/usr/lib/libtk at VER@.so /usr/lib/libtk.so
-/usr/lib/libtkstub at VER@.a /usr/lib/libtkstub.a
-/usr/lib/tk at VER@/tkConfig.sh /usr/lib/tkConfig.sh
+/usr/include/tcl at VER@ /usr/include/tk
+/usr/lib/@DEB_HOST_MULTIARCH@/libtk at VER@.a /usr/lib/@DEB_HOST_MULTIARCH@/libtk.a
+/usr/lib/@DEB_HOST_MULTIARCH@/libtk at VER@.so /usr/lib/@DEB_HOST_MULTIARCH@/libtk.so
+/usr/lib/@DEB_HOST_MULTIARCH@/libtkstub at VER@.a /usr/lib/@DEB_HOST_MULTIARCH@/libtkstub.a
+/usr/lib/@DEB_HOST_MULTIARCH@/tk at VER@/tkConfig.sh /usr/lib/@DEB_HOST_MULTIARCH@/tkConfig.sh
+/usr/lib/tk at VER@/tkConfig.sh /usr/lib/tkConfig.sh
Modified: tcltk-defaults/branches/experimental/debian/tk.links.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tk.links.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tk.links.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,2 +1,2 @@
-/usr/bin/wish at VER@ /usr/bin/wish-default
-/usr/share/man/man1/wish at VER@.1.gz /usr/share/man/man1/wish-default.1.gz
+/usr/bin/wish at VER@ /usr/bin/wish
+/usr/share/man/man1/wish at VER@.1.gz /usr/share/man/man1/wish.1.gz
Deleted: tcltk-defaults/branches/experimental/debian/tk.lintian-override
===================================================================
--- tcltk-defaults/branches/experimental/debian/tk.lintian-override 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tk.lintian-override 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1 +0,0 @@
-tk: package-depends-on-multiple-tk-versions
Copied: tcltk-defaults/branches/experimental/debian/tk.lintian-overrides (from rev 1379, tcltk-defaults/branches/experimental/debian/tk.lintian-override)
===================================================================
--- tcltk-defaults/branches/experimental/debian/tk.lintian-overrides (rev 0)
+++ tcltk-defaults/branches/experimental/debian/tk.lintian-overrides 2013-07-13 05:12:01 UTC (rev 1412)
@@ -0,0 +1 @@
+tk: package-depends-on-multiple-tk-versions
Deleted: tcltk-defaults/branches/experimental/debian/tk.postinst.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tk.postinst.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tk.postinst.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
- update-alternatives --install /usr/bin/wish wish /usr/bin/wish-default 10000 \
- --slave /usr/share/man/man1/wish.1.gz wish.1 \
- /usr/share/man/man1/wish-default.1.gz
-fi
-
-#DEBHELPER#
Copied: tcltk-defaults/branches/experimental/debian/tk.preinst (from rev 1379, tcltk-defaults/branches/experimental/debian/tk.prerm.in)
===================================================================
--- tcltk-defaults/branches/experimental/debian/tk.preinst (rev 0)
+++ tcltk-defaults/branches/experimental/debian/tk.preinst 2013-07-13 05:12:01 UTC (rev 1412)
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ install|upgrade)
+ # Currently the alternatives mechanism is not used
+ if dpkg --compare-versions "$2" lt-nl "8.6.0-2"; then
+ update-alternatives --remove-all wish || true
+ fi
+ ;;
+ abort-upgrade)
+ ;;
+ *)
+ echo "preinst called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
Deleted: tcltk-defaults/branches/experimental/debian/tk.prerm.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tk.prerm.in 2013-07-12 18:47:50 UTC (rev 1411)
+++ tcltk-defaults/branches/experimental/debian/tk.prerm.in 2013-07-13 05:12:01 UTC (rev 1412)
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-update-alternatives --remove wish /usr/bin/wish-default
-
-#DEBHELPER#
More information about the Pkg-tcltk-commits
mailing list