[Pkg-tcltk-commits] r982 - in tcl8.5/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Tue Nov 17 19:43:23 UTC 2009 

Author: sgolovan
Date: 2009-11-17 19:43:23 +0000 (Tue, 17 Nov 2009)
New Revision: 982

Added:
   tcl8.5/trunk/debian/README.source
Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/control
   tcl8.5/trunk/debian/patches/confsearch.diff
   tcl8.5/trunk/debian/patches/manpages.diff
   tcl8.5/trunk/debian/patches/non-linux.diff
   tcl8.5/trunk/debian/patches/rpath.diff
   tcl8.5/trunk/debian/patches/tcllibrary.diff
   tcl8.5/trunk/debian/patches/tclpackagepath.diff
   tcl8.5/trunk/debian/patches/tclport.diff
   tcl8.5/trunk/debian/patches/tclprivate.diff
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * New upstream release (closes: #548656).
  * Added libtommath headers to private Tcl headers directory.
  * Added README.source file wich explains how to get patched source tree from
    the original tarball and set of patches in debian/patches.
  * Bumped standards version to 3.8.3.


Added: tcl8.5/trunk/debian/README.source
===================================================================
--- tcl8.5/trunk/debian/README.source	                        (rev 0)
+++ tcl8.5/trunk/debian/README.source	2009-11-17 19:43:23 UTC (rev 982)
@@ -0,0 +1,8 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get detailed instructions on how to apply the series of patches
+and modify them, please read /usr/share/doc/quilt/README.source
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 05 Sep 2009 11:33:56 +0400

Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/changelog	2009-11-17 19:43:23 UTC (rev 982)
@@ -1,8 +1,12 @@
-tcl8.5 (8.5.7-2) UNRELEASED; urgency=low
+tcl8.5 (8.5.8-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release (closes: #548656).
+  * Added libtommath headers to private Tcl headers directory.
+  * Added README.source file wich explains how to get patched source tree from
+    the original tarball and set of patches in debian/patches.
+  * Bumped standards version to 3.8.3.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 18 Apr 2009 09:39:50 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Tue, 17 Nov 2009 22:05:26 +0300
 
 tcl8.5 (8.5.7-1) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/control
===================================================================
--- tcl8.5/trunk/debian/control	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/control	2009-11-17 19:43:23 UTC (rev 982)
@@ -4,7 +4,7 @@
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Chris Waters <xtifr at debian.org>, Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 5.0.0), quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.3
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.5

Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/confsearch.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.5-8.5.7.orig/unix/tcl.m4
-+++ tcl8.5-8.5.7/unix/tcl.m4
+--- tcl8.5-8.5.8.orig/unix/tcl.m4
++++ tcl8.5-8.5.8/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tcl8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.5/trunk/debian/patches/manpages.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/manpages.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.5-8.5.7.orig/unix/installManPage
-+++ tcl8.5-8.5.7/unix/installManPage
+--- tcl8.5-8.5.8.orig/unix/installManPage
++++ tcl8.5-8.5.8/unix/installManPage
 @@ -48,8 +48,16 @@
      *.n) SECTION=n ;;
  esac

Modified: tcl8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.5/trunk/debian/patches/non-linux.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/non-linux.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tcl8.5-8.5.7.orig/unix/configure
-+++ tcl8.5-8.5.7/unix/configure
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
 @@ -6536,6 +6536,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,7 +13,7 @@
  	    fi
  	fi
  
-@@ -7339,7 +7342,7 @@
+@@ -7340,7 +7343,7 @@
  fi
  
  	    ;;
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tcl8.5-8.5.7.orig/unix/Makefile.in
-+++ tcl8.5-8.5.7/unix/Makefile.in
+--- tcl8.5-8.5.8.orig/unix/Makefile.in
++++ tcl8.5-8.5.8/unix/Makefile.in
 @@ -172,6 +172,7 @@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
@@ -32,8 +32,8 @@
  TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
---- tcl8.5-8.5.7.orig/unix/tcl.m4
-+++ tcl8.5-8.5.7/unix/tcl.m4
+--- tcl8.5-8.5.8.orig/unix/tcl.m4
++++ tcl8.5-8.5.8/unix/tcl.m4
 @@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -44,7 +44,7 @@
  	    fi
  	fi
      ])
-@@ -1421,7 +1424,7 @@
+@@ -1422,7 +1425,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tcl8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/rpath.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/rpath.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -1,9 +1,9 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.5-8.5.7.orig/unix/configure
-+++ tcl8.5-8.5.7/unix/configure
-@@ -7350,6 +7350,9 @@
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
+@@ -7351,6 +7351,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -13,8 +13,8 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tcl8.5-8.5.7.orig/unix/Makefile.in
-+++ tcl8.5-8.5.7/unix/Makefile.in
+--- tcl8.5-8.5.8.orig/unix/Makefile.in
++++ tcl8.5-8.5.8/unix/Makefile.in
 @@ -729,7 +729,10 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
