[Pkg-tcltk-commits] r459 - in itcl3/trunk: . config debian itcl itk

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Fri Jan 18 13:17:48 UTC 2008


Author: sgolovan-guest
Date: 2008-01-18 13:17:42 +0000 (Fri, 18 Jan 2008)
New Revision: 459

Added:
   itcl3/trunk/debian/
   itcl3/trunk/debian/README.Debian
   itcl3/trunk/debian/changelog
   itcl3/trunk/debian/compat
   itcl3/trunk/debian/control
   itcl3/trunk/debian/copyright
   itcl3/trunk/debian/itcl3-dev.files
   itcl3/trunk/debian/itcl3-doc.docs
   itcl3/trunk/debian/itcl3-doc.files
   itcl3/trunk/debian/itcl3.docs
   itcl3/trunk/debian/itcl3.files
   itcl3/trunk/debian/itk3-dev.files
   itcl3/trunk/debian/itk3-doc.files
   itcl3/trunk/debian/itk3.files
   itcl3/trunk/debian/rules
   itcl3/trunk/debian/shlibs.local
Modified:
   itcl3/trunk/config/installFile.tcl
   itcl3/trunk/configure
   itcl3/trunk/itcl/configure
   itcl3/trunk/itcl/configure.in
   itcl3/trunk/itcl/pkgIndex.tcl.in
   itcl3/trunk/itk/configure
   itcl3/trunk/itk/configure.in
   itcl3/trunk/itk/pkgIndex.tcl.in
Log:
[svn-inject] Applying Debian modifications to trunk

Modified: itcl3/trunk/config/installFile.tcl
===================================================================
--- itcl3/trunk/config/installFile.tcl	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/config/installFile.tcl	2008-01-18 13:17:42 UTC (rev 459)
@@ -6,7 +6,7 @@
 #	that have the same size and time stamp as the source.
 #
 # \
-exec tclsh8.3 "$0" ${1+"$@"}
+exec tclsh "$0" ${1+"$@"}
 
 set doCopy 0	;# Rename files instead of copy
 set doStrip 0	;# Strip the symbols from installed copy

Modified: itcl3/trunk/configure
===================================================================
--- itcl3/trunk/configure	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/configure	2008-01-18 13:17:42 UTC (rev 459)
@@ -522,7 +522,7 @@
 fi
 
 
-# RCS: $Id: configure,v 1.3 2001/06/05 16:34:51 smithc Exp $
+# RCS: $Id: configure.in,v 1.4 2001/06/05 16:27:35 smithc Exp $
 
 ac_aux_dir=
 for ac_dir in config $srcdir/config; do


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

Added: itcl3/trunk/debian/README.Debian
===================================================================
--- itcl3/trunk/debian/README.Debian	                        (rev 0)
+++ itcl3/trunk/debian/README.Debian	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,8 @@
+Earlier packages of itcl/itk were given names like "itcl3.1", and were
+tied to specific versions of tcl/tk.  This version uses the "stubs",
+which is supposed to make it independent of the version of tcl/tk in
+use.  That's the theory.  In practice, because of the threading support
+introduced in tcl8.4, this package needs v8.4, but it should have reasonable
+forward compatibility, so I have changed the package names to itcl3 and itk3.
+
+ -- Chris Waters <xtifr at debian.org>, Sun Aug 24 14:50:10 2003

