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

sgolovan-guest at alioth.debian.org sgolovan-guest at alioth.debian.org
Wed Nov 21 16:21:25 UTC 2007 

Author: sgolovan-guest
Date: 2007-11-21 16:21:25 +0000 (Wed, 21 Nov 2007)
New Revision: 386

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/tkprivate.diff
   tk8.5/trunk/debian/rules
Log:
[tk8.5]
Refreshed patches for new beta release. Added --disable-rpath.


Modified: tk8.5/trunk/debian/changelog
===================================================================
--- tk8.5/trunk/debian/changelog	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/changelog	2007-11-21 16:21:25 UTC (rev 386)
@@ -1,8 +1,8 @@
-tk8.5 (0.b2-2) UNRELEASED; urgency=low
+tk8.5 (0.b3-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream beta release.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sat, 27 Oct 2007 08:36:49 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 21 Nov 2007 19:03:48 +0300
 
 tk8.5 (0.b2-1) unstable; urgency=low
 

Modified: tk8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tk8.5/trunk/debian/patches/confsearch.diff	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/patches/confsearch.diff	2007-11-21 16:21:25 UTC (rev 386)
@@ -2,11 +2,11 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
-Index: tk8.5-0.b1/unix/configure
+Index: tk8.5-0.b3/unix/configure
 ===================================================================
---- tk8.5-0.b1.orig/unix/configure	2007-10-19 15:47:25.000000000 +0400
-+++ tk8.5-0.b1/unix/configure	2007-10-19 15:47:27.000000000 +0400
-@@ -1429,6 +1429,7 @@
+--- tk8.5-0.b3.orig/unix/configure	2007-11-21 19:05:20.000000000 +0300
++++ tk8.5-0.b3/unix/configure	2007-11-21 19:05:28.000000000 +0300
+@@ -1430,6 +1430,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \
  			`ls -d /usr/contrib/lib 2>/dev/null` \
@@ -14,10 +14,10 @@
  			`ls -d /usr/lib 2>/dev/null` \
  			; do
  		    if test -f "$i/tclConfig.sh" ; then
-Index: tk8.5-0.b1/unix/tcl.m4
+Index: tk8.5-0.b3/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-10-19 15:47:27.000000000 +0400
+--- tk8.5-0.b3.orig/unix/tcl.m4	2007-11-20 18:46:42.000000000 +0300
++++ tk8.5-0.b3/unix/tcl.m4	2007-11-21 19:05:28.000000000 +0300
 @@ -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	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/patches/manpages.diff	2007-11-21 16:21:25 UTC (rev 386)
@@ -2,11 +2,11 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
-Index: tk8.5-0.b1/unix/installManPage
+Index: tk8.5-0.b3/unix/installManPage
 ===================================================================
---- tk8.5-0.b1.orig/unix/installManPage	2007-09-24 20:09:13.000000000 +0400
-+++ tk8.5-0.b1/unix/installManPage	2007-10-18 20:45:46.000000000 +0400
-@@ -49,7 +49,16 @@
+--- tk8.5-0.b3.orig/unix/installManPage	2007-11-20 18:46:42.000000000 +0300
++++ tk8.5-0.b3/unix/installManPage	2007-11-21 19:07:26.000000000 +0300
+@@ -51,7 +51,16 @@
      }' $MANPAGE`
  
  SECTION=`echo $MANPAGE | sed 's/.*\(.\)$/\1/'`

Modified: tk8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tk8.5/trunk/debian/patches/non-linux.diff	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/patches/non-linux.diff	2007-11-21 16:21:25 UTC (rev 386)
@@ -1,11 +1,11 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
-Index: tk8.5-0.b1/unix/configure
+Index: tk8.5-0.b3/unix/configure
 ===================================================================
---- 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 @@
+--- tk8.5-0.b3.orig/unix/configure	2007-11-21 19:07:17.000000000 +0300
++++ tk8.5-0.b3/unix/configure	2007-11-21 19:07:21.000000000 +0300
+@@ -4741,6 +4741,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -15,20 +15,20 @@
  	    fi
  	fi
  
-@@ -5436,7 +5439,7 @@
- 	        fi
- 	    fi
+@@ -5538,7 +5541,7 @@
+ fi
+ 
  	    ;;
 -	Linux*)
 +	Linux*|GNU*|NetBSD-Debian)
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_LD_LIBS='${LIBS}'
  	    SHLIB_SUFFIX=".so"
-Index: tk8.5-0.b1/unix/tcl.m4
+Index: tk8.5-0.b3/unix/tcl.m4
 ===================================================================
---- 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 @@
+--- tk8.5-0.b3.orig/unix/tcl.m4	2007-11-21 19:07:17.000000000 +0300
++++ tk8.5-0.b3/unix/tcl.m4	2007-11-21 19:07:21.000000000 +0300
+@@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -38,9 +38,9 @@
  	    fi
  	fi
      ])
