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

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Dec 27 18:10:30 UTC 2008 

Author: sgolovan-guest
Date: 2008-12-27 18:10:30 +0000 (Sat, 27 Dec 2008)
New Revision: 807

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 beta release.


Modified: tk8.6/trunk/debian/changelog
===================================================================
--- tk8.6/trunk/debian/changelog	2008-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/changelog	2008-12-27 18:10:30 UTC (rev 807)
@@ -1,8 +1,8 @@
-tk8.6 (8.6.0~a3-2) UNRELEASED; urgency=low
+tk8.6 (8.6.0~b1-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream beta release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Fri, 17 Oct 2008 13:56:34 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Dec 2008 14:39:54 +0300
 
 tk8.6 (8.6.0~a3-1) experimental; urgency=low
 

Modified: tk8.6/trunk/debian/control
===================================================================
--- tk8.6/trunk/debian/control	2008-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/control	2008-12-27 18:10:30 UTC (rev 807)
@@ -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~b1), quilt
 Standards-Version: 3.8.0
 Homepage: http://www.tcl.tk/
 

Modified: tk8.6/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.6/trunk/debian/patches/confsearch.diff	2008-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/patches/confsearch.diff	2008-12-27 18:10:30 UTC (rev 807)
@@ -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~a3.orig/unix/configure
-+++ tk8.6-8.6.0~a3/unix/configure
+--- tk8.6-8.6.0~b1.orig/unix/configure
++++ tk8.6-8.6.0~b1/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~a3.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~a3/unix/tcl.m4
+--- tk8.6-8.6.0~b1.orig/unix/tcl.m4
++++ tk8.6-8.6.0~b1/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-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/patches/manpages.diff	2008-12-27 18:10:30 UTC (rev 807)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.6-8.6.0~a3.orig/unix/installManPage
-+++ tk8.6-8.6.0~a3/unix/installManPage
+--- tk8.6-8.6.0~b1.orig/unix/installManPage
++++ tk8.6-8.6.0~b1/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-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/patches/non-linux.diff	2008-12-27 18:10:30 UTC (rev 807)
@@ -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~a3.orig/unix/configure
-+++ tk8.6-8.6.0~a3/unix/configure
-@@ -4349,6 +4349,9 @@
+--- tk8.6-8.6.0~b1.orig/unix/configure
++++ tk8.6-8.6.0~b1/unix/configure
+@@ -4420,6 +4420,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -13,7 +13,7 @@
  	    fi
  	fi
  
-@@ -5147,7 +5150,7 @@
+@@ -5221,7 +5224,7 @@
  fi
  
  	    ;;
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tk8.6-8.6.0~a3.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~a3/unix/tcl.m4
+--- tk8.6-8.6.0~b1.orig/unix/tcl.m4
++++ tk8.6-8.6.0~b1/unix/tcl.m4
 @@ -925,6 +925,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -34,7 +34,7 @@
  	    fi
  	fi
      ])
-@@ -1380,7 +1383,7 @@
+@@ -1383,7 +1386,7 @@
  	        ])
  	    ])
  	    ;;

Modified: tk8.6/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.6/trunk/debian/patches/rpath.diff	2008-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/patches/rpath.diff	2008-12-27 18:10:30 UTC (rev 807)
@@ -3,9 +3,9 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.6-8.6.0~a3.orig/unix/configure
-+++ tk8.6-8.6.0~a3/unix/configure
-@@ -5158,6 +5158,9 @@
+--- tk8.6-8.6.0~b1.orig/unix/configure
++++ tk8.6-8.6.0~b1/unix/configure
+@@ -5232,6 +5232,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -15,9 +15,9 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tk8.6-8.6.0~a3.orig/unix/Makefile.in
-+++ tk8.6-8.6.0~a3/unix/Makefile.in
-@@ -710,7 +710,7 @@
+--- tk8.6-8.6.0~b1.orig/unix/Makefile.in
++++ tk8.6-8.6.0~b1/unix/Makefile.in
+@@ -712,7 +712,7 @@
  		$(TCLVERSION)$(TCLPATCHL)}]} { 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)\
@@ -26,9 +26,9 @@
  	    ) > "$(PKG_INDEX)"; \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.6-8.6.0~a3.orig/unix/tcl.m4
-+++ tk8.6-8.6.0~a3/unix/tcl.m4
-@@ -1391,6 +1391,9 @@
+--- tk8.6-8.6.0~b1.orig/unix/tcl.m4
++++ tk8.6-8.6.0~b1/unix/tcl.m4
+@@ -1394,6 +1394,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-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/patches/tklibrary.diff	2008-12-27 18:10:30 UTC (rev 807)
@@ -1,6 +1,6 @@
---- tk8.6-8.6.0~a3.orig/unix/configure
-+++ tk8.6-8.6.0~a3/unix/configure
-@@ -10355,7 +10355,7 @@
+--- tk8.6-8.6.0~b1.orig/unix/configure
++++ tk8.6-8.6.0~b1/unix/configure
+@@ -10429,7 +10429,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.6-8.6.0~a3.orig/unix/configure.in
-+++ tk8.6-8.6.0~a3/unix/configure.in
-@@ -552,7 +552,7 @@
+--- tk8.6-8.6.0~b1.orig/unix/configure.in
++++ tk8.6-8.6.0~b1/unix/configure.in
+@@ -553,7 +553,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.6/trunk/debian/patches/tkport.diff
===================================================================
--- tk8.6/trunk/debian/patches/tkport.diff	2008-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/patches/tkport.diff	2008-12-27 18:10:30 UTC (rev 807)
@@ -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~a3.orig/generic/tkPort.h
-+++ tk8.6-8.6.0~a3/generic/tkPort.h
+--- tk8.6-8.6.0~b1.orig/generic/tkPort.h
++++ tk8.6-8.6.0~b1/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-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/patches/tkprivate.diff	2008-12-27 18:10:30 UTC (rev 807)
@@ -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~a3.orig/unix/tkConfig.sh.in
-+++ tk8.6-8.6.0~a3/unix/tkConfig.sh.in
+--- tk8.6-8.6.0~b1.orig/unix/tkConfig.sh.in
++++ tk8.6-8.6.0~b1/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-12-27 16:45:25 UTC (rev 806)
+++ tk8.6/trunk/debian/rules	2008-12-27 18:10:30 UTC (rev 807)
@@ -159,7 +159,7 @@
 	dh_fixperms -a
 	dh_strip -a
 	dh_compress -a -Xusr/share/doc/tk$(v)/examples/
-	dh_makeshlibs -a -V 'tk$(v) (>= 8.6.0~a1)'
+	dh_makeshlibs -a -V 'tk$(v) (>= 8.6.0~b1)'
 	dh_installdeb -a
 	dh_shlibdeps -a -ldebian/tk$(v)/usr/lib
 	dh_gencontrol -a
@@ -172,8 +172,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.6_8.6.0~a3.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.6a3-src.tar.gz
+	wget -O tk8.6_8.6.0~b1.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.6b1-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