[Pkg-tcltk-commits] r298 - tk8.5/trunk/debian/patches

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Thu Oct 18 16:46:24 UTC 2007 

Author: sgolovan-guest
Date: 2007-10-18 16:46:24 +0000 (Thu, 18 Oct 2007)
New Revision: 298

Modified:
   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/tkprivate.diff
Log:
[tk8.5]
Refreshed patches.


Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2007-10-18 16:40:34 UTC (rev 297)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2007-10-18 16:46:24 UTC (rev 298)
@@ -4,8 +4,8 @@
 
 Index: tk8.5-0.b1/unix/configure
 ===================================================================
---- tk8.5-0.b1.orig/unix/configure	2007-09-24 20:09:13.000000000 +0400
-+++ tk8.5-0.b1/unix/configure	2007-09-24 22:53:15.000000000 +0400
+--- tk8.5-0.b1.orig/unix/configure	2007-10-18 20:45:34.000000000 +0400
++++ tk8.5-0.b1/unix/configure	2007-10-18 20:45:40.000000000 +0400
 @@ -1430,6 +1430,7 @@
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
@@ -17,7 +17,7 @@
 Index: tk8.5-0.b1/unix/tcl.m4
 ===================================================================
 --- tk8.5-0.b1.orig/unix/tcl.m4	2007-09-24 20:09:13.000000000 +0400
-+++ tk8.5-0.b1/unix/tcl.m4	2007-09-24 22:53:15.000000000 +0400
++++ tk8.5-0.b1/unix/tcl.m4	2007-10-18 20:45:40.000000000 +0400
 @@ -94,6 +94,7 @@
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \

Modified: tk8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tk8.5/trunk/debian/patches/manpages.diff	2007-10-18 16:40:34 UTC (rev 297)
+++ tk8.5/trunk/debian/patches/manpages.diff	2007-10-18 16:46:24 UTC (rev 298)
@@ -5,7 +5,7 @@
 Index: tk8.5-0.b1/unix/installManPage
 ===================================================================
 --- tk8.5-0.b1.orig/unix/installManPage	2007-09-24 20:09:13.000000000 +0400
-+++ tk8.5-0.b1/unix/installManPage	2007-09-24 22:58:13.000000000 +0400
++++ tk8.5-0.b1/unix/installManPage	2007-10-18 20:45:46.000000000 +0400
 @@ -49,7 +49,16 @@
      }' $MANPAGE`
  

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2007-10-18 16:40:34 UTC (rev 297)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2007-10-18 16:46:24 UTC (rev 298)
@@ -3,9 +3,9 @@
 
 Index: tk8.5-0.b1/unix/configure
 ===================================================================
---- tk8.5-0.b1.orig/unix/configure	2007-09-24 22:58:03.000000000 +0400
-+++ tk8.5-0.b1/unix/configure	2007-09-24 22:58:08.000000000 +0400
-@@ -4722,6 +4722,9 @@
+--- tk8.5-0.b1.orig/unix/configure	2007-10-18 20:45:41.000000000 +0400
++++ tk8.5-0.b1/unix/configure	2007-10-18 20:45:44.000000000 +0400
+@@ -4723,6 +4723,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -15,7 +15,7 @@
  	    fi
  	fi
  
-@@ -5435,7 +5438,7 @@
+@@ -5436,7 +5439,7 @@
  	        fi
  	    fi
  	    ;;
@@ -26,9 +26,9 @@
  	    SHLIB_SUFFIX=".so"
 Index: tk8.5-0.b1/unix/tcl.m4
 ===================================================================
---- tk8.5-0.b1.orig/unix/tcl.m4	2007-09-24 22:58:03.000000000 +0400
-+++ tk8.5-0.b1/unix/tcl.m4	2007-09-24 22:58:08.000000000 +0400
-@@ -962,6 +962,9 @@
+--- tk8.5-0.b1.orig/unix/tcl.m4	2007-10-18 20:45:41.000000000 +0400
++++ tk8.5-0.b1/unix/tcl.m4	2007-10-18 20:45:44.000000000 +0400
+@@ -961,6 +961,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -38,7 +38,7 @@
  	    fi
  	fi
      ])
