please unblock gtkterm 0.99.7~rc1-0.2
Hello,
Please unblock gtkterm 0.99.7~rc1-0.2.
* Non-maintainer upload.
* src/serie.c: Added use of "#ifdef __linux__". Closes: #675835. Patch by
Petr Salinger <Petr.Salinger@seznam.cz>.
* debian/copyright: Updated.
Debdiff attached.
Regards,
Bart Martens
diff -u gtkterm-0.99.7~rc1/debian/copyright gtkterm-0.99.7~rc1/debian/copyright
--- gtkterm-0.99.7~rc1/debian/copyright
+++ gtkterm-0.99.7~rc1/debian/copyright
@@ -5,10 +5,52 @@
-Upstream Author: Julien Schmitt <julien@jls-info.com>
+Upstream authors:
+
+ Julien Schmitt <julien@jls-info.com>
+ Zach Davis <zdavkeos -at- gmail.com>
Copyright:
-You are free to redistribute this software under the terms of the GNU
-General Public License.
-On Debian systems, the complete text of the GNU General Public License can
-be found at /usr/share/common-licenses/GPL.
+ Original Code by: (c) Julien Schmitt
+
+License:
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General Public License
+version 3 can be found at /usr/share/common-licenses/GPL-3.
+
+The files src/parsecfg.c and src/parsecfg.h have this copyright and license :
+
+ Copyright (C) 1999-2001 Yuuki NINOMIYA <gm@debian.or.jp>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the
+ Free Software Foundation, Inc.
+
+The address of the Free Software Foundation, Inc. is 51 Franklin St, Fifth
+Floor, Boston, MA 02110-1301, USA.
+
+On Debian systems, the complete text of the GNU General Public License
+version 2 can be found at /usr/share/common-licenses/GPL-2.
diff -u gtkterm-0.99.7~rc1/debian/changelog gtkterm-0.99.7~rc1/debian/changelog
--- gtkterm-0.99.7~rc1/debian/changelog
+++ gtkterm-0.99.7~rc1/debian/changelog
@@ -1,3 +1,12 @@
+gtkterm (0.99.7~rc1-0.2) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * src/serie.c: Added use of "#ifdef __linux__". Closes: #675835. Patch by
+ Petr Salinger <Petr.Salinger@seznam.cz>.
+ * debian/copyright: Updated.
+
+ -- Bart Martens <bartm@debian.org> Fri, 13 Jul 2012 06:17:16 +0000
+
gtkterm (0.99.7~rc1-0.1) unstable; urgency=medium
* Non-Maintainer upload
only in patch2:
unchanged:
--- gtkterm-0.99.7~rc1.orig/src/serie.c
+++ gtkterm-0.99.7~rc1/src/serie.c
@@ -25,7 +25,9 @@
#include <fcntl.h>
#include <stdio.h>
#include <unistd.h>
+#ifdef __linux__
#include <linux/serial.h>
+#endif
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/types.h>
@@ -215,8 +217,12 @@
break;
default:
+#ifdef __linux__
set_custom_speed(config.vitesse, serial_port_fd);
termios_p.c_cflag |= B38400;
+#else
+ return NULL;
+#endif
}
@@ -521,6 +527,7 @@
tcsendbreak(serial_port_fd, 0);
}
+#ifdef __linux__
gint set_custom_speed(int speed, int port_fd)
{
@@ -540,6 +547,7 @@
return 0;
}
+#endif
gchar* get_port_string(void)
{
Reply to: