summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 14:50:55 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 14:50:55 +0000
commit8f236592e9fc48679b8b000eff8bee07890cc487 (patch)
tree75b154904a3057623d37f4b98e6ab34912014e63
parentMerging upstream version 0.8.1. (diff)
downloadlibssh-8f236592e9fc48679b8b000eff8bee07890cc487.zip
libssh-8f236592e9fc48679b8b000eff8bee07890cc487.tar.xz
Merging debian version 0.8.1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog9
-rw-r--r--debian/libssh-dev.install9
-rw-r--r--debian/libssh-gcrypt-4.lintian-overrides2
-rw-r--r--debian/libssh-gcrypt-dev.install1
4 files changed, 16 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 81a86c2..466e4d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libssh (0.8.1-1) unstable; urgency=medium
+
+ * New upstream version 0.8.1
+ - Fix Version field in pkg-config file (Closes: #906049)
+ * debian/*-dev.install: Install the libssh-config.cmake file
+ * debian/libssh-gcrypt-4.lintian-overrides: Adjust soname of the library
+
+ -- Laurent Bigonville <bigon@debian.org> Tue, 14 Aug 2018 09:43:56 +0200
+
libssh (0.8.0-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/libssh-dev.install b/debian/libssh-dev.install
index f631401..8e98851 100644
--- a/debian/libssh-dev.install
+++ b/debian/libssh-dev.install
@@ -1,4 +1,5 @@
-debian/tmp/usr/include/libssh/
-debian/tmp/usr/lib/*/libssh.a
-debian/tmp/usr/lib/*/libssh.so
-debian/tmp/usr/lib/*/pkgconfig/
+usr/include/libssh/
+usr/lib/*/cmake/libssh/
+usr/lib/*/libssh.a
+usr/lib/*/libssh.so
+usr/lib/*/pkgconfig/
diff --git a/debian/libssh-gcrypt-4.lintian-overrides b/debian/libssh-gcrypt-4.lintian-overrides
index bcdafa6..d4c4d25 100644
--- a/debian/libssh-gcrypt-4.lintian-overrides
+++ b/debian/libssh-gcrypt-4.lintian-overrides
@@ -1,3 +1,3 @@
libssh-gcrypt-4: package-name-doesnt-match-sonames libssh-gcrypt4
# The development symlink is not renamed to add the "-gcrypt" suffix
-libssh-gcrypt-4: dev-pkg-without-shlib-symlink usr/lib/*/libssh-gcrypt.so.4.5.0 usr/lib/*/libssh-gcrypt.so
+libssh-gcrypt-4: dev-pkg-without-shlib-symlink usr/lib/*/libssh-gcrypt.so.4.5.1 usr/lib/*/libssh-gcrypt.so
diff --git a/debian/libssh-gcrypt-dev.install b/debian/libssh-gcrypt-dev.install
index a0faa2a..8e98851 100644
--- a/debian/libssh-gcrypt-dev.install
+++ b/debian/libssh-gcrypt-dev.install
@@ -1,4 +1,5 @@
usr/include/libssh/
+usr/lib/*/cmake/libssh/
usr/lib/*/libssh.a
usr/lib/*/libssh.so
usr/lib/*/pkgconfig/