-@@ -1415,7 +1418,7 @@
+@@ -1414,7 +1417,7 @@
  	        fi
  	    fi
  	    ;;

Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff	2007-10-18 16:40:34 UTC (rev 297)
+++ tk8.5/trunk/debian/patches/rpath.diff	2007-10-18 16:46:24 UTC (rev 298)
@@ -5,9 +5,9 @@
 
 Index: tk8.5-0.b1/unix/configure
 ===================================================================
---- tk8.5-0.b1.orig/unix/configure	2007-09-24 22:53:15.000000000 +0400
-+++ tk8.5-0.b1/unix/configure	2007-09-24 22:58:03.000000000 +0400
-@@ -5446,11 +5446,14 @@
+--- tk8.5-0.b1.orig/unix/configure	2007-10-18 20:45:40.000000000 +0400
++++ tk8.5-0.b1/unix/configure	2007-10-18 20:45:41.000000000 +0400
+@@ -5447,11 +5447,14 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -26,7 +26,7 @@
 Index: tk8.5-0.b1/unix/Makefile.in
 ===================================================================
 --- tk8.5-0.b1.orig/unix/Makefile.in	2007-09-24 20:09:13.000000000 +0400
-+++ tk8.5-0.b1/unix/Makefile.in	2007-09-24 22:58:03.000000000 +0400
++++ tk8.5-0.b1/unix/Makefile.in	2007-10-18 20:45:41.000000000 +0400
 @@ -710,7 +710,7 @@
  		$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
  	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
@@ -38,9 +38,9 @@
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
 Index: tk8.5-0.b1/unix/tcl.m4
 ===================================================================
---- tk8.5-0.b1.orig/unix/tcl.m4	2007-09-24 22:53:15.000000000 +0400
-+++ tk8.5-0.b1/unix/tcl.m4	2007-09-24 22:58:03.000000000 +0400
-@@ -1426,11 +1426,14 @@
+--- tk8.5-0.b1.orig/unix/tcl.m4	2007-10-18 20:45:40.000000000 +0400
++++ tk8.5-0.b1/unix/tcl.m4	2007-10-18 20:45:41.000000000 +0400
+@@ -1425,11 +1425,14 @@
  	    # 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	2007-10-18 16:40:34 UTC (rev 297)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2007-10-18 16:46:24 UTC (rev 298)
@@ -1,8 +1,8 @@
-Index: tk8.4/unix/configure
+Index: tk8.5-0.b1/unix/configure
 ===================================================================
---- tk8.4.orig/unix/configure
-+++ tk8.4/unix/configure
-@@ -5858,7 +5858,7 @@
+--- tk8.5-0.b1.orig/unix/configure	2007-09-24 20:09:13.000000000 +0400
++++ tk8.5-0.b1/unix/configure	2007-10-18 20:45:34.000000000 +0400
+@@ -9928,7 +9928,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -10,12 +10,12 @@
 +test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
- TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
-Index: tk8.4/unix/configure.in
+ TK_PKG_DIR='tk$(VERSION)'
+Index: tk8.5-0.b1/unix/configure.in
 ===================================================================
---- tk8.4.orig/unix/configure.in
-+++ tk8.4/unix/configure.in
-@@ -402,7 +402,7 @@
+--- tk8.5-0.b1.orig/unix/configure.in	2007-09-24 20:09:13.000000000 +0400
++++ tk8.5-0.b1/unix/configure.in	2007-10-18 20:45:34.000000000 +0400
+@@ -507,7 +507,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -23,4 +23,4 @@
 +test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
- TK_PKG_DIR='tk$(VERSION)$(TK_DBGX)'
+ TK_PKG_DIR='tk$(VERSION)'

Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff	2007-10-18 16:40:34 UTC (rev 297)
+++ tk8.5/trunk/debian/patches/tkprivate.diff	2007-10-18 16:46:24 UTC (rev 298)
@@ -5,7 +5,7 @@
 Index: tk8.5-0.b1/unix/tkConfig.sh.in
 ===================================================================
 --- tk8.5-0.b1.orig/unix/tkConfig.sh.in	2007-09-24 20:09:13.000000000 +0400
-+++ tk8.5-0.b1/unix/tkConfig.sh.in	2007-09-24 22:53:15.000000000 +0400
++++ tk8.5-0.b1/unix/tkConfig.sh.in	2007-10-18 20:45:38.000000000 +0400
 @@ -55,7 +55,7 @@
  
  # String to pass to linker to pick up the Tk library from its

More information about the Pkg-tcltk-commits mailing list