[Pkg-tcltk-commits] r1951 - in tcllib/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Tue Feb 20 15:35:42 UTC 2018
Author: sgolovan
Date: 2018-02-20 15:35:42 +0000 (Tue, 20 Feb 2018)
New Revision: 1951
Modified:
tcllib/trunk/debian/changelog
tcllib/trunk/debian/compat
tcllib/trunk/debian/control
tcllib/trunk/debian/install
tcllib/trunk/debian/patches/nettool.patch
tcllib/trunk/debian/rules
Log:
[tcllib]
* New upstream release.
* Replace the arp and ifconfig calls by parsing /proc/net/arp and calling
ip address show (for Linux only) in the nettool module because of the
changes in the ifconfig output.
* Add iproute2 to the dependencies list for nettool and uuid modules (for
Linux).
* Add freebsd-net-tools to the dependencies list for nettool module (for
GNU/kFreeBSD).
* Bump the debhelper compatibility level to 10.
* Bump the standards version to 4.1.3.
Modified: tcllib/trunk/debian/changelog
===================================================================
--- tcllib/trunk/debian/changelog 2018-02-04 14:44:54 UTC (rev 1950)
+++ tcllib/trunk/debian/changelog 2018-02-20 15:35:42 UTC (rev 1951)
@@ -1,11 +1,17 @@
-tcllib (1.18-dfsg-4) unstable; urgency=medium
+tcllib (1.19-dfsg-1) unstable; urgency=medium
+ * New upstream release.
* Replace the arp and ifconfig calls by parsing /proc/net/arp and calling
- ip address show in the nettool module because of the changes in the
- ifconfig output.
- * Add iproute2 to the dependencies list for nettool and uuid modules.
+ ip address show (for Linux only) in the nettool module because of the
+ changes in the ifconfig output.
+ * Add iproute2 to the dependencies list for nettool and uuid modules (for
+ Linux).
+ * Add freebsd-net-tools to the dependencies list for nettool module (for
+ GNU/kFreeBSD).
+ * Bump the debhelper compatibility level to 10.
+ * Bump the standards version to 4.1.3.
- -- Sergei Golovan <sgolovan at debian.org> Fri, 02 Feb 2018 09:08:59 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Tue, 20 Feb 2018 09:14:28 +0300
tcllib (1.18-dfsg-3) unstable; urgency=medium
Modified: tcllib/trunk/debian/compat
===================================================================
--- tcllib/trunk/debian/compat 2018-02-04 14:44:54 UTC (rev 1950)
+++ tcllib/trunk/debian/compat 2018-02-20 15:35:42 UTC (rev 1951)
@@ -1 +1 @@
-8
+10
Modified: tcllib/trunk/debian/control
===================================================================
--- tcllib/trunk/debian/control 2018-02-04 14:44:54 UTC (rev 1950)
+++ tcllib/trunk/debian/control 2018-02-20 15:35:42 UTC (rev 1951)
@@ -3,16 +3,16 @@
Priority: optional
Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 8.9.7), critcl
+Build-Depends: debhelper (>= 10), critcl
Build-Depends-Indep: tcl-dev
-Standards-Version: 3.9.7
+Standards-Version: 4.1.3
Homepage: https://core.tcl.tk/tcllib/home
Package: tcllib
Section: interpreters
Priority: optional
Architecture: all
-Depends: ${tclsh:Depends}, iproute2, ${misc:Depends}
+Depends: ${tclsh:Depends}, ${nettool:Depends}, ${misc:Depends}
Suggests: tcllib-critcl
Description: Standard Tcl Library
Tcllib, the standard Tcl library, is a collection of common utility
@@ -40,6 +40,7 @@
* cron: automating the period callback of commands
* csv: functions to handle CSV (comma-separated values) data
* debug: debug messages infrastructure
+ * defer: defered execution
* des: DES and 3DES encryption
* dicttool: dictionary tools
* dns: DNS and resolver library-related functions
@@ -100,6 +101,8 @@
* png: functions to query and modify PNG images
* pop3: a POP3 protocol implementation
* pop3d: a POP3 server implementation
+ * practcl: tool for integrating large modules for C API Tcl code
+ that requires custom Tcl types and TclOO objects
* processman: manage child processes
* profiler: a function level Tcl source code profiler
* pt: parser tools
@@ -129,9 +132,12 @@
* tiff: TIFF image manipulation
* tool: dictionary tools
* tool::datatype: dictionary tools
+ * tool-ui: abstractions to allow Tao to express Native Tk, HTML5, and
+ Tao-Layout interfaces
* transfer: data transfer facilities
* treeql: tree query language
* try: trap and process errors and exceptions
+ * udpcluster: UDP peer-to-peer cluster
* uev: user events
* units: convert and manipulate quantities with units
* uri: functions to generate and manipulate commonly-used URIs
Modified: tcllib/trunk/debian/install
===================================================================
--- tcllib/trunk/debian/install 2018-02-04 14:44:54 UTC (rev 1950)
+++ tcllib/trunk/debian/install 2018-02-20 15:35:42 UTC (rev 1951)
@@ -1,2 +1,2 @@
debian/tmp/usr/bin
-debian/tmp/usr/lib/* usr/share/tcltk
+debian/tmp/usr/lib/*/* usr/share/tcltk
Modified: tcllib/trunk/debian/patches/nettool.patch
===================================================================
--- tcllib/trunk/debian/patches/nettool.patch 2018-02-04 14:44:54 UTC (rev 1950)
+++ tcllib/trunk/debian/patches/nettool.patch 2018-02-20 15:35:42 UTC (rev 1951)
@@ -6,10 +6,21 @@
Bug: https://core.tcl.tk/tcllib/tktview?name=d879576438
Bug: https://core.tcl.tk/tcllib/tktview?name=9a21637273
---- a/modules/nettool/platform_unix_linux.tcl
-+++ b/modules/nettool/platform_unix_linux.tcl
-@@ -1,6 +1,24 @@
- ::namespace eval ::nettool {}
+--- a/modules/nettool/nettool.tcl
++++ b/modules/nettool/nettool.tcl
+@@ -1042,7 +1042,9 @@
+ ###
+ proc ::nettool::arp_table {} {
+ set result {}
+- set dat [exec arp -a]
++ if {[catch {exec /usr/sbin/arp -a} dat]} {
++ return {}
++ }
+ foreach line [split $dat \n] {
+ set host [lindex $line 0]
+ set ip [lindex $line 1]
+@@ -1062,6 +1064,24 @@
+ if {$::tcl_platform(platform) eq "unix" && $genus eq "linux"} {
###
+# topic: 825cd25953c2cc896a96006b7f454e00
@@ -33,16 +44,18 @@
# topic: 92ebbfa155883ad41c37d3f843392be4
# title: Return list of broadcast addresses for local networks
###
-@@ -8,7 +26,7 @@
+@@ -1069,8 +1089,8 @@
set result {}
lappend result 127.0.0.1
foreach {iface info} [dump] {
- if {[dict exists $info ipv4 Bcast:]} {
+- lappend result [dict get $info ipv4 Bcast:]
+ if {[dict exists $info ipv4 brd]} {
- lappend result [dict get $info ipv4 Bcast:]
++ lappend result [dict get $info ipv4 brd]
}
}
-@@ -92,38 +110,45 @@
+ return [lsort -unique -dictionary $result]
+@@ -1153,38 +1173,45 @@
# description: Dump interfaces
###
proc ::nettool::dump {} {
@@ -106,7 +119,7 @@
}
}
return $result
-@@ -140,8 +165,7 @@
+@@ -1201,8 +1228,7 @@
lappend result [dict get $info ipv4 addr:]
}
}
@@ -116,7 +129,7 @@
}
###
-@@ -155,7 +179,7 @@
+@@ -1216,7 +1242,7 @@
lappend result [dict get $info ether:]
}
}
@@ -125,7 +138,7 @@
}
###
-@@ -164,10 +188,10 @@
+@@ -1225,10 +1251,10 @@
proc ::nettool::network_list {} {
foreach {iface info} [dump] {
if {![dict exists $info ipv4 addr:]} continue
@@ -137,5 +150,5 @@
+ set prefix [dict get $info ipv4 prefix:]
+ set mask [::ip::toInteger [::ip::lengthToMask $prefix]]
set addri [::ip::toInteger $addr]
- lappend result [ip::nativeToPrefix [list [expr {$addri & $mask}] $mask] -ipv4]
+ lappend result [ip::nativeToPrefix [list [expr {$addri & $mask}] $mask] -ipv4]
}
Modified: tcllib/trunk/debian/rules
===================================================================
--- tcllib/trunk/debian/rules 2018-02-04 14:44:54 UTC (rev 1950)
+++ tcllib/trunk/debian/rules 2018-02-20 15:35:42 UTC (rev 1951)
@@ -146,9 +146,13 @@
override_dh_gencontrol:
tcltk-depends
- dh_gencontrol
+ if $$(echo $(DEB_HOST_ARCH) | grep -q bsd) ; then \
+ dh_gencontrol -- -Vnettool:Depends='freebsd-net-tools' ; \
+ elif $$(echo $(DEB_HOST_ARCH) | grep -vq hurd) ; then \
+ dh_gencontrol -- -Vnettool:Depends='iproute2' ; \
+ fi
-v=1.18
+v=1.19
get-orig-source:
CURDIR=`pwd` && \
More information about the Pkg-tcltk-commits
mailing list