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

sgolovan at alioth.debian.org sgolovan at alioth.debian.org
Wed Jun 26 07:50:46 UTC 2013 

Author: sgolovan
Date: 2013-06-26 07:50:45 +0000 (Wed, 26 Jun 2013)
New Revision: 1374

Modified:
   tcl8.5/trunk/debian/changelog
   tcl8.5/trunk/debian/control
   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]
  * Merged changes from experimental.
  * Don't compress manpages twice when building the package.
  * Bumped standards version to 3.9.4.


Modified: tcl8.5/trunk/debian/changelog
===================================================================
--- tcl8.5/trunk/debian/changelog	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/changelog	2013-06-26 07:50:45 UTC (rev 1374)
@@ -1,9 +1,31 @@
-tcl8.5 (8.5.11-3) UNRELEASED; urgency=low
+tcl8.5 (8.5.14-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * Don't compress manpages twice when building the package.
+  * Bumped standards version to 3.9.4.
 
- -- Sergei Golovan <sgolovan at debian.org>  Mon, 28 May 2012 17:38:23 +0400
+ -- Sergei Golovan <sgolovan at debian.org>  Wed, 26 Jun 2013 11:48:11 +0400
 
+tcl8.5 (8.5.14-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Thu, 18 Apr 2013 13:05:59 +0400
+
+tcl8.5 (8.5.13-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 24 Nov 2012 11:53:46 +0400
+
+tcl8.5 (8.5.12-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed patches in debian/patches directory.
+
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 28 Jul 2012 09:57:40 +0400
+
 tcl8.5 (8.5.11-2) unstable; urgency=low
 
   * Install library(3tcl), packagens(3tcl), pkgMkIndex(3tcl) and safe(3tcl)

Modified: tcl8.5/trunk/debian/control
===================================================================
--- tcl8.5/trunk/debian/control	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/control	2013-06-26 07:50:45 UTC (rev 1374)
@@ -4,7 +4,7 @@
 Maintainer: Tcl/Tk Debian Packagers <pkg-tcltk-devel at lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 8.0.0), dpkg-dev (>= 1.16.1~)
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.5

Modified: tcl8.5/trunk/debian/patches/confsearch.diff
===================================================================
--- tcl8.5/trunk/debian/patches/confsearch.diff	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/confsearch.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -2,8 +2,8 @@
 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
 installation.
 
---- tcl8.5-8.5.11.orig/unix/tcl.m4
-+++ tcl8.5-8.5.11/unix/tcl.m4
+--- tcl8.5-8.5.14.orig/unix/tcl.m4
++++ tcl8.5-8.5.14/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	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/manpages.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -2,8 +2,8 @@
 aren't installed by upstream script but are referenced inside other
 manual pages.
 
---- tcl8.5-8.5.11.orig/unix/installManPage
-+++ tcl8.5-8.5.11/unix/installManPage
+--- tcl8.5-8.5.14.orig/unix/installManPage
++++ tcl8.5-8.5.14/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	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/non-linux.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -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.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
 @@ -6536,6 +6536,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
@@ -13,18 +13,9 @@
  	    fi
  	fi
  
-@@ -7341,7 +7344,7 @@
- fi
- 
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_SUFFIX=".so"
- 
---- tcl8.5-8.5.11.orig/unix/Makefile.in
-+++ tcl8.5-8.5.11/unix/Makefile.in
-@@ -170,6 +170,7 @@
+--- tcl8.5-8.5.14.orig/unix/Makefile.in
++++ tcl8.5-8.5.14/unix/Makefile.in
+@@ -172,6 +172,7 @@
  SHLIB_LD		= @SHLIB_LD@
  SHLIB_CFLAGS		= @SHLIB_CFLAGS@
  SHLIB_LD_LIBS		= @SHLIB_LD_LIBS@
@@ -32,9 +23,9 @@
  TCL_SHLIB_LD_EXTRAS	= @TCL_SHLIB_LD_EXTRAS@
  
  SHLIB_SUFFIX		= @SHLIB_SUFFIX@
---- tcl8.5-8.5.11.orig/unix/tcl.m4
-+++ tcl8.5-8.5.11/unix/tcl.m4
-@@ -962,6 +962,9 @@
+--- tcl8.5-8.5.14.orig/unix/tcl.m4
++++ tcl8.5-8.5.14/unix/tcl.m4
+@@ -961,6 +961,9 @@
  		if test "`uname -s`" = "AIX" ; then
  		    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
  		fi
@@ -44,12 +35,3 @@
  	    fi
  	fi
      ])
-@@ -1391,7 +1394,7 @@
- 	        ])
- 	    ])
- 	    ;;
--	Linux*)
-+	Linux*|GNU*|NetBSD-Debian)
- 	    SHLIB_CFLAGS="-fPIC"
- 	    SHLIB_SUFFIX=".so"
- 