-@@ -1414,7 +1417,7 @@
- 	        fi
- 	    fi
+@@ -1418,7 +1421,7 @@
+ 	        ])
+ 	    ])
  	    ;;
 -	Linux*)
 +	Linux*|GNU*|NetBSD-Debian)

Modified: tk8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tk8.5/trunk/debian/patches/rpath.diff	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/patches/rpath.diff	2007-11-21 16:21:25 UTC (rev 386)
@@ -3,11 +3,11 @@
 
 Also, it fixes Makefile.in to put correct Tk library filename to pkgIndex.tcl
 
-Index: tk8.5-0.b1/unix/configure
+Index: tk8.5-0.b3/unix/configure
 ===================================================================
---- 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 @@
+--- tk8.5-0.b3.orig/unix/configure	2007-11-21 19:05:28.000000000 +0300
++++ tk8.5-0.b3/unix/configure	2007-11-21 19:07:17.000000000 +0300
+@@ -5549,6 +5549,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -17,16 +17,10 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
- 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+	    CC_SEARCH_FLAGS=''
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "`uname -m`" = "alpha" ; then
- 		CFLAGS="$CFLAGS -mieee"
-Index: tk8.5-0.b1/unix/Makefile.in
+Index: tk8.5-0.b3/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-10-18 20:45:41.000000000 +0400
+--- tk8.5-0.b3.orig/unix/Makefile.in	2007-11-20 18:46:42.000000000 +0300
++++ tk8.5-0.b3/unix/Makefile.in	2007-11-21 19:07:17.000000000 +0300
 @@ -710,7 +710,7 @@
  		$(TCLVERSION)$(TCLPATCHL)}]} { return }";\
  	    relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\
@@ -36,11 +30,11 @@
  	    ) > $(PKG_INDEX); \
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
-Index: tk8.5-0.b1/unix/tcl.m4
+Index: tk8.5-0.b3/unix/tcl.m4
 ===================================================================
---- 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 @@
+--- tk8.5-0.b3.orig/unix/tcl.m4	2007-11-21 19:05:28.000000000 +0300
++++ tk8.5-0.b3/unix/tcl.m4	2007-11-21 19:07:17.000000000 +0300
+@@ -1429,6 +1429,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -50,9 +44,3 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
- 	    LDFLAGS="$LDFLAGS -Wl,--export-dynamic"
--	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
-+	    CC_SEARCH_FLAGS=''
- 	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
- 	    if test "`uname -m`" = "alpha" ; then
- 		CFLAGS="$CFLAGS -mieee"

Modified: tk8.5/trunk/debian/patches/tklibrary.diff
===================================================================
--- tk8.5/trunk/debian/patches/tklibrary.diff	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/patches/tklibrary.diff	2007-11-21 16:21:25 UTC (rev 386)
@@ -1,8 +1,8 @@
-Index: tk8.5-0.b1/unix/configure
+Index: tk8.5-0.b3/unix/configure
 ===================================================================
---- 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 @@
+--- tk8.5-0.b3.orig/unix/configure	2007-11-20 18:46:42.000000000 +0300
++++ tk8.5-0.b3/unix/configure	2007-11-21 19:05:20.000000000 +0300
+@@ -10554,7 +10554,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  
@@ -11,11 +11,11 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  TK_PKG_DIR='tk$(VERSION)'
-Index: tk8.5-0.b1/unix/configure.in
+Index: tk8.5-0.b3/unix/configure.in
 ===================================================================
---- 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 @@
+--- tk8.5-0.b3.orig/unix/configure.in	2007-11-20 18:46:42.000000000 +0300
++++ tk8.5-0.b3/unix/configure.in	2007-11-21 19:05:20.000000000 +0300
+@@ -558,7 +558,7 @@
      TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
  fi
  

Modified: tk8.5/trunk/debian/patches/tkprivate.diff
===================================================================
--- tk8.5/trunk/debian/patches/tkprivate.diff	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/patches/tkprivate.diff	2007-11-21 16:21:25 UTC (rev 386)
@@ -2,10 +2,10 @@
 with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tk headers there).
 
-Index: tk8.5-0.b1/unix/tkConfig.sh.in
+Index: tk8.5-0.b3/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-10-18 20:45:38.000000000 +0400
+--- tk8.5-0.b3.orig/unix/tkConfig.sh.in	2007-11-20 18:46:42.000000000 +0300
++++ tk8.5-0.b3/unix/tkConfig.sh.in	2007-11-21 19:05:25.000000000 +0300
 @@ -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	2007-11-21 15:56:42 UTC (rev 385)
+++ tk8.5/trunk/debian/rules	2007-11-21 16:21:25 UTC (rev 386)
@@ -37,6 +37,7 @@
 		      --with-tcl=/usr/lib/tcl$(v) \
 		      --enable-shared \
 		      --enable-threads \
+		      --disable-rpath \
 		      --enable-xft \
 		      --enable-man-symlinks \
 		      --enable-man-compression=gzip && \
@@ -168,8 +169,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tk8.5_0.b2.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tk8.5b2-src.tar.gz
+	wget -O tk8.5_0.b3.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tk8.5b3-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