Control: retitle -1 jessie-pu: package ttylog/0.26-1~deb8u1
Adam,
On Thursday, December 31, 2015 08:09:28 PM Adam D. Barratt wrote:
>
> I see that you've already uploaded a package for this. I'm afraid that
> I'm going to have to reject that upload. For future reference, this is
> why the preferred process is for the diff to be approved /before/ the
> upload, rather than the discussion occurring afterwards.
> ....
Very much appreciate you taking the time to explain all of that!
> The rest of the diff looks okay from a quick view. If you'd like to
> prepare and test a package that reverts the debhelper changes and is
> versioned as 0.26-1~deb8u1, please attach a new debdiff to this bug and
> I'd be happy to look at reviewing that.
Please see the attached debdiff-deb8u1.txt for the new debdiff between the
existing version ttylog_0.25-1 in jessie and the proposed update package
version 0.26-1~deb8u1.
Regards,
RJ Clay
diff -Nru ttylog-0.25/ChangeLog ttylog-0.26/ChangeLog
--- ttylog-0.25/ChangeLog 2013-02-14 15:25:52.000000000 -0500
+++ ttylog-0.26/ChangeLog 2015-06-03 13:32:14.000000000 -0400
@@ -1,3 +1,24 @@
+2015-6-03 Robert James Clay <j...@rocasa.us> 0.26
+
+ * ttylog.c: Correct truncating of modem_device string, implementing ttylog
+ patch #3 (thanks to Daniel Flinkmann). Closes Debian Bug #731086.
+ * ttylog.c: Rewrite the "-h|--help" option code, including the expansion
+ of the "Usage:" line.
+ * ttylog.c: Rewrite the '-v|--version' option code, including the addition
+ of the License and Copyright information.
+ * ChangeLog: Correct bad date entry for v0.1.b-3.
+
+
+2014-7-29 Robert James Clay <j...@rocasa.us>
+
+ * ttylog.8: Rewrite the '-f --flush' option description in ttylog.8.
+
+
+2013-6-19 Robert James Clay <j...@rocasa.us>
+
+ * README.md: Add initial version of the README.md file.
+
+
2013-2-14 Robert James Clay <j...@rocasa.us> 0.25
* ttylog.c: Corrections to the code adding a NULL to modem_device variable.
@@ -77,7 +98,7 @@
* Fix nostrip build issue. (Closes: bug#438226)
-2008-11-2002 Tibor Koleszar <o...@debian.org> 0.1.b-3
+2002-11-04 Tibor Koleszar <o...@debian.org> 0.1.b-3
* Using optional output flush - Closes: Debian bug#164778
diff -Nru ttylog-0.25/COPYRIGHT ttylog-0.26/COPYRIGHT
--- ttylog-0.25/COPYRIGHT 2013-02-14 15:25:52.000000000 -0500
+++ ttylog-0.26/COPYRIGHT 2015-06-03 13:32:14.000000000 -0400
@@ -1,7 +1,7 @@
ttylog - TTY logger
Copyright (C) 1999-2002 Tibor Koleszar <o...@debian.org>
- Copyright (C) 2008-2013 Robert James Clay <j...@rocasa.us>
+ Copyright (C) 2008-2015 Robert James Clay <j...@rocasa.us>
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff -Nru ttylog-0.25/debian/changelog ttylog-0.26/debian/changelog
--- ttylog-0.25/debian/changelog 2013-06-20 15:47:56.000000000 -0400
+++ ttylog-0.26/debian/changelog 2015-12-31 22:46:54.000000000 -0500
@@ -1,3 +1,22 @@
+ttylog (0.26-1~deb8u1) stable; urgency=medium
+
+ * Resolve the issue in 'jessie' with the truncating of the modem_device
string
+ during the normal operation of ttylog.
+ * Revert Debhelper Compatibility and Build-Depends to version 8 for 'jessie'.
+
+ -- Robert James Clay <j...@rocasa.us> Thu, 31 Dec 2015 22:38:47 -0500
+
+ttylog (0.26-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Correct truncating of 'modem_device' string. (Closes: #731086).
+ * Reformat the long descriptions in debian/control.
+ * Set Debhelper Compatibility and Build-Depends to version 9.
+ * Update copyright years for Robert James Clay in debian/copyright.
+ * Set Standards Version in debian/control to 3.9.6, no changes required.
+
+ -- Robert James Clay <j...@rocasa.us> Sun, 21 Jun 2015 09:46:01 -0400
+
ttylog (0.25-1) unstable; urgency=low
* New upstream release, including:
@@ -35,14 +54,14 @@
* New upstream release.
* Set debhelper Build-Depends to version 7.
* Explicitly set Debian package format as 1.0.
- * Changed debian/watch to point to Sourceforge.
+ * Changed debian/watch to point to Sourceforge.
* Change Maintainer email address to j...@rocasa.us.
* Set Standards Version to 3.9.1; no changes necessary.
* Detailed the Debian packaging copyright in debian/copyright.
* Change homepage in debian/control to Sourceforge project site.
* Add Vcs-Git & Vcs-Browser to debian/control. (Closes: #566938)
* Changed to using dh_prep in the install target of debian/rules.
-
+
-- Robert James Clay <j...@rocasa.us> Sat, 26 Mar 2011 14:15:39 -0400
ttylog (0.1.c-1) unstable; urgency=low
@@ -74,7 +93,7 @@
ttylog (0.1.b-3) unstable; urgency=low
* Using optional output flush - Closes: bug#164778
-
+
-- Tibor Koleszar <o...@debian.org> Sat, 04 Nov 2002 15:18:12 +0200
ttylog (0.1.b-2) unstable; urgency=low
@@ -84,7 +103,7 @@
* Added COPYRIGHT and LICENCE files - Closes: bug#127499
* Using debhelper instead of debmake - Closes: bug#119600
* Its not a debian native package - Closes: bug#127498
-
+
-- Tibor Koleszar <o...@debian.org> Sat, 12 Jan 2002 13:21:27 +0200
ttylog (0.1.b-1) unstable; urgency=low
@@ -93,7 +112,7 @@
* Removed binary files from upstream - Closes: bug#127496
* Added COPYRIGHT and LICENCE files - Closes: bug#127499
* Using debhelper instead of debmake - Closes: bug#119600
-
+
-- Tibor Koleszar <o...@debian.org> Sat, 12 Jan 2002 13:21:27 +0200
ttylog (0.1.a-3) unstable; urgency=low
diff -Nru ttylog-0.25/debian/control ttylog-0.26/debian/control
--- ttylog-0.25/debian/control 2013-06-20 15:47:56.000000000 -0400
+++ ttylog-0.26/debian/control 2015-12-31 22:46:54.000000000 -0500
@@ -3,7 +3,7 @@
Priority: extra
Maintainer: Robert James Clay <j...@rocasa.us>
Build-Depends: debhelper (>= 8), dpkg-dev (>= 1.16.1~), cmake
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Vcs-Git: git://git.code.sf.net/p/ttylog/code -b debian
Vcs-Browser: http://sourceforge.net/p/ttylog/code/
Homepage: http://ttylog.sourceforge.net
@@ -12,18 +12,15 @@
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: serial port logger
- Print everything to stdout that comes from a
- serial device. You can specify the device and
- the baud rate.
+ Print everything to stdout that comes from a serial device. You can specify
+ the device and the baud rate.
Package: ttylog-dbg
Architecture: any
Section: debug
Depends: ttylog (= ${binary:Version}), ${misc:Depends}
Description: debugging symbols for ttylog
- Print everything to stdout that comes from a
- serial device. You can specify the device and
- the baud rate.
+ Print everything to stdout that comes from a serial device. You can specify
+ the device and the baud rate.
.
- This package contains the debugging symbols for
- ttylog.
+ This package contains the debugging symbols for ttylog.
diff -Nru ttylog-0.25/debian/copyright ttylog-0.26/debian/copyright
--- ttylog-0.25/debian/copyright 2013-06-20 15:47:56.000000000 -0400
+++ ttylog-0.26/debian/copyright 2015-12-31 22:46:54.000000000 -0500
@@ -5,14 +5,14 @@
Files: *
Copyright: 1999-2002, Tibor Koleszar <o...@debian.org>
- 2008-2013, Robert James Clay <j...@rocasa.us>
+ 2008-2015, Robert James Clay <j...@rocasa.us>
License: GPL-2+
Files: debian/*
Comment: Copyright and License for the debian directory files.
Copyright: 1999-2002, Tibor Koleszar <o...@debian.org>
2006, Andrew Pollock <apoll...@debian.org>
- 2008-2013, Robert James Clay <j...@rocasa.us>
+ 2008-2015, Robert James Clay <j...@rocasa.us>
License: GPL-2+
License: GPL-2+
diff -Nru ttylog-0.25/README.md ttylog-0.26/README.md
--- ttylog-0.25/README.md 1969-12-31 19:00:00.000000000 -0500
+++ ttylog-0.26/README.md 2015-06-03 13:32:14.000000000 -0400
@@ -0,0 +1,7 @@
+ttylog
+======
+
+Print everything to stdout that comes from a serial device. You can specify
+device and baud rate of the device.
+
+Information about how to build ttylog can be found in the INSTALL file.
diff -Nru ttylog-0.25/ttylog.8 ttylog-0.26/ttylog.8
--- ttylog-0.25/ttylog.8 2013-02-14 15:25:52.000000000 -0500
+++ ttylog-0.26/ttylog.8 2015-06-03 13:32:14.000000000 -0400
@@ -1,4 +1,4 @@
-.TH TTYLOG 8 "2012-09-25" "" ""
+.TH TTYLOG 8 "2014-07-29" "" ""
.SH NAME
ttylog \- serial device logger
.SH DESCRIPTION
@@ -22,7 +22,7 @@
The serial device. For example /dev/ttyS1
.TP
.B -f --flush
-Flush output
+Output buffers are flushed after every write.
.SH AUTHOR
This manual page was originally written by Tibor Koleszar
<t.koles...@somogy.hu>,
for the Debian GNU/Linux system. Modifications and updates written by
diff -Nru ttylog-0.25/ttylog.c ttylog-0.26/ttylog.c
--- ttylog-0.25/ttylog.c 2013-02-14 15:25:52.000000000 -0500
+++ ttylog-0.26/ttylog.c 2015-06-03 13:32:14.000000000 -0400
@@ -1,6 +1,6 @@
/* ttylog - serial port logger
Copyright (C) 1999-2002 Tibor Koleszar
- Copyright (C) 2008-2013 Robert James Clay
+ Copyright (C) 2008-2015 Robert James Clay
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <fcntl.h>
-#define VERSION "0.25"
+#define VERSION "0.26"
#define BAUDN 9
char flush = 0;
@@ -59,15 +59,22 @@
if (!strcmp (argv[i], "-h") || !strcmp (argv[i], "--help"))
{
- printf ("ttylog version %s. Programmed by Tibor Koleszar
<o...@debian.org>\n", VERSION);
- printf ("Usage: \n -h, --help This help\n -v, --version
Version number\n");
- printf (" -b, --baud Baud rate\n -d, --device Serial device
(eg. /dev/ttyS1)\n -f, --flush Flush output\n");
+ printf ("ttylog version %s\n", VERSION);
+ printf ("Usage: ttylog [-b|--baud] [-d|--device] [-f|--flush] >
/path/to/logfile\n");
+ printf (" -h, --help This help\n -v, --version Version
number\n -b, --baud Baud rate\n");
+ printf (" -d, --device Serial device (eg. /dev/ttyS1)\n -f,
--flush Flush output\n");
+ printf ("ttylog home page: <http://ttylog.sourceforge.net/>\n\n");
exit (0);
}
if (!strcmp (argv[i], "-v") || !strcmp (argv[i], "--version"))
{
- printf ("ttylog version %s.\n", VERSION);
+ printf ("ttylog version %s\n", VERSION);
+ printf ("Copyright (C) 2015 Robert James Clay <j...@rocasa.us>\n");
+ printf ("Copyright (C) 2002 Tibor Koleszar <o...@debian.org>\n");
+ printf ("License GPLv2+:
<http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>\n");
+ printf ("This is free software: you are free to change and
redistribute it.\n");
+ printf ("There is NO WARRANTY, to the extent permitted by law.\n");
exit (0);
}
@@ -97,7 +104,7 @@
{
memset (modem_device, '\0', sizeof(modem_device));
strncpy (modem_device, argv[i + 1], sizeof(modem_device)-1);
- modem_device[i + 1] = '\0';
+ modem_device[(sizeof(modem_device)-1)] = '\0';
}
else
{
