summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-04 16:18:57 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-07-04 16:19:21 +0000
commitabae23a8308443dd373a71bd43c65f8a3609ab65 (patch)
treebdd10504933c5618412b3ee160d9d778e33c852c
parentReleasing progress-linux version 0.8.0~20170825.94fa1e38-1~dschinn1. (diff)
downloadlibssh-abae23a8308443dd373a71bd43c65f8a3609ab65.zip
libssh-abae23a8308443dd373a71bd43c65f8a3609ab65.tar.xz
Merging debian version 0.8.0~20170825.94fa1e38-2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog32
-rw-r--r--debian/compat2
-rw-r--r--debian/control17
-rw-r--r--debian/copyright2
-rw-r--r--debian/libssh-4.symbols2
-rw-r--r--debian/libssh-doc.doc-base4
-rw-r--r--debian/libssh-doc.examples2
-rw-r--r--debian/libssh-doc.manpages1
-rw-r--r--debian/libssh-gcrypt-4.symbols2
-rw-r--r--debian/patches/1003-custom-lib-names.patch2
-rwxr-xr-xdebian/rules3
11 files changed, 45 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog
index 103cc50..08e50ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+libssh (0.8.0~20170825.94fa1e38-2) unstable; urgency=medium
+
+ [ Matteo F. Vescovi ]
+ * debian/control:
+ - libnacl-dev b-dep added
+ - S-V bump 4.0.0 -> 4.1.4 (no changes needed)
+ - Vcs-* fields pointing to salsa
+ * debian/: symbols files updated
+ * debian/: debhelper bump 9 -> 11
+ * debian/rules:
+ - drop get-orig-source directive
+ * debian/libssh-doc.doc-base: paths updated
+ * debian/copyright: http:// -> https:// for format
+
+ [ Laurent Bigonville ]
+ * Fix installation of examples
+ * Drop debian/libssh-doc.manpages, the manpages are not generated anymore
+ * debian/*.symbols: Thighten the version for the new symbols
+ * debian/patches/1003-custom-lib-names.patch: Fix grammar to please lintian
+ * debian/control: Remove unnecessary Conflicts against libssh-2-doc and
+ libssh-2-dev packages (Closes: #885208)
+
+ -- Laurent Bigonville <bigon@debian.org> Thu, 07 Jun 2018 14:57:50 +0200
+
libssh (0.8.0~20170825.94fa1e38-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
@@ -22,7 +46,7 @@ libssh (0.8.0~20170825.94fa1e38-1) unstable; urgency=medium
* debian/patches/: patchset refreshed against snapshot release
* debian/: symbols files refreshed for snapshot release
* debian/control: bump OpenSSL b-dep to use 1.1 version
- * debian/copyright: entried updated
+ * debian/copyright: entries updated
* debian/copyright.in: drop useless file
* debian/patches/: patchset updated
- 2004-fix-upstream-version.patch added
@@ -426,7 +450,7 @@ libssh (0.2+svn20070321-4) unstable; urgency=low
* debian/control:
- Add XS-Vcs-Svn and XS-Vcs-Browser fields.
- Change to ${binary:Version} for versionized dependencies.
- * Add debian/README.Debian to disambiguate the package name
+ * Add debian/README.Debian to disambiguate the package name
-- Laurent Bigonville <bigon@bigon.be> Fri, 27 Jul 2007 15:00:06 +0200
@@ -438,7 +462,7 @@ libssh (0.2+svn20070321-3) unstable; urgency=low
libssh (0.2+svn20070321-2) unstable; urgency=low
- * Split devel package into devel and documentation packages
+ * Split devel package into devel and documentation packages
-- Laurent Bigonville <bigon@bigon.be> Mon, 26 Mar 2007 15:29:51 +0200
@@ -452,7 +476,7 @@ libssh (0.2+svn20070321-1) unstable; urgency=low
libssh (0.2-1) unstable; urgency=low
- * New upstream release.
+ * New upstream release.
-- Laurent Bigonville <bigon@bigon.be> Fri, 29 Dec 2006 07:40:20 +0100
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 746e3a0..bc42d0a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,20 +7,21 @@ XSBC-Original-Maintainer: Laurent Bigonville <bigon@debian.org>
XSBC-Original-Uploaders: Mike Gabriel <sunweaver@debian.org>,
Bugs: mailto:maintainers@lists.progress-linux.org
Build-Depends: cmake (>= 2.8.5),
- debhelper (>= 9.20160114~),
+ debhelper (>= 11~),
libcmocka-dev,
libgcrypt-dev,
libkrb5-dev | heimdal-dev,
+ libnacl-dev,
libssl-dev,
libz-dev,
openssh-client,
pkg-config
Build-Depends-Indep: doxygen
-Standards-Version: 4.0.0
+Standards-Version: 4.1.4
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/libssh
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/libssh
-XSBC-Original-Vcs-Browser: https://anonscm.debian.org/gitweb/?p=collab-maint/libssh.git
-XSBC-Original-Vcs-Git: https://anonscm.debian.org/git/collab-maint/libssh.git
+XSBC-Original-Vcs-Browser: https://salsa.debian.org/debian/libssh
+XSBC-Original-Vcs-Git: https://salsa.debian.org/debian/libssh.git
Homepage: https://www.libssh.org/
Package: libssh-4
@@ -59,8 +60,7 @@ Depends: libssh-4 (= ${binary:Version}),
zlib1g-dev,
${misc:Depends}
Suggests: libssh-doc
-Conflicts: libssh-2-dev, libssh-gcrypt-dev
-Replaces: libssh-2-dev
+Conflicts: libssh-gcrypt-dev
Description: tiny C SSH library. Development files (OpenSSL flavor)
The ssh library was designed to be used by programmers needing a working SSH
implementation by the mean of a library. The complete control of the client
@@ -78,8 +78,7 @@ Depends: libgcrypt-dev,
zlib1g-dev,
${misc:Depends}
Suggests: libssh-doc
-Conflicts: libssh-2-dev, libssh-dev
-Replaces: libssh-2-dev
+Conflicts: libssh-dev
Description: tiny C SSH library. Development files (gcrypt flavor)
The ssh library was designed to be used by programmers needing a working SSH
implementation by the mean of a library. The complete control of the client
@@ -94,8 +93,6 @@ Section: doc
Architecture: all
Suggests: doc-base
Depends: ${misc:Depends}
-Conflicts: libssh-2-doc
-Replaces: libssh-2-doc
Description: tiny C SSH library. Documentation files
The ssh library was designed to be used by programmers needing a working SSH
implementation by the mean of a library. The complete control of the client
diff --git a/debian/copyright b/debian/copyright
index fdd2d56..91fda7e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libssh
Upstream-Contact: libssh@libssh.org
Andreas Schneider <asn@cryptomilk.org>
diff --git a/debian/libssh-4.symbols b/debian/libssh-4.symbols
index 12e78ed..a1c3c6f 100644
--- a/debian/libssh-4.symbols
+++ b/debian/libssh-4.symbols
@@ -37,6 +37,8 @@ libssh.so.4 libssh-4 #MINVER#
channel_set_blocking@Base 0.3.4
channel_write@Base 0.3.4
channel_write_stderr@Base 0.3.91
+ crypto_scalarmult_curve25519_donna_c64@Base 0.8.0~20170825.94fa1e38-2~
+ crypto_scalarmult_curve25519_donna_c64_base@Base 0.8.0~20170825.94fa1e38-2~
privatekey_free@Base 0.3.4
privatekey_from_file@Base 0.3.4
publickey_free@Base 0.3.4
diff --git a/debian/libssh-doc.doc-base b/debian/libssh-doc.doc-base
index a83aa8d..8032442 100644
--- a/debian/libssh-doc.doc-base
+++ b/debian/libssh-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This manual describes libssh API.
Section: Programming/C
Format: HTML
-Index: /usr/share/doc/libssh-doc/html/index.html
-Files: /usr/share/doc/libssh-doc/html/*.html
+Index: /usr/share/doc/libssh-dev/html/index.html
+Files: /usr/share/doc/libssh-dev/html/*.html
diff --git a/debian/libssh-doc.examples b/debian/libssh-doc.examples
index a6302d7..e39721e 100644
--- a/debian/libssh-doc.examples
+++ b/debian/libssh-doc.examples
@@ -1 +1 @@
-debian/tmp/usr/share/doc/libssh/examples/*
+examples/*
diff --git a/debian/libssh-doc.manpages b/debian/libssh-doc.manpages
deleted file mode 100644
index ff25dc0..0000000
--- a/debian/libssh-doc.manpages
+++ /dev/null
@@ -1 +0,0 @@
-doxygen/man/man3/ssh_*
diff --git a/debian/libssh-gcrypt-4.symbols b/debian/libssh-gcrypt-4.symbols
index bae6d56..eb48d66 100644
--- a/debian/libssh-gcrypt-4.symbols
+++ b/debian/libssh-gcrypt-4.symbols
@@ -37,6 +37,8 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
channel_set_blocking@Base 0.3.4
channel_write@Base 0.3.4
channel_write_stderr@Base 0.3.91
+ crypto_scalarmult_curve25519_donna_c64@Base 0.8.0~20170825.94fa1e38-2~
+ crypto_scalarmult_curve25519_donna_c64_base@Base 0.8.0~20170825.94fa1e38-2~
privatekey_free@Base 0.3.4
privatekey_from_file@Base 0.3.4
publickey_free@Base 0.3.4
diff --git a/debian/patches/1003-custom-lib-names.patch b/debian/patches/1003-custom-lib-names.patch
index 75ac03c..a652fbc 100644
--- a/debian/patches/1003-custom-lib-names.patch
+++ b/debian/patches/1003-custom-lib-names.patch
@@ -1,4 +1,4 @@
-Description: Allow to overwrite libssh's OUTPUT_NAME.
+Description: Allow the buildsystem to overwrite libssh's OUTPUT_NAME.
Author: Sebastian Ramacher <s.ramacher@gmx.at>
Last-Update: 2012-06-19
diff --git a/debian/rules b/debian/rules
index 296a0c6..b16df5a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,3 @@ override_dh_install:
override_dh_strip:
dh_strip --dbgsym-migration='libssh-dbg (<< 0.7.3-1~)'
-
-get-orig-source:
- uscan --noconf --force-download --rename --download-current-version --destdir=..