[Pkg-tcltk-commits] r1198 - in tcl8.5/trunk/debian: . patches

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Thu Dec 8 11:29:19 UTC 2011 

Author: sgolovan
Date: 2011-12-08 11:29:19 +0000 (Thu, 08 Dec 2011)
New Revision: 1198

Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/patches/confsearch.diff
   tcl8.5/trunk/debian/patches/manpages.diff
   tcl8.5/trunk/debian/patches/non-linux.diff
   tcl8.5/trunk/debian/patches/rpath.diff
   tcl8.5/trunk/debian/patches/tcllibrary.diff
   tcl8.5/trunk/debian/patches/tclpackagepath.diff
   tcl8.5/trunk/debian/patches/tclport.diff
   tcl8.5/trunk/debian/patches/tclprivate.diff
   tcl8.5/trunk/debian/rules
Log:
[tcl8.5]
  * New upstream release (closes: #617628).
  * Added build-arch and build-indep targets to debian/rules.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/changelog	2011-12-08 11:29:19 UTC (rev 1198)
@@ -1,8 +1,9 @@
-tcl8.5 (8.5.10-2) UNRELEASED; urgency=low
+tcl8.5 (8.5.11-1) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * New upstream release (closes: #617628).
+  * Added build-arch and build-indep targets to debian/rules.
 
- -- Sergei Golovan <sgolovan at debian.org>  Sun, 26 Jun 2011 12:33:51 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 08 Dec 2011 15:19:01 +0400
 
 tcl8.5 (8.5.10-1) unstable; urgency=low
 

Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/confsearch.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.5-8.5.10.orig/unix/tcl.m4
-+++ tcl8.5-8.5.10/unix/tcl.m4
+--- tcl8.5-8.5.11.orig/unix/tcl.m4
++++ tcl8.5-8.5.11/unix/tcl.m4
 @@ -93,6 +93,7 @@
  			`ls -d ${prefix}/lib 2>/dev/null` \
  			`ls -d /usr/local/lib 2>/dev/null` \

Modified: tcl8.5/trunk/debian/patches/manpages.diff
===================================================================
--- tcl8.5/trunk/debian/patches/manpages.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/manpages.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.5-8.5.10.orig/unix/installManPage
-+++ tcl8.5-8.5.10/unix/installManPage
+--- tcl8.5-8.5.11.orig/unix/installManPage
++++ tcl8.5-8.5.11/unix/installManPage
 @@ -91,8 +91,16 @@
  	exit 2 ;;
  esac

Modified: tcl8.5/trunk/debian/patches/non-linux.diff
===================================================================
--- tcl8.5/trunk/debian/patches/non-linux.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/non-linux.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -1,8 +1,8 @@
 Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
 building on non-linux Debian architectures.
 
---- tcl8.5-8.5.10.orig/unix/configure
-+++ tcl8.5-8.5.10/unix/configure
+--- tcl8.5-8.5.11.orig/unix/configure
++++ tcl8.5-8.5.11/unix/configure
 @@ -6536,6 +6536,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -22,8 +22,8 @@
  	    SHLIB_CFLAGS="-fPIC"
  	    SHLIB_SUFFIX=".so"
  
---- tcl8.5-8.5.10.orig/unix/Makefile.in
-+++ tcl8.5-8.5.10/unix/Makefile.in
+--- tcl8.5-8.5.11.orig/unix/Makefile.in
++++ tcl8.5-8.5.11/unix/Makefile.in
 @@ -170,6 +170,7 @@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
@@ -32,8 +32,8 @@
  TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
---- tcl8.5-8.5.10.orig/unix/tcl.m4
-+++ tcl8.5-8.5.10/unix/tcl.m4
+--- tcl8.5-8.5.11.orig/unix/tcl.m4
++++ tcl8.5-8.5.11/unix/tcl.m4
 @@ -962,6 +962,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`

Modified: tcl8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/rpath.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/rpath.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -1,8 +1,8 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.5-8.5.10.orig/unix/configure
-+++ tcl8.5-8.5.10/unix/configure
+--- tcl8.5-8.5.11.orig/unix/configure
++++ tcl8.5-8.5.11/unix/configure
 @@ -7351,6 +7351,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
@@ -13,9 +13,9 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- tcl8.5-8.5.10.orig/unix/Makefile.in
-+++ tcl8.5-8.5.10/unix/Makefile.in
-@@ -719,7 +719,10 @@
+--- tcl8.5-8.5.11.orig/unix/Makefile.in
++++ tcl8.5-8.5.11/unix/Makefile.in
+@@ -721,7 +721,10 @@
  	    fi
  	@echo "Installing $(LIB_FILE) to $(LIB_INSTALL_DIR)/"
  	@@INSTALL_LIB@
@@ -27,8 +27,8 @@
  	@echo "Installing ${TCL_EXE} as $(BIN_INSTALL_DIR)/tclsh$(VERSION)@EXEEXT@"
  	@$(INSTALL_PROGRAM) ${TCL_EXE} "$(BIN_INSTALL_DIR)"/tclsh$(VERSION)@EXEEXT@
  	@echo "Installing tclConfig.sh to $(CONFIG_INSTALL_DIR)/"
---- tcl8.5-8.5.10.orig/unix/tcl.m4
-+++ tcl8.5-8.5.10/unix/tcl.m4
+--- tcl8.5-8.5.11.orig/unix/tcl.m4
++++ tcl8.5-8.5.11/unix/tcl.m4
 @@ -1401,6 +1401,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"

Modified: tcl8.5/trunk/debian/patches/tcllibrary.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tcllibrary.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -1,6 +1,6 @@
---- tcl8.5-8.5.10.orig/unix/configure
-+++ tcl8.5-8.5.10/unix/configure
-@@ -18769,7 +18769,7 @@
+--- tcl8.5-8.5.11.orig/unix/configure
++++ tcl8.5-8.5.11/unix/configure
+@@ -18771,7 +18771,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.10.orig/unix/configure.in
-+++ tcl8.5-8.5.10/unix/configure.in
-@@ -736,7 +736,7 @@
+--- tcl8.5-8.5.11.orig/unix/configure.in
++++ tcl8.5-8.5.11/unix/configure.in
+@@ -738,7 +738,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -20,8 +20,8 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.10.orig/library/init.tcl
-+++ tcl8.5-8.5.10/library/init.tcl
+--- tcl8.5-8.5.11.orig/library/init.tcl
++++ tcl8.5-8.5.11/library/init.tcl
 @@ -46,7 +46,7 @@
  }
  namespace eval tcl {

Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -2,9 +2,9 @@
 without adding /usr/lib to it. It helps to put the policy compliant value to
 ::tcl_pkgPath variable and to TCL_PACKAGE_PATH variable in tclConfig.sh.
 
---- tcl8.5-8.5.10.orig/unix/configure
-+++ tcl8.5-8.5.10/unix/configure
-@@ -18892,9 +18892,9 @@
+--- tcl8.5-8.5.11.orig/unix/configure
++++ tcl8.5-8.5.11/unix/configure
+@@ -18894,9 +18894,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then
@@ -16,9 +16,9 @@
  fi
  
  #--------------------------------------------------------------------
---- tcl8.5-8.5.10.orig/unix/configure.in
-+++ tcl8.5-8.5.10/unix/configure.in
-@@ -821,9 +821,9 @@
+--- tcl8.5-8.5.11.orig/unix/configure.in
++++ tcl8.5-8.5.11/unix/configure.in
+@@ -823,9 +823,9 @@
      test -z "$TCL_MODULE_PATH"  && \
  	TCL_MODULE_PATH="~/Library/Tcl /Library/Tcl /System/Library/Tcl"
  elif test "$prefix/lib" != "$libdir"; then

Modified: tcl8.5/trunk/debian/patches/tclport.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclport.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/tclport.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -1,8 +1,8 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
 
---- tcl8.5-8.5.10.orig/generic/tclPort.h
-+++ tcl8.5-8.5.10/generic/tclPort.h
+--- tcl8.5-8.5.11.orig/generic/tclPort.h
++++ tcl8.5-8.5.11/generic/tclPort.h
 @@ -22,7 +22,7 @@
  #endif
  #include "tcl.h"

Modified: tcl8.5/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclprivate.diff	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/patches/tclprivate.diff	2011-12-08 11:29:19 UTC (rev 1198)
@@ -2,8 +2,8 @@
 with Tcl sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
 puts private Tcl headers there).
 
---- tcl8.5-8.5.10.orig/unix/tclConfig.sh.in
-+++ tcl8.5-8.5.10/unix/tclConfig.sh.in
+--- tcl8.5-8.5.11.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.11/unix/tclConfig.sh.in
 @@ -100,7 +100,7 @@
  
  # String to pass to linker to pick up the Tcl library from its

Modified: tcl8.5/trunk/debian/rules
===================================================================
--- tcl8.5/trunk/debian/rules	2011-11-28 02:58:04 UTC (rev 1197)
+++ tcl8.5/trunk/debian/rules	2011-12-08 11:29:19 UTC (rev 1198)
@@ -35,7 +35,9 @@
 	quilt push -a || test $$? = 2
 	touch patch-stamp
 
-build: build-stamp
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
 	# So so ugly but it works...
@@ -183,8 +185,8 @@
 binary: binary-indep binary-arch
 
 get-orig-source:
-	wget -O tcl8.5_8.5.10.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5.10-src.tar.gz
+	wget -O tcl8.5_8.5.11.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl8.5.11-src.tar.gz
 
-.PHONY: patch unpatch clean-patched build clean binary-indep binary-arch binary install get-orig-source
+.PHONY: patch unpatch clean-patched build build-arch build-indep clean binary-indep binary-arch binary install get-orig-source

More information about the Pkg-tcltk-commits mailing list