From 8ee3d4e9953a66bc3b1a590c77aac86d77dc9d6b Mon Sep 17 00:00:00 2001
From: Joerg Desch <github@jdesch.de>
Date: Wed, 11 Apr 2018 16:38:28 +0200
Subject: [PATCH 1/2] made some fixes to make the Debian build system compile
 the packages.

---
 CMakeLists.txt               | 2 +-
 debian/changelog             | 8 ++++++++
 debian/libstlink-dev.install | 6 +++---
 debian/libstlink1.install    | 2 +-
 debian/stlink-gui.install    | 4 ++--
 debian/stlink-tools.install  | 2 +-
 include/CMakeLists.txt       | 4 ++--
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7e88b4a6..8122a24bf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ endif()
 if (WIN32)
     set(STLINK_LIBRARY_PATH ${CMAKE_LIBRARY_PATH} CACHE PATH "Target lib directory")
 else()
-    set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}/${CMAKE_LIBRARY_PATH}" CACHE PATH "Target lib directory")
+    set(STLINK_LIBRARY_PATH "${LIB_INSTALL_DIR}" CACHE PATH "Target lib directory")
 endif(WIN32)
 
 option(STLINK_GENERATE_MANPAGES "Generate manpages with pandoc" OFF)
diff --git a/debian/changelog b/debian/changelog
index ac18fd872..739d30209 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+stlink (1.5.0~joede9+1) stretch-backports; urgency=medium
+
+  * Ported for stretch-experimental. Some of the debian/*.install
+    files doesn't work as expected. I had to remove some
+    unnecessary pathes from some CMakelist.txt files.
+
+ -- Joerg Desch <debian@jdesch.de>  Wed, 11 Apr 2018 16:34:24 +0200
+
 stlink (1.5.0) unstable; urgency=medium
 
   [ Jerry Jacobs ]
diff --git a/debian/libstlink-dev.install b/debian/libstlink-dev.install
index 0c3543cd9..0fe94691c 100644
--- a/debian/libstlink-dev.install
+++ b/debian/libstlink-dev.install
@@ -1,5 +1,5 @@
 usr/include/*
-usr/lib/*/lib*.a
-usr/lib/*/pkgconfig/*
-usr/lib/*/lib*.so
+usr/lib/libstlink*.a
+usr/lib/pkgconfig/*
+#usr/lib/libstlink*.so
 
diff --git a/debian/libstlink1.install b/debian/libstlink1.install
index 3ddde5841..8cf85474a 100644
--- a/debian/libstlink1.install
+++ b/debian/libstlink1.install
@@ -1 +1 @@
-usr/lib/*/lib*.so.*
+usr/lib/libstlink*.so*
diff --git a/debian/stlink-gui.install b/debian/stlink-gui.install
index d18d2cec4..30f7d28cc 100644
--- a/debian/stlink-gui.install
+++ b/debian/stlink-gui.install
@@ -1,2 +1,2 @@
-/usr/bin/stlink-gui*
-/usr/share/stlink/stlink-gui.ui
+usr/bin/stlink-gui*
+usr/share/stlink/stlink-gui.ui
diff --git a/debian/stlink-tools.install b/debian/stlink-tools.install
index ca875a0e6..9833427a0 100644
--- a/debian/stlink-tools.install
+++ b/debian/stlink-tools.install
@@ -1,3 +1,3 @@
-/usr/bin/st-*
+usr/bin/st-*
 lib/udev/rules.d/*.rules
 etc/modprobe.d/*.conf
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 0b5a443c0..b7329883b 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -7,8 +7,8 @@ file(GLOB STLINK_HEADERS
 	"${CMAKE_BINARY_DIR}/include/stlink/*.h"
 )
 install(FILES ${CMAKE_SOURCE_DIR}/include/stlink.h
-	DESTINATION include/${CMAKE_LIBRARY_PATH}
+	DESTINATION include
 )
 install(FILES ${STLINK_HEADERS}
-	DESTINATION include/${CMAKE_LIBRARY_PATH}/stlink
+	DESTINATION include/stlink
 )

From 7263a81074f7f4627a357fb5580111f765c04f31 Mon Sep 17 00:00:00 2001
From: Joerg Desch <github@jdesch.de>
Date: Wed, 11 Apr 2018 16:41:54 +0200
Subject: [PATCH 2/2] add a temporary directory to gitignore.

---
 debian/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/debian/.gitignore b/debian/.gitignore
index 7624d1c9b..5536917ea 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -5,6 +5,7 @@ debhelper-build-stamp
 *.substvars
 libstlink-dev
 libstlink
+libstlink1
 stlink-gui
 stlink-tools
 tmp