@@ -27,9 +27,9 @@
  	@if test "$(TCL_BUILD_EXP_FILE)" != ""; then \
  	    echo "Installing $(TCL_EXP_FILE) to $(LIB_INSTALL_DIR)/"; \
  	    $(INSTALL_DATA) $(TCL_BUILD_EXP_FILE) \
---- tcl8.5-8.5.7.orig/unix/tcl.m4
-+++ tcl8.5-8.5.7/unix/tcl.m4
-@@ -1432,6 +1432,9 @@
+--- tcl8.5-8.5.8.orig/unix/tcl.m4
++++ tcl8.5-8.5.8/unix/tcl.m4
+@@ -1433,6 +1433,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  

Modified: tcl8.5/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tcllibrary.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -1,6 +1,6 @@
---- tcl8.5-8.5.7.orig/unix/configure
-+++ tcl8.5-8.5.7/unix/configure
-@@ -18807,7 +18807,7 @@
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
+@@ -18808,7 +18808,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,8 +9,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.7.orig/unix/configure.in
-+++ tcl8.5-8.5.7/unix/configure.in
+--- tcl8.5-8.5.8.orig/unix/configure.in
++++ tcl8.5-8.5.8/unix/configure.in
 @@ -734,7 +734,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
@@ -20,8 +20,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.7.orig/library/init.tcl
-+++ tcl8.5-8.5.7/library/init.tcl
+--- tcl8.5-8.5.8.orig/library/init.tcl
++++ tcl8.5-8.5.8/library/init.tcl
 @@ -48,7 +48,7 @@
  }
  namespace eval tcl {

Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -2,9 +2,9 @@
 without adding /usr/lib to it. It helps to put the policy compliant value to
 ::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
 
---- tcl8.5-8.5.7.orig/unix/configure
-+++ tcl8.5-8.5.7/unix/configure
-@@ -18944,9 +18944,9 @@
+--- tcl8.5-8.5.8.orig/unix/configure
++++ tcl8.5-8.5.8/unix/configure
+@@ -18945,9 +18945,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
@@ -16,8 +16,8 @@
  fi
  
  #--------------------------------------------------------------------
---- tcl8.5-8.5.7.orig/unix/configure.in
-+++ tcl8.5-8.5.7/unix/configure.in
+--- tcl8.5-8.5.8.orig/unix/configure.in
++++ tcl8.5-8.5.8/unix/configure.in
 @@ -833,9 +833,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"

Modified: tcl8.5/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclport.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/tclport.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -1,8 +1,8 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
 
---- tcl8.5-8.5.7.orig/generic/tclPort.h
-+++ tcl8.5-8.5.7/generic/tclPort.h
+--- tcl8.5-8.5.8.orig/generic/tclPort.h
++++ tcl8.5-8.5.8/generic/tclPort.h
 @@ -24,7 +24,7 @@
  #if defined(__WIN32__)
  #   include "tclWinPort.h"

Modified: tcl8.5/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclprivate.diff	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/patches/tclprivate.diff	2009-11-17 19:43:23 UTC (rev 982)
@@ -2,8 +2,8 @@
 with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tcl headers there).
 
---- tcl8.5-8.5.7.orig/unix/tclConfig.sh.in
-+++ tcl8.5-8.5.7/unix/tclConfig.sh.in
+--- tcl8.5-8.5.8.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.8/unix/tclConfig.sh.in
 @@ -111,7 +111,7 @@
  
  # String to pass to linker to pick up the Tcl library from its

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2009-11-16 09:04:54 UTC (rev 981)
+++ tcl8.5/trunk/debian/rules	2009-11-17 19:43:23 UTC (rev 982)
@@ -108,6 +108,8 @@
 	cp unix/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/unix
 	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/compat
 	cp compat/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/compat
+	install -d debian/tmp/usr/include/tcl$(v)/tcl-private/libtommath
+	cp libtommath/*.h debian/tmp/usr/include/tcl$(v)/tcl-private/libtommath
 	# Fix up the manpages.
 	cd debian/tmp/usr/share/man/man1 && \
 	  zcat tclsh.1.gz | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
@@ -184,8 +186,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.5_8.5.7.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5.7-src.tar.gz
+	wget -O tcl8.5_8.5.8.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.5.8-src.tar.gz
 
 .PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source

More information about the Pkg-tcltk-commits mailing list