[Pkg-tcltk-commits] r1519 - tcltk-defaults/branches/experimental/debian
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Fri Oct 4 13:34:44 UTC 2013
Author: sgolovan
Date: 2013-10-04 13:34:44 +0000 (Fri, 04 Oct 2013)
New Revision: 1519
Modified:
tcltk-defaults/branches/experimental/debian/changelog
tcltk-defaults/branches/experimental/debian/tcltk-depends.1
tcltk-defaults/branches/experimental/debian/tcltk-depends.in
Log:
[tcltk-default-experimental]
* Added new substitution variables ${tclXY:Depends} and ${tkXY:Depends}
to tcltk-depends script.
Modified: tcltk-defaults/branches/experimental/debian/changelog
===================================================================
--- tcltk-defaults/branches/experimental/debian/changelog 2013-09-30 18:53:18 UTC (rev 1518)
+++ tcltk-defaults/branches/experimental/debian/changelog 2013-10-04 13:34:44 UTC (rev 1519)
@@ -1,8 +1,9 @@
tcltk-defaults (8.6.0+7) UNRELEASED; urgency=low
- * NOT RELEASED YET
+ * Added new substitution variables ${tclXY:Depends} and ${tkXY:Depends}
+ to tcltk-depends script.
- -- Sergei Golovan <sgolovan at debian.org> Wed, 25 Sep 2013 22:31:24 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Fri, 04 Oct 2013 17:29:33 +0400
tcltk-defaults (8.6.0+6) experimental; urgency=low
Modified: tcltk-defaults/branches/experimental/debian/tcltk-depends.1
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcltk-depends.1 2013-09-30 18:53:18 UTC (rev 1518)
+++ tcltk-defaults/branches/experimental/debian/tcltk-depends.1 2013-10-04 13:34:44 UTC (rev 1519)
@@ -1,4 +1,4 @@
-.TH tcltk-depends 1 "2013-09-25" "0.3" "Tcl/Tk packages for Debian GNU/Linux"
+.TH tcltk-depends 1 "2013-10-04" "0.3" "Tcl/Tk packages for Debian GNU/Linux"
.SH "NAME"
tcltk\-depends \- calculates Tcl/Tk dependencies
@@ -7,14 +7,15 @@
.SH "DESCRIPTION"
tcltk-depends is a debhelper-like program which is responsible for generating
-the ${tcl:Depends}, ${tk:Depends}, ${tclsh:Depends} and ${wish:Depends}
+the ${tclXY:Depends}, ${tkXY:Depends}, ${tcl:Depends} and ${tk:Depends}
substitution variables and adding them to substvars files.
.PP
If you use this program, your package must build-depend on tcl-dev
-or tk-dev.
+or tk-dev. If you use ${tclXY:Depends} or ${tkXY:Depends} variables,
+your package musr build-depend on tcl-dev (>= 8.6.0+7) or tk-dev (>= 8.6.0+7).
.SH "SEE ALSO"
-\&\fIdebhelper\fR\|(7)
+\&\fIdebhelper\fR\|(7), /usr/share/doc/tcl-doc/tcltk-policy.txt.gz
.PP
This program is not a part of debhelper.
Modified: tcltk-defaults/branches/experimental/debian/tcltk-depends.in
===================================================================
--- tcltk-defaults/branches/experimental/debian/tcltk-depends.in 2013-09-30 18:53:18 UTC (rev 1518)
+++ tcltk-defaults/branches/experimental/debian/tcltk-depends.in 2013-10-04 13:34:44 UTC (rev 1519)
@@ -232,6 +232,22 @@
}
}
+set ver "@VER@"
+
+set tclver "@TCLVER@"
+if {$tclver == ""} {
+ set tcldep ""
+} else {
+ set tcldep " (>= $tclver)"
+}
+
+set tkver "@TKVER@"
+if {$tkver == ""} {
+ set tkdep ""
+} else {
+ set tkdep " (>= $tkver)"
+}
+
set version "@COMPATVER@"
if {$version == ""} {
set dep ""
@@ -240,21 +256,31 @@
}
foreach {package vars} [getpackages $argv] {
+ delsubstvar $package "tclXY:Depends"
+ if {[lsearch -exact $vars "\${tclXY:Depends}"] >= 0} {
+ addsubstvar $package "tclXY:Depends" "tcl$ver$tcldep"
+ }
delsubstvar $package "tcl:Depends"
if {[lsearch -exact $vars "\${tcl:Depends}"] >= 0} {
addsubstvar $package "tcl:Depends" "tcl$dep"
}
+ # tclsh:Depends is retained for backward compatibility
delsubstvar $package "tclsh:Depends"
if {[lsearch -exact $vars "\${tclsh:Depends}"] >= 0} {
- addsubstvar $package "tclsh:Depends" "tcl$dep | tclsh"
+ addsubstvar $package "tclsh:Depends" "tcl$dep"
}
+ delsubstvar $package "tkXY:Depends"
+ if {[lsearch -exact $vars "\${tkXY:Depends}"] >= 0} {
+ addsubstvar $package "tkXY:Depends" "tk$ver$tkdep"
+ }
delsubstvar $package "tk:Depends"
if {[lsearch -exact $vars "\${tk:Depends}"] >= 0} {
addsubstvar $package "tk:Depends" "tk$dep"
}
+ # wish:Depends is retained for backward compatibility
delsubstvar $package "wish:Depends"
if {[lsearch -exact $vars "\${wish:Depends}"] >= 0} {
- addsubstvar $package "wish:Depends" "tk$dep | wish"
+ addsubstvar $package "wish:Depends" "tk$dep"
}
}
More information about the Pkg-tcltk-commits
mailing list