Added: itcl3/trunk/debian/changelog
===================================================================
--- itcl3/trunk/debian/changelog	                        (rev 0)
+++ itcl3/trunk/debian/changelog	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,51 @@
+itcl3 (3.2.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Update build-deps for xlibs-dev removal; closes: #346711.
+  * Credit and Big Thanks to Justin Pryzby
+    <justinpryzby at users.sourceforge.net> for the patch and testing.
+
+ -- Amaya Rodrigo Sastre <amaya at debian.org>  Thu, 19 Jan 2006 12:54:55 +0100
+
+itcl3 (3.2.1-3) unstable; urgency=low
+
+  * Added conflicts with old version of the insight package, which
+    included its own internal versions of the itcl3.2 libraries
+    (closes: #210199, #210200).
+  * Hack pkgIndex.tcl to load the proper shared library (closes: #21119).
+
+ -- Chris Waters <xtifr at debian.org>  Tue, 16 Sep 2003 15:26:19 -0700
+
+itcl3 (3.2.1-2) unstable; urgency=low
+
+  * Don't override CFLAGS in debian/rules - this is no longer supported
+    upstream, and (among other things), it causes the -fPIC flag to go
+    away (closes: #209153).
+  * Fix debian/rules to properly generate itkConfig.sh (closes: #209175).
+
+ -- Chris Waters <xtifr at debian.org>  Mon,  8 Sep 2003 15:57:12 -0700
+
+itcl3 (3.2.1-1) unstable; urgency=low
+
+  * Changed direct symlink to indirect one to match dependencies (keeps
+    lintian quiet).
+  * Added quick README.Debian to explain package renaming.
+  * First actual release to Debian archives.
+
+ -- Chris Waters <xtifr at debian.org>  Sun, 24 Aug 2003 15:02:03 -0700
+
+itcl3 (3.2.1-0pre2) unstable; urgency=low
+
+  * Second prerelease testing package.  Changed package name(s).  
+  * Removed provides lines for itclsh and itkwish (which no are no longer
+    provided).
+  * Although this itcl *should* work with any tcl8.x, my tests indicate
+    that it actually needs 8.4.
+
+ -- Chris Waters <xtifr at debian.org>  Wed, 20 Aug 2003 13:43:33 -0700
+
+itcl3.2 (3.2.1-0pre1) unstable; urgency=low
+
+  * New itcl package, prerelease testing package.
+
+ -- Chris Waters <xtifr at debian.org>  Mon, 21 Jul 2003 19:57:16 -0700

Added: itcl3/trunk/debian/compat
===================================================================
--- itcl3/trunk/debian/compat	                        (rev 0)
+++ itcl3/trunk/debian/compat	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1 @@
+4

Added: itcl3/trunk/debian/control
===================================================================
--- itcl3/trunk/debian/control	                        (rev 0)
+++ itcl3/trunk/debian/control	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,118 @@
+Source: itcl3
+Section: libs
+Priority: optional
+Maintainer: Chris Waters <xtifr at debian.org>
+Build-Depends: debhelper (>= 4), libxt-dev, tcl8.4-dev, tk8.4-dev
+Standards-Version: 3.6.0
+
+Package: itcl3
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, tcl8.4
+Suggests: itcl3-doc
+Conflicts: insight (<= 5.3+cvs.2003.08.30-1)
+Description: [incr Tcl] OOP extension for Tcl - run-time files
+ [incr Tcl] (or itcl) is a popular object-oriented extension for the
+ embeddable Tcl scripting language.  The name is a play on C++, and
+ itcl has a similar object model, including multiple inheritance and
+ public and private classes and variables.  Unlike most OOP extensions
+ to Tcl, itcl is written in C for speed. 
+ .
+ This package contains everything you need to run itcl scripts and
+ itcl-enabled apps.
+ .
+ Homepage: http://incrtcl.sourceforge.net/
+
+Package: itcl3-dev
+Section: devel
+Priority: optional
+Architecture: any
+Depends: libc6-dev, tcl8.4-dev, itcl3 (= ${Source-Version})
+Conflicts: itcl-dev
+Recommends: itcl3-doc
+Description: [incr Tcl] OOP extension for Tcl - development files
+ [incr Tcl] (or itcl) is a popular object-oriented extension for the
+ embeddable Tcl scripting language.  The name is a play on C++, and
+ itcl has a similar object model, including multiple inheritance and
+ public and private classes and variables.  Unlike most OOP extensions
+ to Tcl, itcl is written in C for speed. 
+ .
+ This package contains the headers and libraries needed to embed or
+ add C extensions to itcl.
+ .
+ Homepage: http://incrtcl.sourceforge.net/
+
+Package: itcl3-doc
+Section: devel
+Priority: optional
+Architecture: all
+Suggests: itcl3
+Conflicts: itcl-dev, itcl-doc
+Provides: itcl-doc
+Description: [incr Tcl] OOP extension for Tcl - manual pages
+ [incr Tcl] (or itcl) is a popular object-oriented extension for the
+ embeddable Tcl scripting language.  The name is a play on C++, and
+ itcl has a similar object model, including multiple inheritance and
+ public and private classes and variables.  Unlike most OOP extensions
+ to Tcl, itcl is written in C for speed. 
+ .
+ This package contains the man pages for the new commands that itcl
+ adds to Tcl.
+ .
+ Homepage: http://incrtcl.sourceforge.net/
+
+Package: itk3
+Section: libs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}, tk8.4, itcl3 (= ${Source-Version})
+Suggests: itk3-doc
+Conflicts: insight (<= 5.3+cvs.2003.08.30-1)
+Description: [incr Tk] OOP extension for Tk - run-time files
+ [incr Tk] (or itk) combines the object-oriented power of [incr Tcl]
+ with the popular Tk graphical toolkit to create a framework for
+ creating mega-widgets.  One such set of mega-widgets is provided by
+ the iwidgets package.
+ .
+ This package contains everything you need to run itk scripts and
+ itk-enabled apps.
+ .
+ Homepage: http://incrtcl.sourceforge.net/
+
+Package: itk3-dev
+Section: devel
+Priority: optional
+Architecture: any
+Depends: libc6-dev, itcl3-dev, tk8.4-dev, itk3 (= ${Source-Version})
+Conflicts: itk-dev, itcl3.0-dev (<< 3.0.1)
+Recommends: itk3-doc
+Description: [incr Tk] OOP extension for Tk - development files
+ [incr Tk] (or itk) combines the object-oriented power of [incr Tcl]
+ with the popular Tk graphical toolkit to create a framework for
+ creating mega-widgets.  One such set of mega-widgets is provided by
+ the iwidgets package.
+ .
+ This package contains the headers and libraries needed to embed or
+ add C extensions to itk.
+ .
+ Homepage: http://incrtcl.sourceforge.net/
+
+Package: itk3-doc
+Section: devel
+Priority: optional
+Architecture: all
+Recommends: itcl3-doc
+Suggests: itk3
+Conflicts: itk-dev, itk-doc
+Provides: itk-doc
+Description: [incr Tk] OOP extension for Tk - manual pages
+ [incr Tk] (or itk) combines the object-oriented power of [incr Tcl]
+ with the popular Tk graphical toolkit to create a framework for
+ creating mega-widgets.  One such set of mega-widgets is provided by
+ the iwidgets package.
+ .
+ This package contains the man pages for the classes provided by itk.
+ .
+ Homepage: http://incrtcl.sourceforge.net/
+

Added: itcl3/trunk/debian/copyright
===================================================================
--- itcl3/trunk/debian/copyright	                        (rev 0)
+++ itcl3/trunk/debian/copyright	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,88 @@
+This package was debianized by Chris Waters <xtifr at debian.org> from sources
+found at http://sourceforge.net/project/showfiles.php?group_id=13244
+
+Itcl/Itk License:
+
+This software is copyrighted by Cadence Design Systems, Inc., and other
+parties.  The following terms apply to all files associated with the
+software unless explicitly disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, 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.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 
+
+-----------------------------------------------------------------------
+ Following is the original agreement for the Tcl/Tk software from
+ Sun Microsystems.
+-----------------------------------------------------------------------
+
+This software is copyrighted by the Regents of the University of
+California, Sun Microsystems, Inc., and other parties.  The following
+terms apply to all files associated with the software unless explicitly
+disclaimed in individual files.
+
+The authors hereby grant permission to use, copy, modify, distribute,
+and license this software and its documentation for any purpose, provided
+that existing copyright notices are retained in all copies and that this
+notice is included verbatim in any distributions. No written agreement,
+license, or royalty fee is required for any of the authorized uses.
+Modifications to this software may be copyrighted by their authors
+and need not follow the licensing terms described here, provided that
+the new terms are clearly indicated on the first page of each file where
+they apply.
+
+IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY PARTY
+FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, OR ANY
+DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+
+THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, 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.
+
+GOVERNMENT USE: If you are acquiring this software on behalf of the
+U.S. government, the Government shall have only "Restricted Rights"
+in the software and related documentation as defined in the Federal 
+Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2).  If you
+are acquiring the software on behalf of the Department of Defense, the
+software shall be classified as "Commercial Computer Software" and the
+Government shall have only "Restricted Rights" as defined in Clause
+252.227-7013 (c) (1) of DFARs.  Notwithstanding the foregoing, the
+authors grant the U.S. Government and others acting in its behalf
+permission to use and distribute the software in accordance with the
+terms specified in this license. 

Added: itcl3/trunk/debian/itcl3-dev.files
===================================================================
--- itcl3/trunk/debian/itcl3-dev.files	                        (rev 0)
+++ itcl3/trunk/debian/itcl3-dev.files	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,4 @@
+usr/include/tcl8.4/itcl*
+usr/lib/libitcl*.a
+usr/lib/libitcl*.so
+usr/lib/itcl*/*.sh

Added: itcl3/trunk/debian/itcl3-doc.docs
===================================================================
--- itcl3/trunk/debian/itcl3-doc.docs	                        (rev 0)
+++ itcl3/trunk/debian/itcl3-doc.docs	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,4 @@
+README
+INCOMPATIBLE
+TODO
+CHANGES

Added: itcl3/trunk/debian/itcl3-doc.files
===================================================================
--- itcl3/trunk/debian/itcl3-doc.files	                        (rev 0)
+++ itcl3/trunk/debian/itcl3-doc.files	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1 @@
+usr/share/man/man3/*.3itcl

Added: itcl3/trunk/debian/itcl3.docs
===================================================================
--- itcl3/trunk/debian/itcl3.docs	                        (rev 0)
+++ itcl3/trunk/debian/itcl3.docs	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,4 @@
+README
+INCOMPATIBLE
+TODO
+CHANGES

Added: itcl3/trunk/debian/itcl3.files
===================================================================
--- itcl3/trunk/debian/itcl3.files	                        (rev 0)
+++ itcl3/trunk/debian/itcl3.files	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,2 @@
+usr/lib/itcl[0-9]*
+usr/lib/libitcl*.so.*

Added: itcl3/trunk/debian/itk3-dev.files
===================================================================
--- itcl3/trunk/debian/itk3-dev.files	                        (rev 0)
+++ itcl3/trunk/debian/itk3-dev.files	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,4 @@
+usr/include/tcl8.4/itk*
+usr/lib/libitk*.a
+usr/lib/libitk*.so
+usr/lib/itk*/*.sh

Added: itcl3/trunk/debian/itk3-doc.files
===================================================================
--- itcl3/trunk/debian/itk3-doc.files	                        (rev 0)
+++ itcl3/trunk/debian/itk3-doc.files	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1 @@
+usr/share/man/man3/*.3itk

Added: itcl3/trunk/debian/itk3.files
===================================================================
--- itcl3/trunk/debian/itk3.files	                        (rev 0)
+++ itcl3/trunk/debian/itk3.files	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,2 @@
+usr/lib/itk[0-9]*
+usr/lib/libitk*.so.*

Added: itcl3/trunk/debian/rules
===================================================================
--- itcl3/trunk/debian/rules	                        (rev 0)
+++ itcl3/trunk/debian/rules	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,143 @@
+#!/usr/bin/make -f
+
+v = 3.2
+vv = 3.2.1
+tcltk = 8.4
+dtmp=$(shell pwd)/debian/tmp
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	sh ./configure --prefix=/usr --includedir=/usr/include/tcl$(tcltk) \
+	  --enable-shared --enable-threads --with-tcl=/usr/lib/tcl$(tcltk) \
+	  --with-tk=/usr/lib/tk$(tcltk)
+	$(MAKE)
+# Build the static library.
+	cd itcl && \
+	  ar cr libitcl$(v).a *.o && \
+	  ar d libitcl$(v).a itclStubLib.o tclAppInit.o && \
+	  ranlib libitcl$(v).a
+	cd itk && \
+	  ar cr libitk$(v).a *.o && \
+	  ar d libitk$(v).a itkStubLib.o tkAppInit.o && \
+	  ranlib libitk$(v).a
+
+	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 debian/tmp
+	$(MAKE) prefix=$(dtmp)/usr exec_prefix=$(dtmp)/usr \
+		includedir=$(dtmp)/usr/include/tcl$(tcltk) install
+
+# Fix up the itcl libraries.
+	cp itcl/libitcl$(v).a $(dtmp)/usr/lib
+	mv $(dtmp)/usr/lib/libitcl$(v).so $(dtmp)/usr/lib/libitcl$(v).so.1
+	ln -sf libitcl$(v).so.1 $(dtmp)/usr/lib/libitcl$(v).so
+#  (itclConfig.sh doesn't get installed at all, so we install it here)
+	perl -p \
+	  -e "s|^(ITCL_BUILD_LIB_SPEC)=.*$$|\1='-L/usr/lib -litcl$(v)'|;" \
+	  -e "s|^(ITCL_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib -litclstub$(v)'|;" \
+	  -e "s|^(ITCL_SRC_DIR)=.*$$|\1='/usr/include/tcl$(tcltk)/itcl-private'|" \
+	  itcl/itclConfig.sh > $(dtmp)/usr/lib/itcl$(v)/itclConfig.sh
+#	mv $(dtmp)/usr/lib/itcl*.sh $(dtmp)/usr/lib/itcl$(v)
+
+# Fix up the itk libraries.
+	cp itk/libitk$(v).a $(dtmp)/usr/lib
+	mv $(dtmp)/usr/lib/libitk$(v).so $(dtmp)/usr/lib/libitk$(v).so.1
+	ln -sf libitk$(v).so.1 $(dtmp)/usr/lib/libitk$(v).so
+#  (itkConfig.sh doesn't get installed at all, so we install it here)
+	perl -p \
+	  -e "s|^(ITK_BUILD_LIB_SPEC)=.*$$|\1='-L/usr/lib -litk$(v)'|;" \
+	  -e "s|^(ITK_BUILD_STUB_LIB_SPEC)=.*$$|\1='-L/usr/lib -litkstub$(v)'|;" \
+	  -e "s|^(ITK_SRC_DIR)=.*$$|\1='/usr/include/tcl$(tcltk)/itk-private'|" \
+	  itk/itkConfig.sh > $(dtmp)/usr/lib/itk$(v)/itkConfig.sh
+#	mv $(dtmp)/usr/lib/itk*.sh $(dtmp)/usr/lib/itk$(v)
+
+# Fix up the include files.
+	install -d $(dtmp)/usr/include/tcl$(tcltk)/itcl-private/generic
+	cp itcl/generic/*.h $(dtmp)/usr/include/tcl$(tcltk)/itcl-private/generic
+	install -d $(dtmp)/usr/include/tcl$(tcltk)/itk-private/generic
+	cp itk/generic/*.h $(dtmp)/usr/include/tcl$(tcltk)/itk-private/generic
+
+# Fix up the manpages.
+# - just remove the installed ones, they're all mixed together
+	rm -r $(dtmp)/usr/man
+	mkdir -p $(dtmp)/usr/share/man/man3
+
+	cp itcl/doc/*.n $(dtmp)/usr/share/man/man3
+	cd $(dtmp)/usr/share/man/man3 && \
+	  for i in *.n ; do \
+	    mv $$i `echo $$i | sed -e 's/\.n/\.3itcl/'` ; \
+          done
+	cp itk/doc/*.n $(dtmp)/usr/share/man/man3
+	cd $(dtmp)/usr/share/man/man3 && \
+	  for i in *.n ; do \
+	    mv $$i `echo $$i | sed -e 's/\.n/\.3itk/'` ; \
+          done
+
+	dh_movefiles
+
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i
+	#dh_installexamples -i
+	dh_installchangelogs -pitcl3-doc -pitk3-doc ChangeLog
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a
+	dh_installchangelogs -a ChangeLog
+
+# hack up the /usr/doc links for dependent packages
+	for f in itcl3-dev itk3 ; do \
+	  rm -rf debian/$${f}/usr/share/doc/$${f} ; \
+	  ln -sf itcl3 debian/$${f}/usr/share/doc/$${f} ; \
+	done
+	rm -rf debian/itk3-dev/usr/share/doc/itk3-dev
+	ln -sf itk3 debian/itk3-dev/usr/share/doc/itk3-dev
+
+	dh_strip -a
+	dh_compress -a
+	dh_fixperms -a
+	dh_makeshlibs -pitcl3 -V 'itcl3'
+	dh_makeshlibs -pitk3 -V 'itk3'
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+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: itcl3/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
   + *

Added: itcl3/trunk/debian/shlibs.local
===================================================================
--- itcl3/trunk/debian/shlibs.local	                        (rev 0)
+++ itcl3/trunk/debian/shlibs.local	2008-01-18 13:17:42 UTC (rev 459)
@@ -0,0 +1,2 @@
+libitcl3.2	1	
+libitk3.2	1	

Modified: itcl3/trunk/itcl/configure
===================================================================
--- itcl3/trunk/itcl/configure	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/itcl/configure	2008-01-18 13:17:42 UTC (rev 459)
@@ -1088,7 +1088,7 @@
   if { (eval echo configure:1089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.$ac_ext | *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1126,6 +1126,36 @@
 case "`uname -s`" in
     *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
 	CYGPATH="cygpath -w"
+	# Extract the first word of "cygpath", so it can be a program name with args.
+set dummy cygpath; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1133: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CYGPATH"; then
+  ac_cv_prog_CYGPATH="$CYGPATH" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CYGPATH="cygpath -w"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo"
+fi
+fi
+CYGPATH="$ac_cv_prog_CYGPATH"
+if test -n "$CYGPATH"; then
+  echo "$ac_t""$CYGPATH" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 	RELPATH=".. .. bin"
     ;;
     *)
@@ -1182,7 +1212,7 @@
 fi
 
 	echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
-echo "configure:1186: checking for Tcl configuration" >&5
+echo "configure:1216: checking for Tcl configuration" >&5
 	if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1252,7 +1282,7 @@
 
 
     echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1256: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "configure:1286: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
 
     if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
         echo "$ac_t""loading" 1>&6
@@ -1300,7 +1330,7 @@
 #SC_PUBLIC_TCL_HEADERS
 
     echo $ac_n "checking for Tcl private include files""... $ac_c" 1>&6
-echo "configure:1304: checking for Tcl private include files" >&5
+echo "configure:1334: checking for Tcl private include files" >&5
 
     case "`uname -s`" in
 	*win32* | *WIN32* | *CYGWIN_NT* |*CYGWIN_98*|*CYGWIN_95*)
@@ -1386,7 +1416,7 @@
 
 
     echo $ac_n "checking for building with threads""... $ac_c" 1>&6
-echo "configure:1390: checking for building with threads" >&5
+echo "configure:1420: checking for building with threads" >&5
     # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
@@ -1413,7 +1443,7 @@
 		;;
 	    *)
 		echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:1417: checking for pthread_mutex_init in -lpthread" >&5
+echo "configure:1447: checking for pthread_mutex_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1421,7 +1451,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1425 "configure"
+#line 1455 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1432,7 +1462,7 @@
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1478,7 +1508,7 @@
 
 
     echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1482: checking how to build libraries" >&5
+echo "configure:1512: checking how to build libraries" >&5
     # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -1521,6 +1551,8 @@
 SHLIB_LD=${TCL_SHLIB_LD}
 STLIB_LD=${TCL_STLIB_LD}
 SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
+# this last one is hard-coded for Debian
+SHLIB_LDFLAGS="-Wl,-soname,\$@.1"
 
 
 
@@ -1545,7 +1577,7 @@
     esac
 
     echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:1549: checking for build with symbols" >&5
+echo "configure:1581: checking for build with symbols" >&5
     # Check whether --enable-symbols or --disable-symbols was given.
 if test "${enable_symbols+set}" = set; then
   enableval="$enable_symbols"
@@ -1691,7 +1723,7 @@
 
 
     echo $ac_n "checking for tclsh""... $ac_c" 1>&6
-echo "configure:1695: checking for tclsh" >&5
+echo "configure:1727: checking for tclsh" >&5
 
     if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

Modified: itcl3/trunk/itcl/configure.in
===================================================================
--- itcl3/trunk/itcl/configure.in	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/itcl/configure.in	2008-01-18 13:17:42 UTC (rev 459)
@@ -232,6 +232,8 @@
 SHLIB_LD=${TCL_SHLIB_LD}
 STLIB_LD=${TCL_STLIB_LD}
 SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
+# this last one is hard-coded for Debian
+SHLIB_LDFLAGS="-Wl,-soname,\$@.1"
 
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)

Modified: itcl3/trunk/itcl/pkgIndex.tcl.in
===================================================================
--- itcl3/trunk/itcl/pkgIndex.tcl.in	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/itcl/pkgIndex.tcl.in	2008-01-18 13:17:42 UTC (rev 459)
@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Itcl @VERSION@ [list load [file join $dir @RELPATH@ "@itcl_LIB_FILE@"] Itcl]
+package ifneeded Itcl @VERSION@ [list load [file join $dir @RELPATH@ "@itcl_LIB_FILE at .1"] Itcl]

Modified: itcl3/trunk/itk/configure
===================================================================
--- itcl3/trunk/itk/configure	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/itk/configure	2008-01-18 13:17:42 UTC (rev 459)
@@ -1092,7 +1092,7 @@
   if { (eval echo configure:1093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.c | *.o | *.obj) ;;
+      *.$ac_ext | *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1126,6 +1126,36 @@
 case "`uname -s`" in
     *win32* | *WIN32* | *CYGWIN_NT*|*CYGWIN_98*|*CYGWIN_95*)
 	CYGPATH="cygpath -w"
+	# Extract the first word of "cygpath", so it can be a program name with args.
+set dummy cygpath; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1133: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_CYGPATH'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$CYGPATH"; then
+  ac_cv_prog_CYGPATH="$CYGPATH" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_CYGPATH="cygpath -w"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_prog_CYGPATH" && ac_cv_prog_CYGPATH="echo"
+fi
+fi
+CYGPATH="$ac_cv_prog_CYGPATH"
+if test -n "$CYGPATH"; then
+  echo "$ac_t""$CYGPATH" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
 	RELPATH=".. .. bin"
     ;;
     *)
@@ -1182,7 +1212,7 @@
 fi
 
 	echo $ac_n "checking for Tcl configuration""... $ac_c" 1>&6
-echo "configure:1186: checking for Tcl configuration" >&5
+echo "configure:1216: checking for Tcl configuration" >&5
 	if eval "test \"`echo '$''{'ac_cv_c_tclconfig'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1252,7 +1282,7 @@
 
 
     echo $ac_n "checking for existence of $TCL_BIN_DIR/tclConfig.sh""... $ac_c" 1>&6
-echo "configure:1256: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
+echo "configure:1286: checking for existence of $TCL_BIN_DIR/tclConfig.sh" >&5
 
     if test -f "$TCL_BIN_DIR/tclConfig.sh" ; then
         echo "$ac_t""loading" 1>&6
@@ -1307,7 +1337,7 @@
 fi
 
 	echo $ac_n "checking for Tk configuration""... $ac_c" 1>&6
-echo "configure:1311: checking for Tk configuration" >&5
+echo "configure:1341: checking for Tk configuration" >&5
 	if eval "test \"`echo '$''{'ac_cv_c_tkconfig'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1375,7 +1405,7 @@
 
 
     echo $ac_n "checking for existence of $TK_BIN_DIR/tkConfig.sh""... $ac_c" 1>&6
-echo "configure:1379: checking for existence of $TK_BIN_DIR/tkConfig.sh" >&5
+echo "configure:1409: checking for existence of $TK_BIN_DIR/tkConfig.sh" >&5
 
     if test -f "$TK_BIN_DIR/tkConfig.sh" ; then
         echo "$ac_t""loading" 1>&6
@@ -1413,7 +1443,7 @@
 #--------------------------------------------------------------------
 
 echo $ac_n "checking for name if Itcl stub library""... $ac_c" 1>&6
-echo "configure:1417: checking for name if Itcl stub library" >&5
+echo "configure:1447: checking for name if Itcl stub library" >&5
 if eval "test \"`echo '$''{'ac_cv_itclstub_LIB_FILE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1430,7 +1460,7 @@
 
 
     echo $ac_n "checking for tkstub library""... $ac_c" 1>&6
-echo "configure:1434: checking for tkstub library" >&5
+echo "configure:1464: checking for tkstub library" >&5
 
     # Look in exec-prefix and prefix for the library.  If neither of
     # these were specified, look in libdir.  It doesn't matter if libdir
@@ -1490,7 +1520,7 @@
 
 
     echo $ac_n "checking for itclstub library""... $ac_c" 1>&6
-echo "configure:1494: checking for itclstub library" >&5
+echo "configure:1524: checking for itclstub library" >&5
 
     # Look in exec-prefix and prefix for the library.  If neither of
     # these were specified, look in libdir.  It doesn't matter if libdir
@@ -1561,7 +1591,7 @@
 #SC_PUBLIC_TCL_HEADERS
 
     echo $ac_n "checking for Tcl private include files""... $ac_c" 1>&6
-echo "configure:1565: checking for Tcl private include files" >&5
+echo "configure:1595: checking for Tcl private include files" >&5
 
     case "`uname -s`" in
 	*win32* | *WIN32* | *CYGWIN_NT* |*CYGWIN_98*|*CYGWIN_95*)
@@ -1602,7 +1632,7 @@
 #SC_PUBLIC_TK_HEADERS
 
     echo $ac_n "checking for Tk private include files""... $ac_c" 1>&6
-echo "configure:1606: checking for Tk private include files" >&5
+echo "configure:1636: checking for Tk private include files" >&5
 
     case "`uname -s`" in
 	*win32* | *WIN32* | *CYGWIN_NT* |*CYGWIN_98*|*CYGWIN_95*)
@@ -1682,7 +1712,7 @@
 
 
     echo $ac_n "checking for building with threads""... $ac_c" 1>&6
-echo "configure:1686: checking for building with threads" >&5
+echo "configure:1716: checking for building with threads" >&5
     # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
@@ -1709,7 +1739,7 @@
 		;;
 	    *)
 		echo $ac_n "checking for pthread_mutex_init in -lpthread""... $ac_c" 1>&6
-echo "configure:1713: checking for pthread_mutex_init in -lpthread" >&5
+echo "configure:1743: checking for pthread_mutex_init in -lpthread" >&5
 ac_lib_var=`echo pthread'_'pthread_mutex_init | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1717,7 +1747,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpthread  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1721 "configure"
+#line 1751 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1728,7 +1758,7 @@
 pthread_mutex_init()
 ; return 0; }
 EOF
-if { (eval echo configure:1732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1774,7 +1804,7 @@
 
 
     echo $ac_n "checking how to build libraries""... $ac_c" 1>&6
-echo "configure:1778: checking how to build libraries" >&5
+echo "configure:1808: checking how to build libraries" >&5
     # Check whether --enable-shared or --disable-shared was given.
 if test "${enable_shared+set}" = set; then
   enableval="$enable_shared"
@@ -1817,6 +1847,8 @@
 SHLIB_LD=${TCL_SHLIB_LD}
 STLIB_LD=${TCL_STLIB_LD}
 SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
+# this last one is hard-coded for Debian
+SHLIB_LDFLAGS="-Wl,-soname,\$@.1"
 
 
 
@@ -1841,7 +1873,7 @@
     esac
 
     echo $ac_n "checking for build with symbols""... $ac_c" 1>&6
-echo "configure:1845: checking for build with symbols" >&5
+echo "configure:1877: checking for build with symbols" >&5
     # Check whether --enable-symbols or --disable-symbols was given.
 if test "${enable_symbols+set}" = set; then
   enableval="$enable_symbols"
@@ -1983,7 +2015,7 @@
 
 
     echo $ac_n "checking for tclsh""... $ac_c" 1>&6
-echo "configure:1987: checking for tclsh" >&5
+echo "configure:2019: checking for tclsh" >&5
 
     if eval "test \"`echo '$''{'ac_cv_path_tclsh'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2020,7 +2052,7 @@
 
 
     echo $ac_n "checking for wish""... $ac_c" 1>&6
-echo "configure:2024: checking for wish" >&5
+echo "configure:2056: checking for wish" >&5
 
     if eval "test \"`echo '$''{'ac_cv_path_wish'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

Modified: itcl3/trunk/itk/configure.in
===================================================================
--- itcl3/trunk/itk/configure.in	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/itk/configure.in	2008-01-18 13:17:42 UTC (rev 459)
@@ -269,6 +269,8 @@
 SHLIB_LD=${TCL_SHLIB_LD}
 STLIB_LD=${TCL_STLIB_LD}
 SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
+# this last one is hard-coded for Debian
+SHLIB_LDFLAGS="-Wl,-soname,\$@.1"
 
 AC_SUBST(CFLAGS_DEBUG)
 AC_SUBST(CFLAGS_OPTIMIZE)

Modified: itcl3/trunk/itk/pkgIndex.tcl.in
===================================================================
--- itcl3/trunk/itk/pkgIndex.tcl.in	2008-01-18 13:16:08 UTC (rev 458)
+++ itcl3/trunk/itk/pkgIndex.tcl.in	2008-01-18 13:17:42 UTC (rev 459)
@@ -1,3 +1,3 @@
 # Tcl package index file, version 1.0
 
-package ifneeded Itk @VERSION@ [list load [file join $dir @RELPATH@ "@itk_LIB_FILE@"] Itk]
+package ifneeded Itk @VERSION@ [list load [file join $dir @RELPATH@ "@itk_LIB_FILE at .1"] Itk]




More information about the Pkg-tcltk-commits mailing list