[Pkg-tcltk-commits] r725 - in tk8.6/trunk/debian: . patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Aug 23 09:15:24 UTC 2008 

Author: sgolovan-guest
Date: 2008-08-23 09:15:23 +0000 (Sat, 23 Aug 2008)
New Revision: 725

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


Modified: tk8.6/trunk/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/changelog	2008-08-23 09:15:23 UTC (rev 725)
@@ -1,8 +1,8 @@
-tk8.6 (8.6.0~a1-2) UNRELEASED; urgency=low
+tk8.6 (8.6.0~a2-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream alpha release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri,  4 Jul 2008 09:37:16 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 23 Aug 2008 12:35:08 +0400
 
 tk8.6 (8.6.0~a1-1) experimental; urgency=low
 

Modified: tk8.6/trunk/debian/control
===================================================================
--- tk8.6/trunk/debian/control	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/control	2008-08-23 09:15:23 UTC (rev 725)
@@ -3,7 +3,7 @@
 Priority: optional
 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), x11proto-core-dev, libx11-dev, libxt-dev, libxss-dev | libxext-dev, libxft-dev, tcl8.6-dev (>= 8.6.0~a1), quilt
+Build-Depends: debhelper (>= 5.0.0), x11proto-core-dev, libx11-dev, libxt-dev, libxss-dev, libxext-dev, libxft-dev, tcl8.6-dev (>= 8.6.0~a1), quilt
 Standards-Version: 3.8.0
 Homepage: http://www.tcl.tk/
 
@@ -37,7 +37,7 @@
 Section: devel
 Priority: optional
 Architecture: any
-Depends: x11proto-core-dev, libx11-dev, tcl8.6-dev (>= 8.6.0~a1), tk8.6 (= ${binary:Version})
+Depends: x11proto-core-dev, libx11-dev, libxt-dev, libxss-dev, libxext-dev, tcl8.6-dev (>= 8.6.0~a1), tk8.6 (= ${binary:Version})
 Suggests: tk8.6-doc
 Description: Tk toolkit for Tcl and X11, v8.6 - development files
  Tk is a cross-platform graphical toolkit which provides the Motif

Modified: tk8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.6/trunk/debian/patches/confsearch.diff	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/patches/confsearch.diff	2008-08-23 09:15:23 UTC (rev 725)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.6-8.6.0~a1.orig/unix/configure
-+++ tk8.6-8.6.0~a1/unix/configure
+--- tk8.6-8.6.0~a2.orig/unix/configure
++++ tk8.6-8.6.0~a2/unix/configure
 @@ -1430,6 +1430,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
@@ -12,8 +12,8 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
---- tk8.6-8.6.0~a1.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~a1/unix/tcl.m4
+--- tk8.6-8.6.0~a2.orig/unix/tcl.m4
++++ tk8.6-8.6.0~a2/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tk8.6/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.6/trunk/debian/patches/manpages.diff	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/patches/manpages.diff	2008-08-23 09:15:23 UTC (rev 725)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.6-8.6.0~a1.orig/unix/installManPage
-+++ tk8.6-8.6.0~a1/unix/installManPage
+--- tk8.6-8.6.0~a2.orig/unix/installManPage
++++ tk8.6-8.6.0~a2/unix/installManPage
 @@ -51,7 +51,16 @@
      }' $MANPAGE`
  

Modified: tk8.6/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.6/trunk/debian/patches/non-linux.diff	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/patches/non-linux.diff	2008-08-23 09:15:23 UTC (rev 725)
@@ -1,9 +1,9 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.6-8.6.0~a1.orig/unix/configure
-+++ tk8.6-8.6.0~a1/unix/configure
-@@ -4731,6 +4731,9 @@
+--- tk8.6-8.6.0~a2.orig/unix/configure
++++ tk8.6-8.6.0~a2/unix/configure
+@@ -4349,6 +4349,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -13,7 +13,7 @@
  	    fi
  	fi
  
-@@ -5528,7 +5531,7 @@
+@@ -5146,7 +5149,7 @@
  fi
  
  	    ;;
