[Pkg-tcltk-commits] r733 - in tk8.5/branches/experimental/debian: . patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Sat Aug 23 12:55:06 UTC 2008 

Author: sgolovan-guest
Date: 2008-08-23 12:55:05 +0000 (Sat, 23 Aug 2008)
New Revision: 733

Removed:
   tk8.5/branches/experimental/debian/patches/tk-lastevent.diff
Modified:
   tk8.5/branches/experimental/debian/changelog
   tk8.5/branches/experimental/debian/patches/confsearch.diff
   tk8.5/branches/experimental/debian/patches/manpages.diff
   tk8.5/branches/experimental/debian/patches/non-linux.diff
   tk8.5/branches/experimental/debian/patches/rpath.diff
   tk8.5/branches/experimental/debian/patches/series
   tk8.5/branches/experimental/debian/patches/tklibrary.diff
   tk8.5/branches/experimental/debian/patches/tkport.diff
   tk8.5/branches/experimental/debian/patches/tkprivate.diff
   tk8.5/branches/experimental/debian/rules
Log:
[tk8.5-experimental]
  * New upstream release.


Modified: tk8.5/branches/experimental/debian/changelog
===================================================================
--- tk8.5/branches/experimental/debian/changelog	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/changelog	2008-08-23 12:55:05 UTC (rev 733)
@@ -1,8 +1,8 @@
-tk8.5 (8.5.3-4) UNRELEASED; urgency=low
+tk8.5 (8.5.4-1) experimental; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 31 Jul 2008 09:21:46 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 23 Aug 2008 16:40:42 +0400
 
 tk8.5 (8.5.3-3) unstable; urgency=low
 

Modified: tk8.5/branches/experimental/debian/patches/confsearch.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/confsearch.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/confsearch.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tk8.5-8.5.3.orig/unix/configure
-+++ tk8.5-8.5.3/unix/configure
+--- tk8.5-8.5.4.orig/unix/configure
++++ tk8.5-8.5.4/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.5-8.5.3.orig/unix/tcl.m4
-+++ tk8.5-8.5.3/unix/tcl.m4
+--- tk8.5-8.5.4.orig/unix/tcl.m4
++++ tk8.5-8.5.4/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/branches/experimental/debian/patches/manpages.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/manpages.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/manpages.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tk8.5-8.5.3.orig/unix/installManPage
-+++ tk8.5-8.5.3/unix/installManPage
+--- tk8.5-8.5.4.orig/unix/installManPage
++++ tk8.5-8.5.4/unix/installManPage
 @@ -51,7 +51,16 @@
      }' $MANPAGE`
  

Modified: tk8.5/branches/experimental/debian/patches/non-linux.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/non-linux.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/non-linux.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tk8.5-8.5.3.orig/unix/configure
-+++ tk8.5-8.5.3/unix/configure
+--- tk8.5-8.5.4.orig/unix/configure
++++ tk8.5-8.5.4/unix/configure
 @@ -4741,6 +4741,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
---- tk8.5-8.5.3.orig/unix/tcl.m4
-+++ tk8.5-8.5.3/unix/tcl.m4
+--- tk8.5-8.5.4.orig/unix/tcl.m4
++++ tk8.5-8.5.4/unix/tcl.m4
 @@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tk8.5/branches/experimental/debian/patches/rpath.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/rpath.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/rpath.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -3,8 +3,8 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
---- tk8.5-8.5.3.orig/unix/configure
-+++ tk8.5-8.5.3/unix/configure
+--- tk8.5-8.5.4.orig/unix/configure
++++ tk8.5-8.5.4/unix/configure
 @@ -5549,6 +5549,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.5-8.5.3.orig/unix/Makefile.in
-+++ tk8.5-8.5.3/unix/Makefile.in
+--- tk8.5-8.5.4.orig/unix/Makefile.in
++++ tk8.5-8.5.4/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,8 +26,8 @@
  	    ) > "$(PKG_INDEX)"; \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
---- tk8.5-8.5.3.orig/unix/tcl.m4
-+++ tk8.5-8.5.3/unix/tcl.m4
+--- tk8.5-8.5.4.orig/unix/tcl.m4
++++ tk8.5-8.5.4/unix/tcl.m4
 @@ -1429,6 +1429,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