Modified: tcl8.5/trunk/debian/patches/rpath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/rpath.diff	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/rpath.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -1,9 +1,9 @@
 Patch by Chris Waters removes -rpath from search flags and adds -soname
 to library build options.
 
---- tcl8.5-8.5.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
-@@ -7351,6 +7351,9 @@
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
+@@ -7427,6 +7427,9 @@
  	    # get rid of the warnings.
  	    #CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
  
@@ -13,23 +13,23 @@
  	    SHLIB_LD='${CC} -shared ${CFLAGS} ${LDFLAGS}'
  	    DL_OBJS="tclLoadDl.o"
  	    DL_LIBS="-ldl"
---- 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)/"
+--- tcl8.5-8.5.14.orig/unix/Makefile.in
++++ tcl8.5-8.5.14/unix/Makefile.in
+@@ -719,7 +719,10 @@
+ 	    done;
+ 	@echo "Installing $(LIB_FILE) to $(DLL_INSTALL_DIR)/"
  	@@INSTALL_LIB@
--	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+	mv "$(LIB_INSTALL_DIR)"/$(LIB_FILE) "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
-+	ln -sf $(LIB_FILE).0 "$(LIB_INSTALL_DIR)"/$(LIB_FILE)
-+	ln -sf "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0 ./
-+	@chmod 555 "$(LIB_INSTALL_DIR)"/$(LIB_FILE).0
+-	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
++	mv "$(DLL_INSTALL_DIR)"/$(LIB_FILE) "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
++	ln -sf $(LIB_FILE).0 "$(DLL_INSTALL_DIR)"/$(LIB_FILE)
++	ln -sf "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0 ./
++	@chmod 555 "$(DLL_INSTALL_DIR)"/$(LIB_FILE).0
  	@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.11.orig/unix/tcl.m4
-+++ tcl8.5-8.5.11/unix/tcl.m4
-@@ -1401,6 +1401,9 @@
+--- tcl8.5-8.5.14.orig/unix/tcl.m4
++++ tcl8.5-8.5.14/unix/tcl.m4
+@@ -1422,6 +1422,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	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/tcllibrary.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -1,6 +1,6 @@
---- tcl8.5-8.5.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
-@@ -18771,7 +18771,7 @@
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
+@@ -18888,7 +18888,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -9,9 +9,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.11.orig/unix/configure.in
-+++ tcl8.5-8.5.11/unix/configure.in
-@@ -738,7 +738,7 @@
+--- tcl8.5-8.5.14.orig/unix/configure.in
++++ tcl8.5-8.5.14/unix/configure.in
+@@ -755,7 +755,7 @@
  
  eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
  
@@ -20,9 +20,9 @@
  PRIVATE_INCLUDE_DIR='$(includedir)'
  HTML_DIR='$(DISTDIR)/html'
  
