[Pkg-tcltk-commits] r1948 - in expect/trunk/debian: . patches

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2018-02-04 14:44:22 +0000 (Sun, 04 Feb 2018)
New Revision: 1948

Removed:
   expect/trunk/debian/patches/26-eof-handling.patch
Modified:
   expect/trunk/debian/changelog
   expect/trunk/debian/control
   expect/trunk/debian/patches/series
   expect/trunk/debian/rules
Log:
[expect]
  * New upstream release.
  * Remove a patch by Georg-Johann Lay introduced in 5.45-8 because it has
    been applied upstream.
  * Bump standards version to 4.1.3.


Modified: expect/trunk/debian/changelog
===================================================================
--- expect/trunk/debian/changelog	2018-02-02 06:21:03 UTC (rev 1947)
+++ expect/trunk/debian/changelog	2018-02-04 14:44:22 UTC (rev 1948)
@@ -1,8 +1,11 @@
-expect (5.45.3-2) UNRELEASED; urgency=medium
+expect (5.45.4-1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * New upstream release.
+  * Remove a patch by Georg-Johann Lay introduced in 5.45-8 because it has
+    been applied upstream.
+  * Bump standards version to 4.1.3.
 
- -- Sergei Golovan <sgolovan at debian.org>  Thu, 26 Oct 2017 11:38:56 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sun, 04 Feb 2018 14:17:06 +0300
 
 expect (5.45.3-1) unstable; urgency=medium
 

Modified: expect/trunk/debian/control
===================================================================
--- expect/trunk/debian/control	2018-02-02 06:21:03 UTC (rev 1947)
+++ expect/trunk/debian/control	2018-02-04 14:44:22 UTC (rev 1948)
@@ -4,7 +4,7 @@
 Maintainer: Sergei Golovan <sgolovan at debian.org>
 Build-Depends: debhelper (>= 10.0.0), dpkg-dev (>= 1.16.1~), autoconf, tcl8.6-dev
 Build-Conflicts: autoconf2.13
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Homepage: http://sourceforge.net/projects/expect/
 
 Package: expect

Deleted: expect/trunk/debian/patches/26-eof-handling.patch
===================================================================
--- expect/trunk/debian/patches/26-eof-handling.patch	2018-02-02 06:21:03 UTC (rev 1947)
+++ expect/trunk/debian/patches/26-eof-handling.patch	2018-02-04 14:44:22 UTC (rev 1948)
@@ -1,19 +0,0 @@
-Author: Georg-Johann Lay
-Description: Enhancement of a bugfix by Nils Carlson.
- Replaced a cc==0 check with proper Tcl_Eof() check.
-Last-Modified: Fri, 14 Jul 2017 17:07:47 +0300
-Bug: http://sourceforge.net/p/expect/patches/18/
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=799301
-See-Also: https://gcc.gnu.org/ml/gcc/2017-06/msg00000.html
-
---- a/expect.c
-+++ b/expect.c
-@@ -1861,7 +1861,7 @@
- 	/* try to read it */
- 	cc = expIRead(interp,esPtr,timeout,tcl_set_flags);
- 	
--	if (Tcl_Eof(esPtr->channel)) {
-+	if (cc == 0 && Tcl_Eof(esPtr->channel)) {
- 	    cc = EXP_EOF;
- 	}
-     } else if (cc == EXP_DATA_OLD) {

Modified: expect/trunk/debian/patches/series
===================================================================
--- expect/trunk/debian/patches/series	2018-02-02 06:21:03 UTC (rev 1947)
+++ expect/trunk/debian/patches/series	2018-02-04 14:44:22 UTC (rev 1948)
@@ -12,5 +12,4 @@
 18-non-linux.patch
 22-segfault-with-stubs.patch
 24-format.patch
-26-eof-handling.patch
 28-cross.patch

Modified: expect/trunk/debian/rules
===================================================================
--- expect/trunk/debian/rules	2018-02-02 06:21:03 UTC (rev 1947)
+++ expect/trunk/debian/rules	2018-02-04 14:44:22 UTC (rev 1948)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 v = 5.45
-vv = 5.45.3
+vv = 5.45.4
 tclv = 8.6
 
 DPKG_EXPORT_BUILDFLAGS = 1