[Pkg-tcltk-commits] r1612 - tcltk-defaults/trunk/debian
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu May 15 07:24:48 UTC 2014
Author: sgolovan
Date: 2014-05-15 07:24:48 +0000 (Thu, 15 May 2014)
New Revision: 1612
Modified:
tcltk-defaults/trunk/debian/changelog
tcltk-defaults/trunk/debian/control
tcltk-defaults/trunk/debian/control.in
tcltk-defaults/trunk/debian/rules
tcltk-defaults/trunk/debian/tcltk-depends.1
tcltk-defaults/trunk/debian/tcltk-depends.in
Log:
[tcltk-defaults]
* Added ${libtclXY:Depends}, ${libtkXY:Depends}, ${libtcl:Depends} and
${libtk:Depends} substitution variables to the tcltk-depends script.
* Added support for the stage1 build profile which makes the source package
no longer build depend on TeXLive and doesn't build tcl-doc and tk-doc
packages (closes: #738130).
* Removed subversion from the build dependencies list.
Modified: tcltk-defaults/trunk/debian/changelog
===================================================================
--- tcltk-defaults/trunk/debian/changelog 2014-05-05 20:51:40 UTC (rev 1611)
+++ tcltk-defaults/trunk/debian/changelog 2014-05-15 07:24:48 UTC (rev 1612)
@@ -1,8 +1,13 @@
-tcltk-defaults (8.6.0+9) UNRELEASED; urgency=low
+tcltk-defaults (8.6.0+9) unstable; urgency=low
- * NOT RELEASED YET
+ * Added ${libtclXY:Depends}, ${libtkXY:Depends}, ${libtcl:Depends} and
+ ${libtk:Depends} substitution variables to the tcltk-depends script.
+ * Added support for the stage1 build profile which makes the source package
+ no longer build depend on TeXLive and doesn't build tcl-doc and tk-doc
+ packages (closes: #738130).
+ * Removed subversion from the build dependencies list.
- -- Sergei Golovan <sgolovan at debian.org> Sat, 08 Mar 2014 13:39:28 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 15 May 2014 11:17:13 +0400
tcltk-defaults (8.6.0+8) unstable; urgency=low
Modified: tcltk-defaults/trunk/debian/control
===================================================================
--- tcltk-defaults/trunk/debian/control 2014-05-05 20:51:40 UTC (rev 1611)
+++ tcltk-defaults/trunk/debian/control 2014-05-15 07:24:48 UTC (rev 1612)
@@ -4,10 +4,10 @@
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 (>= 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
+Build-Depends-Indep: debiandoc-sgml <!profile.stage1>,
+ texlive-fonts-recommended | tetex-extra <!profile.stage1>,
+ texlive-latex-extra | tetex-extra <!profile.stage1>,
+ texlive-latex-recommended | tetex-extra <!profile.stage1>
Standards-Version: 3.9.5
Package: tcl
@@ -45,6 +45,7 @@
Section: doc
Priority: optional
Architecture: all
+Build-Profiles: !stage1
Depends: ${misc:Depends}
Recommends: tcl8.6-doc (>= 8.6.0-2)
Suggests: tcl
@@ -88,6 +89,7 @@
Section: doc
Priority: optional
Architecture: all
+Build-Profiles: !stage1
Depends: tcl-doc (= ${binary:Version}), ${misc:Depends}
Recommends: tk8.6-doc (>= 8.6.0-2)
Suggests: tk
Modified: tcltk-defaults/trunk/debian/control.in
===================================================================
--- tcltk-defaults/trunk/debian/control.in 2014-05-05 20:51:40 UTC (rev 1611)
+++ tcltk-defaults/trunk/debian/control.in 2014-05-15 07:24:48 UTC (rev 1612)
@@ -4,10 +4,10 @@
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 (>= 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
+Build-Depends-Indep: debiandoc-sgml <!profile.stage1>,
+ texlive-fonts-recommended | tetex-extra <!profile.stage1>,
+ texlive-latex-extra | tetex-extra <!profile.stage1>,
+ texlive-latex-recommended | tetex-extra <!profile.stage1>
Standards-Version: 3.9.5
Package: tcl
@@ -45,6 +45,7 @@
Section: doc
Priority: optional
Architecture: all
+Build-Profiles: !stage1
Depends: ${misc:Depends}
Recommends: tcl at VER@-doc (>= @TCLVER@)
Suggests: tcl
@@ -88,6 +89,7 @@
Section: doc
Priority: optional
Architecture: all
+Build-Profiles: !stage1
Depends: tcl-doc (= ${binary:Version}), ${misc:Depends}
Recommends: tk at VER@-doc (>= @TKVER@)
Suggests: tk
Modified: tcltk-defaults/trunk/debian/rules
===================================================================
--- tcltk-defaults/trunk/debian/rules 2014-05-05 20:51:40 UTC (rev 1611)
+++ tcltk-defaults/trunk/debian/rules 2014-05-15 07:24:48 UTC (rev 1612)
@@ -12,9 +12,17 @@
include /usr/share/dpkg/architecture.mk
+ifeq (,$(findstring stage1,$(DEB_BUILD_PROFILES)))
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
+DH_EXCLUDES =
+else
+DOCS =
+BINS = debian/tcltk-depends debian/tcl.links debian/tcl-dev.links \
+ debian/tk.links debian/tk-dev.links
+DH_EXCLUDES = -Ntcl-doc -Ntk-doc
+endif
#
# A new policy should be get manually and only after agreement
@@ -69,13 +77,13 @@
override_dh_auto_build-indep: $(DOCS)
override_dh_installdocs:
- dh_installdocs -A debian/README.Debian -Ntk-doc
+ dh_installdocs -A debian/README.Debian -Ntk-doc $(DH_EXCLUDES)
override_dh_installchangelogs:
- dh_installchangelogs -Ntk-doc
+ dh_installchangelogs -Ntk-doc $(DH_EXCLUDES)
override_dh_compress:
- dh_compress -X.pdf
+ dh_compress -X.pdf $(DH_EXCLUDES)
.PHONY: get-policy build-policy override_dh_clean override_dh_auto_build-arch \
override_dh_auto_build-indep override_dh_installdocs \
Modified: tcltk-defaults/trunk/debian/tcltk-depends.1
===================================================================
--- tcltk-defaults/trunk/debian/tcltk-depends.1 2014-05-05 20:51:40 UTC (rev 1611)
+++ tcltk-defaults/trunk/debian/tcltk-depends.1 2014-05-15 07:24:48 UTC (rev 1612)
@@ -1,4 +1,4 @@
-.TH tcltk-depends 1 "2013-10-04" "0.3" "Tcl/Tk packages for Debian GNU/Linux"
+.TH tcltk-depends 1 "2014-05-15" "0.4" "Tcl/Tk packages for Debian GNU/Linux"
.SH "NAME"
tcltk\-depends \- calculates Tcl/Tk dependencies
@@ -7,12 +7,16 @@
.SH "DESCRIPTION"
tcltk-depends is a debhelper-like program which is responsible for generating
-the ${tclXY:Depends}, ${tkXY:Depends}, ${tcl:Depends} and ${tk:Depends}
+the ${libtclXY:Depends}, ${libtkXY:Depends}, ${libtcl:Depends}, ${libtk:Depends},
+${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. 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).
+your package must build-depend on tcl-dev (>= 8.6.0+7) or tk-dev (>= 8.6.0+7).
+If you use ${libtclXY:Depends}, ${libtkXY:Depends}, ${libtcl:Depends}
+or {libtk:Depends} variables, your package must build-depend on
+tcl-dev (>= 8.6.0+9) or tk-dev (>= 8.6.0+9).
.SH "SEE ALSO"
\&\fIdebhelper\fR\|(7), /usr/share/doc/tcl-doc/tcltk-policy.txt.gz
Modified: tcltk-defaults/trunk/debian/tcltk-depends.in
===================================================================
--- tcltk-defaults/trunk/debian/tcltk-depends.in 2014-05-05 20:51:40 UTC (rev 1611)
+++ tcltk-defaults/trunk/debian/tcltk-depends.in 2014-05-15 07:24:48 UTC (rev 1612)
@@ -256,6 +256,14 @@
}
foreach {package vars} [getpackages $argv] {
+ delsubstvar $package "libtclXY:Depends"
+ if {[lsearch -exact $vars "\${libtclXY:Depends}"] >= 0} {
+ addsubstvar $package "libtclXY:Depends" "libtcl$ver$tcldep"
+ }
+ delsubstvar $package "libtcl:Depends"
+ if {[lsearch -exact $vars "\${libtcl:Depends}"] >= 0} {
+ addsubstvar $package "libtcl:Depends" "libtcl$ver$tcldep | libtcl"
+ }
delsubstvar $package "tclXY:Depends"
if {[lsearch -exact $vars "\${tclXY:Depends}"] >= 0} {
addsubstvar $package "tclXY:Depends" "tcl$ver$tcldep"
@@ -269,6 +277,14 @@
if {[lsearch -exact $vars "\${tclsh:Depends}"] >= 0} {
addsubstvar $package "tclsh:Depends" "tcl$dep"
}
+ delsubstvar $package "libtkXY:Depends"
+ if {[lsearch -exact $vars "\${libtkXY:Depends}"] >= 0} {
+ addsubstvar $package "libtkXY:Depends" "libtk$ver$tkdep"
+ }
+ delsubstvar $package "libtk:Depends"
+ if {[lsearch -exact $vars "\${libtk:Depends}"] >= 0} {
+ addsubstvar $package "libtk:Depends" "libtk$ver$tkdep | libtk"
+ }
delsubstvar $package "tkXY:Depends"
if {[lsearch -exact $vars "\${tkXY:Depends}"] >= 0} {
addsubstvar $package "tkXY:Depends" "tk$ver$tkdep"
More information about the Pkg-tcltk-commits
mailing list