[Pkg-tcltk-commits] r983 - in tk8.5/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Tue Nov 17 19:44:54 UTC 2009 

Author: sgolovan
Date: 2009-11-17 19:44:54 +0000 (Tue, 17 Nov 2009)
New Revision: 983

Modified:
   tk8.5/trunk/debian/changelog
   tk8.5/trunk/debian/patches/confsearch.diff
   tk8.5/trunk/debian/patches/manpages.diff
   tk8.5/trunk/debian/patches/non-linux.diff
   tk8.5/trunk/debian/patches/rpath.diff
   tk8.5/trunk/debian/patches/tklibrary.diff
   tk8.5/trunk/debian/patches/tkport.diff
   tk8.5/trunk/debian/patches/tkprivate.diff
   tk8.5/trunk/debian/rules
Log:
[tk8.5]
  * New upstream release.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/changelog	2009-11-17 19:44:54 UTC (rev 983)
@@ -1,6 +1,6 @@
-tk8.5 (8.5.7-3) UNRELEASED; urgency=low
+tk8.5 (8.5.8-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
 
  -- Sergei Golovan <sgolovan at debian.org>  Fri, 30 Oct 2009 11:36:17 +0300
 

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2009-11-17 19:44:54 UTC (rev 983)
@@ -2,9 +2,9 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.5-8.5.7.orig/unix/configure
-+++ tk8.5-8.5.7/unix/configure
-@@ -1430,6 +1430,7 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -1431,6 +1431,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
@@ -12,8 +12,8 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
---- tk8.5-8.5.7.orig/unix/tcl.m4
-+++ tk8.5-8.5.7/unix/tcl.m4
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.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: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/patches/manpages.diff	2009-11-17 19:44:54 UTC (rev 983)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.5-8.5.7.orig/unix/installManPage
-+++ tk8.5-8.5.7/unix/installManPage
+--- tk8.5-8.5.8.orig/unix/installManPage
++++ tk8.5-8.5.8/unix/installManPage
 @@ -51,7 +51,16 @@
      }' $MANPAGE`
  

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2009-11-17 19:44:54 UTC (rev 983)
@@ -1,9 +1,9 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.5-8.5.7.orig/unix/configure
-+++ tk8.5-8.5.7/unix/configure
-@@ -4741,6 +4741,9 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -4742,6 +4742,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -13,7 +13,7 @@
  	    fi
  	fi
  
-@@ -5544,7 +5547,7 @@
+@@ -5546,7 +5549,7 @@
  fi
  
  	    ;;
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tk8.5-8.5.7.orig/unix/tcl.m4
-+++ tk8.5-8.5.7/unix/tcl.m4
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.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`
@@ -34,7 +34,7 @@
  	    fi
  	fi
      ])
-@@ -1421,7 +1424,7 @@
+@@ -1422,7 +1425,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/patches/rpath.diff	2009-11-17 19:44:54 UTC (rev 983)
@@ -3,9 +3,9 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.5-8.5.7.orig/unix/configure
-+++ tk8.5-8.5.7/unix/configure
-@@ -5555,6 +5555,9 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -5557,6 +5557,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -15,10 +15,10 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tk8.5-8.5.7.orig/unix/Makefile.in
-+++ tk8.5-8.5.7/unix/Makefile.in
-@@ -711,7 +711,7 @@
- 	    echo "if {[catch {package present Tcl 8.5.0-8.6}]} { return }";\
+--- tk8.5-8.5.8.orig/unix/Makefile.in
++++ tk8.5-8.5.8/unix/Makefile.in
+@@ -713,7 +713,7 @@
+ 	    echo "if {[catch {package present Tcl 8.5.0}]} { return }";\
  	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
  	    echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\
 -		[list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\
@@ -26,9 +26,9 @@
  	    ) > "$(PKG_INDEX)"; \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.7.orig/unix/tcl.m4
-+++ tk8.5-8.5.7/unix/tcl.m4
-@@ -1432,6 +1432,9 @@
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.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: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2009-11-17 19:44:54 UTC (rev 983)
@@ -1,6 +1,6 @@
---- tk8.5-8.5.7.orig/unix/configure
-+++ tk8.5-8.5.7/unix/configure
-@@ -11052,7 +11052,7 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -11070,7 +11070,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
---- tk8.5-8.5.7.orig/unix/configure.in
-+++ tk8.5-8.5.7/unix/configure.in
-@@ -597,7 +597,7 @@
+--- tk8.5-8.5.8.orig/unix/configure.in
++++ tk8.5-8.5.8/unix/configure.in
+@@ -607,7 +607,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.5/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkport.diff	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/patches/tkport.diff	2009-11-17 19:44:54 UTC (rev 983)
@@ -1,8 +1,8 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488501
 
---- tk8.5-8.5.7.orig/generic/tkPort.h
-+++ tk8.5-8.5.7/generic/tkPort.h
+--- tk8.5-8.5.8.orig/generic/tkPort.h
++++ tk8.5-8.5.8/generic/tkPort.h
 @@ -29,7 +29,7 @@
  #   if defined(MAC_OSX_TK)
  #	include "tkMacOSXPort.h"

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

Modified: tk8.5/trunk/debian/rules
===================================================================
--- tk8.5/trunk/debian/rules	2009-11-17 19:43:23 UTC (rev 982)
+++ tk8.5/trunk/debian/rules	2009-11-17 19:44:54 UTC (rev 983)
@@ -175,8 +175,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.5_8.5.7.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5.7-src.tar.gz
+	wget -O tk8.5_8.5.8.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.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