[Pkg-tcltk-commits] r479 - in iwidgets4/trunk: . debian

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Feb 2 08:55:26 UTC 2008


Author: sgolovan-guest
Date: 2008-02-02 08:55:25 +0000 (Sat, 02 Feb 2008)
New Revision: 479

Added:
   iwidgets4/trunk/debian/
   iwidgets4/trunk/debian/changelog
   iwidgets4/trunk/debian/compat
   iwidgets4/trunk/debian/control
   iwidgets4/trunk/debian/copyright
   iwidgets4/trunk/debian/iwidgets4-doc.files
   iwidgets4/trunk/debian/iwidgets4.docs
   iwidgets4/trunk/debian/iwidgets4.files
   iwidgets4/trunk/debian/rules
   iwidgets4/trunk/installFile.tcl
   iwidgets4/trunk/mkinstalldirs
Modified:
   iwidgets4/trunk/Makefile.in
   iwidgets4/trunk/configure
   iwidgets4/trunk/configure.in
Log:
[svn-inject] Applying Debian modifications to trunk

Modified: iwidgets4/trunk/Makefile.in
===================================================================
--- iwidgets4/trunk/Makefile.in	2008-02-02 08:55:08 UTC (rev 478)
+++ iwidgets4/trunk/Makefile.in	2008-02-02 08:55:25 UTC (rev 479)
@@ -50,12 +50,6 @@
 # Top-level directory in which to install manual entries:
 MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man/mann
 
-# 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@
 
@@ -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)

Modified: iwidgets4/trunk/configure
===================================================================
--- iwidgets4/trunk/configure	2008-02-02 08:55:08 UTC (rev 478)
+++ iwidgets4/trunk/configure	2008-02-02 08:55:25 UTC (rev 479)
@@ -527,7 +527,7 @@
 fi
 
 
-# RCS: $Id: configure,v 1.18 2001/11/29 20:51:34 smithc Exp $
+# RCS: $Id: configure.in,v 1.9 2001/11/29 20:51:34 smithc Exp $
 
 ITCL_VERSION=3.2
 
@@ -808,18 +808,17 @@
 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
 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; }
-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.))
+#fi
 
 
 #--------------------------------------------------------------------
@@ -828,7 +827,7 @@
 
 
     echo $ac_n "checking for tclsh""... $ac_c" 1>&6
-echo "configure:832: checking for tclsh" >&5
+echo "configure:831: checking for tclsh" >&5
 
     if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

Modified: iwidgets4/trunk/configure.in
===================================================================
--- iwidgets4/trunk/configure.in	2008-02-02 08:55:08 UTC (rev 478)
+++ iwidgets4/trunk/configure.in	2008-02-02 08:55:25 UTC (rev 479)
@@ -63,18 +63,17 @@
 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
 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.))
-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.))
+#fi
 
 
 #--------------------------------------------------------------------