---- tcl8.5-8.5.11.orig/library/init.tcl
-+++ tcl8.5-8.5.11/library/init.tcl
-@@ -46,7 +46,7 @@
+--- tcl8.5-8.5.14.orig/library/init.tcl
++++ tcl8.5-8.5.14/library/init.tcl
+@@ -47,7 +47,7 @@
  }
  namespace eval tcl {
      variable Dir

Modified: tcl8.5/trunk/debian/patches/tclpackagepath.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclpackagepath.diff	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/tclpackagepath.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -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.11.orig/unix/configure
-+++ tcl8.5-8.5.11/unix/configure
-@@ -18894,9 +18894,9 @@
+--- tcl8.5-8.5.14.orig/unix/configure
++++ tcl8.5-8.5.14/unix/configure
+@@ -19011,9 +19011,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.11.orig/unix/configure.in
-+++ tcl8.5-8.5.11/unix/configure.in
-@@ -823,9 +823,9 @@
+--- tcl8.5-8.5.14.orig/unix/configure.in
++++ tcl8.5-8.5.14/unix/configure.in
+@@ -840,9 +840,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	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/tclport.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -1,14 +1,14 @@
 Patch by Stanislav Maslovski <stanislav.maslovski at gmail.com>.
 See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=488491
 
---- 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"
- #if !defined(_WIN32)
+--- tcl8.5-8.5.14.orig/generic/tclPort.h
++++ tcl8.5-8.5.14/generic/tclPort.h
+@@ -20,7 +20,7 @@
+ #if defined(_WIN32)
+ #   include "tclWinPort.h"
+ #else
 -#   include "tclUnixPort.h"
 +#   include "../unix/tclUnixPort.h"
  #endif
+ #include "tcl.h"
  
- #if defined(__CYGWIN__)

Modified: tcl8.5/trunk/debian/patches/tclprivate.diff
===================================================================
--- tcl8.5/trunk/debian/patches/tclprivate.diff	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/patches/tclprivate.diff	2013-06-26 07:50:45 UTC (rev 1374)
@@ -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.11.orig/unix/tclConfig.sh.in
-+++ tcl8.5-8.5.11/unix/tclConfig.sh.in
+--- tcl8.5-8.5.14.orig/unix/tclConfig.sh.in
++++ tcl8.5-8.5.14/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	2013-06-25 07:45:30 UTC (rev 1373)
+++ tcl8.5/trunk/debian/rules	2013-06-26 07:50:45 UTC (rev 1374)
@@ -34,8 +34,7 @@
 		      --enable-threads \
 		      --enable-dll-unloading \
 		      --disable-rpath \
-		      --enable-man-symlinks \
-		      --enable-man-compression=gzip
+		      --enable-man-symlinks
 
 override_dh_auto_build:
 	touch generic/tclStubInit.c && \
@@ -47,7 +46,6 @@
 	  ranlib libtcl$(v).a
 
 override_dh_auto_install:
-	GZIP=-9 \
 	$(MAKE) -C unix INSTALL_ROOT=$(DIR) \
 			MAN_INSTALL_DIR=$(DIR)/usr/share/man \
 			MANN_INSTALL_DIR=$(DIR)/usr/share/man/man3 \
@@ -78,42 +76,40 @@
 	cp libtommath/*.h $(DIR)/usr/include/tcl$(v)/tcl-private/libtommath
 	# Fix up the manpages.
 	cd $(DIR)/usr/share/man/man1 && \
-	  zcat tclsh.1.gz | sed -e 's/(n)/(3tcl)/g' | gzip -9 > tclsh$(v).1.gz && \
-	  rm tclsh.1.gz
+	  sed -e 's/(n)/(3tcl)/g' tclsh.1 >tclsh$(v).1 && rm tclsh.1
 	cd $(DIR)/usr/share/man/man3 && \
-	  for f in *.[3n].gz ; do \
+	  for f in *.[3n] ; do \
 	     f2=$$(echo $$f | sed -e 's/\.[3n]/.3tcl/') ; \
 	     if [ -L $$f ]; then \
 		l=$$(readlink -n $$f |sed -e 's/\.[3n]/.3tcl/') ; \
 		rm $$f ; \
 		ln -sf $$l $$f2 ; \
 	     else \
-		zcat $$f | sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
-			       -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
-			       -e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
-			       -e 's/send(n)/send(3tk)/g' \
-			       -e 's/text(n)/text(3tk)/g' \
-			       -e 's/tk(n)/tk(3tk)/g' \
-			       -e 's/winfo(n)/winfo(3tk)/g' \
-			       -e 's/(n)/(3tcl)/g' \
-			       -e 's/^\.de OP$$/.de OOP/' \
-			       -e 's/^\.OP /.OOP /' \
-			       -e "s/\\N'244'/\\[^o]/g" \
-			 | gzip -9 >$$f2 ; \
+		sed -e 's/^\.TH \([^ ]\+\|"[^"]\+"\) [3n]/.TH \1 3tcl/' \
+		    -e 's/\(Tk_[0-9A-Za-z]*\)(3)/\1(3tk)/g' \
+		    -e 's/\([A-Z][0-9A-Za-z_]*\)(3)/\1(3tcl)/g' \
+		    -e 's/send(n)/send(3tk)/g' \
+		    -e 's/text(n)/text(3tk)/g' \
+		    -e 's/tk(n)/tk(3tk)/g' \
+		    -e 's/winfo(n)/winfo(3tk)/g' \
+		    -e 's/(n)/(3tcl)/g' \
+		    -e 's/^\.de OP$$/.de OOP/' \
+		    -e 's/^\.OP /.OOP /' \
+		    -e "s/\\N'244'/\\[^o]/g" \
+		    $$f >$$f2 ; \
 		rm $$f ; \
 	     fi ; \
 	  done
-	touch install-stamp
 
 override_dh_makeshlibs:
-	dh_makeshlibs -V 'tcl$(v) (>= 8.5.0)' -XTcltest
+	dh_makeshlibs -V 'tcl$(v) (>= $(v).0)' -XTcltest
 
 override_dh_shlibdeps:
 	dh_shlibdeps -ldebian/tcl$(v)/usr/lib
 
 get-orig-source:
-	wget -O tcl8.5_8.5.11.orig.tar.gz \
-	     http://prdownloads.sourceforge.net/tcl/tcl8.5.11-src.tar.gz
+	wget -O tcl$(v)_$(v).14.orig.tar.gz \
+	     http://prdownloads.sourceforge.net/tcl/tcl$(v).14-src.tar.gz
 
 .PHONY: override_dh_auto_configure override_dh_auto_install override_dh_makeshlibs override_dh_shlibdeps get-orig-source

More information about the Pkg-tcltk-commits mailing list