[Pkg-tcltk-commits] r1891 - in iwidgets4/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Sat Oct 28 08:20:17 UTC 2017
Author: sgolovan
Date: 2017-10-28 08:20:15 +0000 (Sat, 28 Oct 2017)
New Revision: 1891
Modified:
iwidgets4/trunk/debian/changelog
iwidgets4/trunk/debian/compat
iwidgets4/trunk/debian/control
iwidgets4/trunk/debian/iwidgets4-doc.install
iwidgets4/trunk/debian/iwidgets4-doc.links
iwidgets4/trunk/debian/iwidgets4.install
iwidgets4/trunk/debian/patches/build.patch
iwidgets4/trunk/debian/patches/man.patch
iwidgets4/trunk/debian/rules
Log:
[iwidgets4]
* New upstream release.
* Bump debhelper compatibility version to 10.
* Bump standards version to 4.1.1.
Modified: iwidgets4/trunk/debian/changelog
===================================================================
--- iwidgets4/trunk/debian/changelog 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/changelog 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1,8 +1,10 @@
-iwidgets4 (4.0.1-7) UNRELEASED; urgency=low
+iwidgets4 (4.1.0-1) unstable; urgency=low
- * NOT RELEASED YET
+ * New upstream release.
+ * Bump debhelper compatibility version to 10.
+ * Bump standards version to 4.1.1.
- -- Sergei Golovan <sgolovan at debian.org> Wed, 30 May 2012 09:06:03 +0400
+ -- Sergei Golovan <sgolovan at debian.org> Sat, 28 Oct 2017 10:11:27 +0300
iwidgets4 (4.0.1-6) unstable; urgency=low
Modified: iwidgets4/trunk/debian/compat
===================================================================
--- iwidgets4/trunk/debian/compat 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/compat 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1 +1 @@
-8
+10
Modified: iwidgets4/trunk/debian/control
===================================================================
--- iwidgets4/trunk/debian/control 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/control 2017-10-28 08:20:15 UTC (rev 1891)
@@ -3,9 +3,9 @@
Priority: optional
Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
Uploaders: Sergei Golovan <sgolovan at debian.org>
-Build-Depends: debhelper (>= 8.0.0)
+Build-Depends: debhelper (>= 10.0.0)
Build-Depends-Indep: itcl3-dev, itk3-dev, tk-dev
-Standards-Version: 3.9.3
+Standards-Version: 4.1.1
Homepage: http://incrtcl.sourceforge.net/iwidgets/
Package: iwidgets4
Modified: iwidgets4/trunk/debian/iwidgets4-doc.install
===================================================================
--- iwidgets4/trunk/debian/iwidgets4-doc.install 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/iwidgets4-doc.install 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1,2 +1,2 @@
-usr/share/doc/iwidgets*-doc
+usr/lib/*/iwidgets*/demos usr/share/doc/iwidgets4-doc/
usr/share/man/man3
Modified: iwidgets4/trunk/debian/iwidgets4-doc.links
===================================================================
--- iwidgets4/trunk/debian/iwidgets4-doc.links 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/iwidgets4-doc.links 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1 +1 @@
-usr/share/doc/iwidgets4-doc/demos usr/share/tcltk/iwidgets4.0.1/demos
+usr/share/doc/iwidgets4-doc/demos usr/share/tcltk/iwidgets4.1.0/demos
Modified: iwidgets4/trunk/debian/iwidgets4.install
===================================================================
--- iwidgets4/trunk/debian/iwidgets4.install 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/iwidgets4.install 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1 +1,2 @@
-usr/share/tcltk/iwidgets*
+usr/lib/*/iwidgets*/scripts usr/share/tcltk/iwidgets4.1.0/
+usr/lib/*/iwidgets*/*.tcl usr/share/tcltk/iwidgets4.1.0/
Modified: iwidgets4/trunk/debian/patches/build.patch
===================================================================
--- iwidgets4/trunk/debian/patches/build.patch 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/patches/build.patch 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1,263 +1,63 @@
---- iwidgets4-4.0.1.orig/mkinstalldirs
-+++ iwidgets4-4.0.1/mkinstalldirs
-@@ -0,0 +1,32 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+# Author: Noah Friedman <friedman at prep.ai.mit.edu>
-+# Created: 1993-05-16
-+# Last modified: 1994-03-25
-+# Public domain
-+
-+errstatus=0
-+
-+for file in ${1+"$@"} ; do
-+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+ shift
-+
-+ pathcomp=
-+ for d in ${1+"$@"} ; do
-+ pathcomp="$pathcomp$d"
-+ case "$pathcomp" in
-+ -* ) pathcomp=./$pathcomp ;;
-+ esac
-+
-+ if test ! -d "$pathcomp"; then
-+ echo "mkdir $pathcomp" 1>&2
-+ mkdir "$pathcomp" || errstatus=$?
-+ fi
-+
-+ pathcomp="$pathcomp/"
-+ done
-+done
-+
-+exit $errstatus
-+
-+# mkinstalldirs ends here
--- iwidgets4-4.0.1.orig/configure.in
+++ iwidgets4-4.0.1/configure.in
-@@ -63,18 +63,18 @@
- ITCL_LIB_DIR=""
- if test -r $itcl_search/itcl/library/itcl.tcl; then
- if test -r $itcl_search/itk/library/itk.tcl; then
-- if test -r $itcl_search/config/mkinstalldirs; then
-- ITCL_LIB_DIR=$itcl_search/itcl/library
-- ITCL_SRC_DIR=$itcl_search/itcl
-- ITK_LIB_DIR=$itcl_search/itk/library
-- ITK_SRC_DIR=$itcl_search/itk
-- fi
-+ ITCL_LIB_DIR=$itcl_search/itcl/library
-+ ITCL_SRC_DIR=$itcl_search/itcl
-+ ITK_LIB_DIR=$itcl_search/itk/library
-+ ITK_SRC_DIR=$itcl_search/itk
- fi
+@@ -63,22 +63,22 @@
+ ITCL_LIB_DIR=$itcl_SRC_DIR/library
fi
-if test -z "$ITCL_LIB_DIR"; then
-- AC_MSG_ERROR(Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.))
+- AC_MSG_ERROR([Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. This directory should contain library/itcl.tcl.])
-fi
-+# Quick hack, comment out following, breaks tests, but oh well.
+#if test -z "$ITCL_LIB_DIR"; then
-+# AC_MSG_ERROR(Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl.))
++# AC_MSG_ERROR([Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. This directory should contain library/itcl.tcl.])
+#fi
-+
+ AC_ARG_WITH(itk, [ --with-itk=DIR use Itk 3.0 binaries from DIR],
+ itk_search=$withval, itk_search=`cd ${srcdir}/..; pwd`)
+ ITK_LIB_DIR=""
+ if test -r $itk_search/library/itk.tcl; then
+ ITK_LIB_DIR=$itk_search/library
+ ITK_SRC_DIR=$itk_search
+ fi
+
+-if test -z "$ITK_LIB_DIR"; then
+- AC_MSG_ERROR([Can't find Itk source. Use --with-itk to specify the the toplevel [incr Tk] directory on your system. This directory should contain library/itk.tcl.])
+-fi
++#if test -z "$ITK_LIB_DIR"; then
++# AC_MSG_ERROR([Can't find Itk source. Use --with-itk to specify the the toplevel [incr Tk] directory on your system. This directory should contain library/itk.tcl.])
++#fi
+
#--------------------------------------------------------------------
+ # Handle the --prefix=... option by defaulting to what Tcl gave.
--- iwidgets4-4.0.1.orig/configure
+++ iwidgets4-4.0.1/configure
-@@ -808,18 +808,18 @@
- ITCL_LIB_DIR=""
- if test -r $itcl_search/itcl/library/itcl.tcl; then
- if test -r $itcl_search/itk/library/itk.tcl; then
-- if test -r $itcl_search/config/mkinstalldirs; then
-- ITCL_LIB_DIR=$itcl_search/itcl/library
-- ITCL_SRC_DIR=$itcl_search/itcl
-- ITK_LIB_DIR=$itcl_search/itk/library
-- ITK_SRC_DIR=$itcl_search/itk
-- fi
-+ ITCL_LIB_DIR=$itcl_search/itcl/library
-+ ITCL_SRC_DIR=$itcl_search/itcl
-+ ITK_LIB_DIR=$itcl_search/itk/library
-+ ITK_SRC_DIR=$itcl_search/itk
- fi
+@@ -808,11 +808,9 @@
+ ITCL_LIB_DIR=$itcl_SRC_DIR/library
fi
-if test -z "$ITCL_LIB_DIR"; then
-- { echo "configure: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.)" 1>&2; exit 1; }
+- { { echo "$as_me:$LINENO: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. This directory should contain library/itcl.tcl." >&5
+-echo "$as_me: error: Can't find Itcl source. Use --with-itcl to specify the the toplevel incr Tcl directory on your system. This directory should contain library/itcl.tcl." >&2;}
+- { (exit 1); exit 1; }; }
-fi
-+# Quick hack, comment out following, breaks tests, but oh well.
+#if test -z "$ITCL_LIB_DIR"; then
-+# AC_MSG_ERROR(Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl.))
++# AC_MSG_ERROR([Can't find Itcl source. Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system. This directory should contain library/itcl.tcl.])
+#fi
-+
- #--------------------------------------------------------------------
---- iwidgets4-4.0.1.orig/Makefile.in
-+++ iwidgets4-4.0.1/Makefile.in
-@@ -50,12 +50,6 @@
- # Top-level directory in which to install manual entries:
- MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
+ # Check whether --with-itk or --without-itk was given.
+@@ -828,11 +828,9 @@
+ ITK_SRC_DIR=$itk_search
+ fi
--# Directory containing Tcl source code (for library used during test):
--TCL_SRC_DIR = @TCL_SRC_DIR@
--
--# Directory containing Tk source code (for library used during test):
--TK_SRC_DIR = @TK_SRC_DIR@
--
- # Itcl libraries can be found here:
- ITCL_LIB_DIR = @ITCL_LIB_DIR@
+-if test -z "$ITK_LIB_DIR"; then
+- { { echo "$as_me:$LINENO: error: Can't find Itk source. Use --with-itk to specify the the toplevel incr Tk directory on your system. This directory should contain library/itk.tcl." >&5
+-echo "$as_me: error: Can't find Itk source. Use --with-itk to specify the the toplevel incr Tk directory on your system. This directory should contain library/itk.tcl." >&2;}
+- { (exit 1); exit 1; }; }
+-fi
++#if test -z "$ITK_LIB_DIR"; then
++# AC_MSG_ERROR([Can't find Itk source. Use --with-itk to specify the the toplevel [incr Tk] directory on your system. This directory should contain library/itk.tcl.])
++#fi
-@@ -78,11 +72,11 @@
- # modify any of this stuff by hand.
- #----------------------------------------------------------------
-
--INSTALL = $(TCLSH_PROG) `$(CYGPATH) $(ITCL_SRC_DIR)/../config/installFile.tcl` -c
-+INSTALL = $(TCLSH_PROG) `$(CYGPATH) $(srcdir)/installFile.tcl` -c
- INSTALL_PROGRAM = $(INSTALL)
- INSTALL_DATA = $(INSTALL) -m 644
- INSTALL_SCRIPT = $(INSTALL) -m 555
--MKINSTALLDIRS = $(ITCL_SRC_DIR)/../config/mkinstalldirs
-+MKINSTALLDIRS = $(srcdir)/mkinstalldirs
- RANLIB = @RANLIB@
- LN_S = ln -s
- TOP_DIR = $(srcdir)
-@@ -109,14 +103,11 @@
- install: install-libraries install-doc install-demos
-
- test:
-- LD_LIBRARY_PATH=$(ITCL_LIB_DIR):$(ITK_LIB_DIR):$(LD_LIBRARY_PATH); export LD_LIBRARY_PATH ; \
-- TCL_LIBRARY=$(TCL_SRC_DIR)/library; export TCL_LIBRARY; \
-+# removed LD_LIBRARY_PATH - if you have to set that, your system is broken
- ITCL_LIBRARY=$(ITCL_LIB_DIR); export ITCL_LIBRARY; \
-- TK_LIBRARY=$(TK_SRC_DIR)/library; export TK_LIBRARY; \
- ITK_LIBRARY=$(ITK_LIB_DIR); export ITK_LIBRARY; \
- IWIDGETS_LIBRARY=@IWIDGETS_SRC_DIR@; export IWIDGETS_LIBRARY; \
-- $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` \
-- -exedir `@CYGPATH@ $(TK_SRC_DIR)/unix` $(TESTFLAGS)
-+ $(TCLSH_PROG) `@CYGPATH@ $(srcdir)/tests/all.tcl` $(TESTFLAGS)
-
- install-libraries:
- @$(MKINSTALLDIRS) $(SCRIPT_INSTALL_DIR) $(LIB_INSTALL_DIR)
---- iwidgets4-4.0.1.orig/installFile.tcl
-+++ iwidgets4-4.0.1/installFile.tcl
-@@ -0,0 +1,119 @@
-+#!/bin/sh
-+#
-+# installFile.tcl - a Tcl version of install-sh
-+# that copies a file and preserves its permission bits.
-+# This also optimizes out installation of existing files
-+# that have the same size and time stamp as the source.
-+#
-+# \
-+exec tclsh "$0" ${1+"$@"}
-+
-+set doCopy 0 ;# Rename files instead of copy
-+set doStrip 0 ;# Strip the symbols from installed copy
-+set verbose 0
-+set src ""
-+set dst ""
-+
-+# Process command line arguments, compatible with install-sh
-+
-+for {set i 0} {$i < $argc} {incr i} {
-+ set arg [lindex $argv $i]
-+ switch -- $arg {
-+ -c {
-+ set doCopy 1
-+ }
-+ -m {
-+ incr i
-+ # Assume UNIX standard "644", etc, so force Tcl to think octal
-+ set permissions 0[lindex $argv $i]
-+ }
-+ -o {
-+ incr i
-+ set owner [lindex $argv $i]
-+ }
-+ -g {
-+ incr i
-+ set group [lindex $argv $i]
-+ }
-+ -s {
-+ set doStrip 1
-+ }
-+ -v {
-+ set verbose 1
-+ }
-+ default {
-+ set src $arg
-+ incr i
-+ set dst [lindex $argv $i]
-+ break
-+ }
-+ }
-+}
-+if {[string length $src] == 0} {
-+ puts stderr "$argv0: no input file specified"
-+ exit 1
-+}
-+if {[string length $dst] == 0} {
-+ puts stderr "$argv0: no destination file specified"
-+ exit 1
-+}
-+
-+# Compatibility with CYGNUS-style pathnames
-+regsub {^/(cygdrive)?/(.)/(.*)} $src {\2:/\3} src
-+regsub {^/(cygdrive)?/(.)/(.*)} $dst {\2:/\3} dst
-+
-+if {$verbose && $doStrip} {
-+ puts stderr "Ignoring -s (strip) option for $dst"
-+}
-+if {[file isdirectory $dst]} {
-+ set dst [file join $dst [file tail $src]]
-+}
-+
-+# Temporary file name
-+
-+set dsttmp [file join [file dirname $dst] #inst.[pid]#]
-+
-+# Optimize out install if the file already exists
-+
-+set actions ""
-+if {[file exists $dst] &&
-+ ([file mtime $src] == [file mtime $dst]) &&
-+ ([file size $src] == [file size $dst])} {
-+
-+ # Looks like the same file, so don't bother to copy.
-+ # Set dsttmp in case we still need to tweak mode, group, etc.
-+
-+ set dsttmp $dst
-+ lappend actions "already installed"
-+} else {
-+ file copy -force $src $dsttmp
-+ lappend actions copied
-+}
-+
-+# At this point "$dsttmp" is installed, but might not have the
-+# right permissions and may need to be renamed.
-+
-+
-+foreach attrName {owner group permissions} {
-+ upvar 0 $attrName attr
-+
-+ if {[info exists attr]} {
-+ if {![catch {file attributes $dsttmp -$attrName} dstattr]} {
-+
-+ # This system supports "$attrName" kind of attributes
-+
-+ if {($attr != $dstattr)} {
-+ file attributes $dsttmp -$attrName $attr
-+ lappend actions "set $attrName to $attr"
-+ }
-+ }
-+ }
-+}
-+
-+if {[string compare $dst $dsttmp] != 0} {
-+ file rename -force $dsttmp $dst
-+}
-+if {$verbose} {
-+ puts stderr "$dst: [join $actions ", "]"
-+}
-+exit 0
+ #--------------------------------------------------------------------
+ # Handle the --prefix=... option by defaulting to what Tcl gave.
Modified: iwidgets4/trunk/debian/patches/man.patch
===================================================================
--- iwidgets4/trunk/debian/patches/man.patch 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/patches/man.patch 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1,5 +1,5 @@
---- iwidgets4-4.0.1.orig/doc/notebook.n
-+++ iwidgets4-4.0.1/doc/notebook.n
+--- a/doc/notebook.n
++++ b/doc/notebook.n
@@ -126,7 +126,8 @@
notebook, in order from the first to the last page, until a matching entry
is found. The rules of \fBTcl_StringMatch\fR are used.
@@ -10,8 +10,8 @@
The following commands are possible for notebook widgets:
.TP
\fIpathName\fR \fBadd\fR ?\fIoption value\fR?
---- iwidgets4-4.0.1.orig/doc/scopedobject.n
-+++ iwidgets4-4.0.1/doc/scopedobject.n
+--- a/doc/scopedobject.n
++++ b/doc/scopedobject.n
@@ -11,7 +11,7 @@
.BS
'\" Note: do not modify the .SH NAME line immediately below!
@@ -21,20 +21,20 @@
.SH SYNOPSIS
\fBscopedobject\fI \fIobjName \fR?\fIoptions\fR?
.SH "INHERITANCE"
---- iwidgets4-4.0.1.orig/doc/tabnotebook.n
-+++ iwidgets4-4.0.1/doc/tabnotebook.n
+--- a/doc/tabnotebook.n
++++ b/doc/tabnotebook.n
@@ -374,7 +374,9 @@
used. Pattern is pattern-matched against the label of each page in the
notebook, in order from the first to the last page, until a matching entry
is found. The rules of Tcl_StringMatch are used.
+-'.............................................................................
+.PP
--'.............................................................................
+\&............................................................
+.PP
The following commands are possible for tabnotebook widgets:
.TP
\fIpathName\fR \fBadd\fR ?\fIoption\fR \fIvalue\fR \fIoption\fR \fIvalue\fR ...?
-@@ -484,7 +484,6 @@
+@@ -484,7 +486,6 @@
the tabnotebook.
.RE
.TP
@@ -42,8 +42,8 @@
\fIpathName\fR \fBchildSite\fR ?\fIindex\fR?
If passed no arguments, returns a list of pathNames for all the pages
in the tabnotebook. If the tab notebook is empty, an empty list is returned
---- iwidgets4-4.0.1.orig/doc/tabset.n
-+++ iwidgets4-4.0.1/doc/tabset.n
+--- a/doc/tabset.n
++++ b/doc/tabset.n
@@ -268,7 +268,8 @@
tabset, in order from the first to the last tab, until a matching entry is
found. The rules of Tcl_StringMatch are used.
Modified: iwidgets4/trunk/debian/rules
===================================================================
--- iwidgets4/trunk/debian/rules 2017-10-26 09:00:30 UTC (rev 1890)
+++ iwidgets4/trunk/debian/rules 2017-10-28 08:20:15 UTC (rev 1891)
@@ -1,29 +1,25 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/architecture.mk
+
v = 4
+vv=4.1.0
dtmp=$(shell pwd)/debian/tmp
%:
dh $@
override_dh_auto_configure:
- chmod u+x mkinstalldirs # dpkg-source isn't very smart...
+ #chmod u+x mkinstalldirs # dpkg-source isn't very smart...
dh_auto_configure -- \
--with-tcl=/usr/lib \
- --with-tk=/usr/lib
+ --with-tk=/usr/lib \
+ --with-itcl=/usr/lib/$(DEB_HOST_MULTIARCH)
override_dh_auto_install:
- $(MAKE) INSTALL_ROOT=$(dtmp) \
+ $(MAKE) DESTDIR=$(dtmp) \
MAN_INSTALL_DIR=$(dtmp)/usr/share/man/man3 install
- # Move the libraries
- install -d -m 755 $(dtmp)/usr/share/tcltk/
- mv $(dtmp)/usr/lib/iwidgets$(v)* $(dtmp)/usr/share/tcltk/
- # Remove redundant license file
- rm -f $(dtmp)/usr/share/tcltk/iwidgets$(v)*/license.terms
- # Move the demos
- install -d -m 755 $(dtmp)/usr/share/doc/iwidgets$(v)-doc
- mv $(dtmp)/usr/share/tcltk/iwidgets$(v)*/demos \
- $(dtmp)/usr/share/doc/iwidgets$(v)-doc/
+ #
# Fix up the manpages
cd $(dtmp)/usr/share/man/man3 && \
for i in *.n; do \
@@ -37,7 +33,7 @@
dh_compress -Xdemos
get-orig-source:
- wget -O iwidgets4_4.0.1.orig.tar.gz \
- http://prdownloads.sourceforge.net/incrtcl/iwidgets4.0.1.tar.gz
+ wget -O iwidgets$(v)_$(vv).orig.tar.gz \
+ http://prdownloads.sourceforge.net/incrtcl/iwidgets-$(vv).tar.gz
.PHONY: override_dh_auto_configure override_dh_auto_install override_dh_compress get-orig-source
More information about the Pkg-tcltk-commits
mailing list