Modified: tk8.5/branches/experimental/debian/patches/series
===================================================================
--- tk8.5/branches/experimental/debian/patches/series	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/series	2008-08-23 12:55:05 UTC (rev 733)
@@ -1,4 +1,3 @@
-tk-lastevent.diff
 tkport.diff
 tklibrary.diff
 tkprivate.diff

Deleted: tk8.5/branches/experimental/debian/patches/tk-lastevent.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tk-lastevent.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/tk-lastevent.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -1,29 +0,0 @@
-Date: Sat Jul 12 09:40:30 PDT 2008
-Files: generic/tk.h
-Bugid: 2010422
-
---- tk8.4-8.4.19.orig/generic/tk.h
-+++ tk8.4-8.4.19/generic/tk.h
-@@ -627,17 +627,15 @@
-  *---------------------------------------------------------------------------
-  */
- 
--#define VirtualEvent	    (LASTEvent)
--#define ActivateNotify	    (LASTEvent + 1)
--#define DeactivateNotify    (LASTEvent + 2)
--#define MouseWheelEvent     (LASTEvent + 3)
--#define TK_LASTEVENT	    (LASTEvent + 4)
-+#define VirtualEvent	    (MappingNotify + 1)
-+#define ActivateNotify	    (MappingNotify + 2)
-+#define DeactivateNotify    (MappingNotify + 3)
-+#define MouseWheelEvent     (MappingNotify + 4)
-+#define TK_LASTEVENT	    (MappingNotify + 5)
- 
- #define MouseWheelMask	    (1L << 28)
--
- #define ActivateMask	    (1L << 29)
- #define VirtualEventMask    (1L << 30)
--#define TK_LASTEVENT	    (LASTEvent + 4)
- 
- /*
-  * A virtual event shares most of its fields with the XKeyEvent and

Modified: tk8.5/branches/experimental/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tklibrary.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/tklibrary.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -1,5 +1,5 @@
---- tk8.5-8.5.3.orig/unix/configure
-+++ tk8.5-8.5.3/unix/configure
+--- tk8.5-8.5.4.orig/unix/configure
++++ tk8.5-8.5.4/unix/configure
 @@ -10746,7 +10746,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.5-8.5.3.orig/unix/configure.in
-+++ tk8.5-8.5.3/unix/configure.in
+--- tk8.5-8.5.4.orig/unix/configure.in
++++ tk8.5-8.5.4/unix/configure.in
 @@ -558,7 +558,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi

Modified: tk8.5/branches/experimental/debian/patches/tkport.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tkport.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/tkport.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -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.3.orig/generic/tkPort.h
-+++ tk8.5-8.5.3/generic/tkPort.h
+--- tk8.5-8.5.4.orig/generic/tkPort.h
++++ tk8.5-8.5.4/generic/tkPort.h
 @@ -29,7 +29,7 @@
  #   if defined(MAC_OSX_TK)
  #	include "tkMacOSXPort.h"

Modified: tk8.5/branches/experimental/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/branches/experimental/debian/patches/tkprivate.diff	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/patches/tkprivate.diff	2008-08-23 12:55:05 UTC (rev 733)
@@ -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.3.orig/unix/tkConfig.sh.in
-+++ tk8.5-8.5.3/unix/tkConfig.sh.in
+--- tk8.5-8.5.4.orig/unix/tkConfig.sh.in
++++ tk8.5-8.5.4/unix/tkConfig.sh.in
 @@ -55,7 +55,7 @@
  
  # String to pass to linker to pick up the Tk library from its

Modified: tk8.5/branches/experimental/debian/rules
===================================================================
--- tk8.5/branches/experimental/debian/rules	2008-08-23 12:53:57 UTC (rev 732)
+++ tk8.5/branches/experimental/debian/rules	2008-08-23 12:55:05 UTC (rev 733)
@@ -172,8 +172,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.5_8.5.3.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5.3-src.tar.gz
+	wget -O tk8.5_8.5.4.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.5.4-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