Property changes on: iwidgets4/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: iwidgets4/trunk/debian/changelog
===================================================================
--- iwidgets4/trunk/debian/changelog	                        (rev 0)
+++ iwidgets4/trunk/debian/changelog	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1,34 @@
+iwidgets4 (4.0.1-3) unstable; urgency=low
+
+  * Moved "examples" link from /usr/share/doc to /usr/share/doc/iwidgets4
+    where it was supposed to be in the first place (closes: #215117).
+
+ -- Chris Waters <xtifr at debian.org>  Fri, 10 Oct 2003 10:28:00 -0700
+
+iwidgets4 (4.0.1-2) unstable; urgency=low
+
+  * Fixed build-dependencies to use tcl/tk/itcl/itk -dev packages.
+  * Made debian/rules do chmod +x mkinstalldirs, since dpkg-source isn't
+    actually smart enough to do that on its own (closes: #212308).
+
+ -- Chris Waters <xtifr at debian.org>  Wed,  8 Oct 2003 12:28:39 -0700
+
+iwidgets4 (4.0.1-1) unstable; urgency=low
+
+  * Added "examples" link to demos in /usr/share/doc/iwidgets4.
+  * First actual release to Debian archives.
+
+ -- Chris Waters <xtifr at debian.org>  Sun, 24 Aug 2003 15:10:07 -0700
+
+iwidgets4 (4.0.1-0pre2) unstable; urgency=low
+
+  * Updated iwidgets testing package, still prerelease.  Changed package
+    name.
+
+ -- Chris Waters <xtifr at debian.org>  Tue, 19 Aug 2003 02:25:05 -0700
+
+iwidgets4.0 (4.0.1-0pre1) unstable; urgency=low
+
+  * New iwidgets package, prerelease testing package.
+
+ -- Chris Waters <xtifr at debian.org>  Sat,  9 Aug 2003 10:55:06 -0700

Added: iwidgets4/trunk/debian/compat
===================================================================
--- iwidgets4/trunk/debian/compat	                        (rev 0)
+++ iwidgets4/trunk/debian/compat	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1 @@
+4

Added: iwidgets4/trunk/debian/control
===================================================================
--- iwidgets4/trunk/debian/control	                        (rev 0)
+++ iwidgets4/trunk/debian/control	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1,36 @@
+Source: iwidgets4
+Section: libs
+Priority: optional
+Maintainer: Chris Waters <xtifr at debian.org>
+Build-Depends-Indep: debhelper (>= 4), tcl8.4-dev, tk8.4-dev, itcl3-dev, itk3-dev
+Standards-Version: 3.6.0
+
+Package: iwidgets4
+Priority: optional
+Architecture: all
+Depends: itk3
+Suggests: iwidgets4-doc
+Conflicts: itcl3.0 (<< 3.0.1)
+Description: [incr Widgets] Tk-based widget collection - run-time files
+ [incr Widgets] (or iwidgets) is an object-oriented "mega-widget" set,
+ or collection of high-level user-interface components, based on the
+ popular Tk toolkit and the itcl/itk OO framework.  Iwidgets contains
+ over 50 ready-to-use mega-widgets including calendar, canvasprintdialog,
+ combobox, fileselectiondialog, hyperhelp, notebook, radiobox, spinner,
+ and many more.
+ .
+ Homepage: http://incrtcl.sourceforge.net/iwidgets/
+
+Package: iwidgets4-doc
+Section: doc
+Priority: optional
+Architecture: all
+Suggests: iwidgets4
+Conflicts: iwidgets-dev, iwidgets-doc, itcl3.0-dev (<< 3.0.1)
+Description: [incr Widgets] Tk-based widget collection - man pages
+ [incr Widgets] (or iwidgets) is an object-oriented "mega-widget" set,
+ or collection of high-level user-interface components, based on the
+ popular Tk toolkit and the itcl/itk OO framework.  This package
+ contains man pages documenting the widget classes.
+ .
+ Homepage: http://incrtcl.sourceforge.net/iwidgets/

Added: iwidgets4/trunk/debian/copyright
===================================================================
--- iwidgets4/trunk/debian/copyright	                        (rev 0)
+++ iwidgets4/trunk/debian/copyright	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1,36 @@
+This package was debianized by Chris Waters <xtifr at debian.org> from sources
+found at http://sourceforge.net/project/showfiles.php?group_id=13244
+
+Iwidgets License:
+
+This software is copyrighted by DSC Technologies and private individual 
+contributors.  The copyright holder is specifically listed in the header 
+of each file.  The following terms apply to all files associated with the
+software unless explicitly disclaimed in individual files by private
+contributors.
+
+Copyright 1997 DSC Technologies Corporation
+
+Permission to use, copy, modify, distribute and license this software and 
+its documentation for any purpose, and without fee or written agreement 
+with DSC, is hereby granted, provided that the above copyright notice 
+appears in all copies and that both the copyright notice and warranty 
+disclaimer below appear in supporting documentation, and that the names of
+DSC Technologies Corporation or DSC Communications Corporation not be used 
+in advertising or publicity pertaining to the software without specific, 
+written prior permission.
+
+DSC DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, AND NON-INFRINGEMENT.
+THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, AND THE AUTHORS AND 
+DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE MAINTENANCE, SUPPORT, UPDATES,
+ENHANCEMENTS, OR MODIFICATIONS. IN NO EVENT SHALL DSC BE LIABLE FOR ANY
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER
+RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF
+CONTRACT, NEGLIGENCE OR OTHER TORTUOUS ACTION, ARISING OUT OF OR IN
+CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+RESTRICTED RIGHTS: Use, duplication or disclosure by the government
+is subject to the restrictions as set forth in subparagraph (c) (1) (ii)
+of the Rights in Technical Data and Computer Software Clause as DFARS
+252.227-7013 and FAR 52.227-19.

Added: iwidgets4/trunk/debian/iwidgets4-doc.files
===================================================================
--- iwidgets4/trunk/debian/iwidgets4-doc.files	                        (rev 0)
+++ iwidgets4/trunk/debian/iwidgets4-doc.files	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1 @@
+usr/share/man/man3/*.3iwidgets

Added: iwidgets4/trunk/debian/iwidgets4.docs
===================================================================
--- iwidgets4/trunk/debian/iwidgets4.docs	                        (rev 0)
+++ iwidgets4/trunk/debian/iwidgets4.docs	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1,2 @@
+README
+CHANGES

Added: iwidgets4/trunk/debian/iwidgets4.files
===================================================================
--- iwidgets4/trunk/debian/iwidgets4.files	                        (rev 0)
+++ iwidgets4/trunk/debian/iwidgets4.files	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1 @@
+usr/lib/iwidgets[0-9]*

Added: iwidgets4/trunk/debian/rules
===================================================================
--- iwidgets4/trunk/debian/rules	                        (rev 0)
+++ iwidgets4/trunk/debian/rules	2008-02-02 08:55:25 UTC (rev 479)
@@ -0,0 +1,83 @@
+#!/usr/bin/make -f
+
+v = 4.0
+vv = 4.0.1
+tcltk = 8.4
+itcl = 3.2
+dtmp=$(shell pwd)/debian/tmp
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	chmod u+x mkinstalldirs	# dpkg-source isn't very smart...
+	sh ./configure --prefix=/usr --with-tcl=/usr/lib/tcl$(tcltk) \
+	  --with-tk=/usr/lib/tk$(tcltk) --with-itcl=/usr/lib/itcl$(itcl)
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp
+
+	-$(MAKE) clean
+	-$(MAKE) distclean
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	mkdir -p $(dtmp)
+	$(MAKE) INSTALL_ROOT=$(dtmp) \
+		MAN_INSTALL_DIR=$(dtmp)/usr/share/man/man3 install
+# remove redundant license file
+	rm -f $(dtmp)/usr/lib/iwidgets$(vv)/license.terms
+
+# Fix up the manpages.
+	cd $(dtmp)/usr/share/man/man3 && \
+	  for i in *.n; do \
+	    mv $$i `basename $$i .n`.3iwidget; \
+	  done
+
+# Fix up the demos
+	mkdir -p $(dtmp)/usr/share/iwidgets$(vv)/demos
+	mv $(dtmp)/usr/lib/iwidgets$(vv)/demos/images \
+		$(dtmp)/usr/share/iwidgets$(vv)/demos/images
+	chmod -x $(dtmp)/usr/lib/iwidgets$(vv)/demos/*
+	ln -s ../../../share/iwidgets$(vv)/demos/images \
+		$(dtmp)/usr/lib/iwidgets$(vv)/demos/images
+
+	dh_movefiles
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installchangelogs ChangeLog
+	#dh_installexamples
+	ln -s ../../../lib/iwidgets$(vv)/demos \
+		debian/iwidgets4/usr/share/doc/iwidgets4/examples
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# no arch-dependent packages to build.
+binary-arch:
+
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install


Property changes on: iwidgets4/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: iwidgets4/trunk/installFile.tcl
===================================================================
--- iwidgets4/trunk/installFile.tcl	                        (rev 0)
+++ iwidgets4/trunk/installFile.tcl	2008-02-02 08:55:25 UTC (rev 479)
@@ -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

Added: iwidgets4/trunk/mkinstalldirs
===================================================================
--- iwidgets4/trunk/mkinstalldirs	                        (rev 0)
+++ iwidgets4/trunk/mkinstalldirs	2008-02-02 08:55:25 UTC (rev 479)
@@ -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




More information about the Pkg-tcltk-commits mailing list