@@ -22,9 +22,9 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tk8.6-8.6.0~a1.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~a1/unix/tcl.m4
-@@ -962,6 +962,9 @@
+--- tk8.6-8.6.0~a2.orig/unix/tcl.m4
++++ tk8.6-8.6.0~a2/unix/tcl.m4
+@@ -925,6 +925,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -34,7 +34,7 @@
  	    fi
  	fi
      ])
-@@ -1418,7 +1421,7 @@
+@@ -1381,7 +1384,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tk8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.6/trunk/debian/patches/rpath.diff	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/patches/rpath.diff	2008-08-23 09:15:23 UTC (rev 725)
@@ -3,9 +3,9 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.6-8.6.0~a1.orig/unix/configure
-+++ tk8.6-8.6.0~a1/unix/configure
-@@ -5539,6 +5539,9 @@
+--- tk8.6-8.6.0~a2.orig/unix/configure
++++ tk8.6-8.6.0~a2/unix/configure
+@@ -5157,6 +5157,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -15,8 +15,8 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tk8.6-8.6.0~a1.orig/unix/Makefile.in
-+++ tk8.6-8.6.0~a1/unix/Makefile.in
+--- tk8.6-8.6.0~a2.orig/unix/Makefile.in
++++ tk8.6-8.6.0~a2/unix/Makefile.in
 @@ -708,7 +708,7 @@
  		$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
  	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
@@ -26,9 +26,9 @@
  	    ) > "$(PKG_INDEX)"; \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.6-8.6.0~a1.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~a1/unix/tcl.m4
-@@ -1429,6 +1429,9 @@
+--- tk8.6-8.6.0~a2.orig/unix/tcl.m4
++++ tk8.6-8.6.0~a2/unix/tcl.m4
+@@ -1392,6 +1392,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  

Modified: tk8.6/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.6/trunk/debian/patches/tklibrary.diff	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/patches/tklibrary.diff	2008-08-23 09:15:23 UTC (rev 725)
@@ -1,6 +1,6 @@
---- tk8.6-8.6.0~a1.orig/unix/configure
-+++ tk8.6-8.6.0~a1/unix/configure
-@@ -10736,7 +10736,7 @@
+--- tk8.6-8.6.0~a2.orig/unix/configure
++++ tk8.6-8.6.0~a2/unix/configure
+@@ -10354,7 +10354,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -9,8 +9,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
---- tk8.6-8.6.0~a1.orig/unix/configure.in
-+++ tk8.6-8.6.0~a1/unix/configure.in
+--- tk8.6-8.6.0~a2.orig/unix/configure.in
++++ tk8.6-8.6.0~a2/unix/configure.in
 @@ -552,7 +552,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi

Modified: tk8.6/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkport.diff	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/patches/tkport.diff	2008-08-23 09:15:23 UTC (rev 725)
@@ -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.6-8.6.0~a1.orig/generic/tkPort.h
-+++ tk8.6-8.6.0~a1/generic/tkPort.h
+--- tk8.6-8.6.0~a2.orig/generic/tkPort.h
++++ tk8.6-8.6.0~a2/generic/tkPort.h
 @@ -29,7 +29,7 @@
  #   if defined(MAC_OSX_TK)
  #	include "tkMacOSXPort.h"

Modified: tk8.6/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkprivate.diff	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/patches/tkprivate.diff	2008-08-23 09:15:23 UTC (rev 725)
@@ -2,8 +2,8 @@
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
---- tk8.6-8.6.0~a1.orig/unix/tkConfig.sh.in
-+++ tk8.6-8.6.0~a1/unix/tkConfig.sh.in
+--- tk8.6-8.6.0~a2.orig/unix/tkConfig.sh.in
++++ tk8.6-8.6.0~a2/unix/tkConfig.sh.in
 @@ -55,7 +55,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Modified: tk8.6/trunk/debian/rules
===================================================================
--- tk8.6/trunk/debian/rules	2008-08-23 08:25:31 UTC (rev 724)
+++ tk8.6/trunk/debian/rules	2008-08-23 09:15:23 UTC (rev 725)
@@ -172,8 +172,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.6_8.6.0~a1.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.6a1-src.tar.gz
+	wget -O tk8.6_8.6.0~a2.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.6a2-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