[SCM] libindi packaging branch, master, updated. debian/1.4.1+dfsg-3

Pino Toscano pino at moszumanska.debian.org
Sat Dec 2 17:29:54 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libindi.git;a=commitdiff;h=1396aa8

The following commit has been merged in the master branch:
commit 1396aa86e5ab727c6a2d582f4e93a2a38dc195aa
Author: Pino Toscano <pino at debian.org>
Date:   Sat Nov 25 08:44:48 2017 +0100

    fix termio.h include
---
 debian/changelog                |  2 ++
 debian/patches/series           |  1 +
 debian/patches/use_termios.diff | 20 ++++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 33cbad6..f6a2590 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libindi (1.4.1+dfsg-2) UNRELEASED; urgency=medium
     upstream_cmake-rewrite-libusb-1.0-search.patch.
   * Backport upstream commit 921b6a1a5536642967ea4c3d481a48fd8a2ed296 to fix
     one libusb.h include; patch upstream_Fix-libusb.h-include.patch.
+  * Include termios.h instead of termio.h for portability; patch
+    use_termios.diff.
 
  -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 25 Nov 2017 08:23:43 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index 0e4aa13..08851de 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 upstream_cmake-rewrite-libusb-1.0-search.patch
 upstream_Fix-libusb.h-include.patch
+use_termios.diff
diff --git a/debian/patches/use_termios.diff b/debian/patches/use_termios.diff
new file mode 100644
index 0000000..9f191e0
--- /dev/null
+++ b/debian/patches/use_termios.diff
@@ -0,0 +1,20 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Include termios.h on any UNIX platform
+ termios.h is POSIX, termio.h is not (and thus it does not exist everywhere).
+ .
+ This was fixed upstream with commit c491f59d513e304ad5eeca4adfc311ddbee12975,
+ together with other changes.
+Last-Update: 2017-11-25
+Forwarded: not-needed
+ 
+--- a/libindi/drivers/focuser/smartfocus.cpp
++++ b/libindi/drivers/focuser/smartfocus.cpp
+@@ -20,7 +20,7 @@
+ #include "indicom.h"
+ 
+ #include <fcntl.h>
+-#ifdef __APPLE__
++#ifdef __unix__
+ #include <termios.h>
+ #else
+ #include <termio.h>

-- 
libindi packaging



More information about the pkg-kde-commits mailing list