Your message dated Mon, 19 Mar 2012 17:04:42 +0000
with message-id <[email protected]>
and subject line Bug#663751: fixed in libssh2 1.4.0-1
has caused the Debian Bug report #663751,
regarding libssh2: Please add multi-arch support for libssh2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
663751: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=663751
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Source: libssh2
Version: 1.2.8-2
Severity: normal
Tags: patch
Usertags: multiarch
Hi,
The following patch converts libssh2 to support multi-arch. Summary of
changes:
- Makefile.am: install libssh2.pc to /usr/share/pkgconfig instead of
/usr/lib/pkgconfig. According to the pkg-config manual, both locations
are valid. On the other hand, the installation path in Makefile.am
used to be dependent on $(libdir), which is modified in an
incompatible way by multi-arch.
- debian/rules: set libdir for multiarch
- debian/*.install: adapt to changed paths
- debian/control: add required dependencies and pre-depends, as well as
multi-arch stanzas.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (x86_64)
Kernel: Linux 3.2.0-2-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -urN libssh2-1.2.8/debian/changelog libssh2-1.2.8-new/debian/changelog
--- libssh2-1.2.8/debian/changelog 2011-08-14 21:42:38.000000000 +0200
+++ libssh2-1.2.8-new/debian/changelog 2012-03-13 20:29:58.000000000 +0100
@@ -1,3 +1,9 @@
+libssh2 (1.2.8-2.1) karotte-local; urgency=low
+
+ * Update to multi-arch.
+
+ -- Johannes Kloos <[email protected]> Tue, 13 Mar 2012 20:20:00 +0100
+
libssh2 (1.2.8-2) unstable; urgency=low
* Fix version in pkg-config file (Closes: #637670).
diff -urN libssh2-1.2.8/debian/control libssh2-1.2.8-new/debian/control
--- libssh2-1.2.8/debian/control 2011-03-28 20:47:55.000000000 +0200
+++ libssh2-1.2.8-new/debian/control 2012-03-13 20:33:05.000000000 +0100
@@ -2,12 +2,14 @@
Section: libs
Priority: optional
Maintainer: Mikhail Gusarov <[email protected]>
-Build-Depends: debhelper (>= 7), autotools-dev, automake, libtool, libgcrypt11-dev, zlib1g-dev
+Build-Depends: debhelper (>= 8.1.3), autotools-dev, automake, libtool, libgcrypt11-dev, zlib1g-dev
Standards-Version: 3.9.1
Package: libssh2-1
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: SSH2 client-side library
libssh2 is a client-side C library implementing the SSH2 protocol.
It supports regular terminal, SCP and SFTP sessions; port forwarding;
diff -urN libssh2-1.2.8/debian/libssh2-1-dev.install libssh2-1.2.8-new/debian/libssh2-1-dev.install
--- libssh2-1.2.8/debian/libssh2-1-dev.install 2010-06-10 12:23:31.000000000 +0200
+++ libssh2-1.2.8-new/debian/libssh2-1-dev.install 2012-03-13 20:21:48.000000000 +0100
@@ -1,4 +1,4 @@
usr/include/*
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/pkgconfig/*.pc
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/share/pkgconfig/*.pc
diff -urN libssh2-1.2.8/debian/libssh2-1.install libssh2-1.2.8-new/debian/libssh2-1.install
--- libssh2-1.2.8/debian/libssh2-1.install 2010-06-10 12:23:31.000000000 +0200
+++ libssh2-1.2.8-new/debian/libssh2-1.install 2012-03-13 20:21:52.000000000 +0100
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff -urN libssh2-1.2.8/debian/patches/save-pkgconfig-data-in-usr-share libssh2-1.2.8-new/debian/patches/save-pkgconfig-data-in-usr-share
--- libssh2-1.2.8/debian/patches/save-pkgconfig-data-in-usr-share 1970-01-01 01:00:00.000000000 +0100
+++ libssh2-1.2.8-new/debian/patches/save-pkgconfig-data-in-usr-share 2012-03-13 20:24:51.000000000 +0100
@@ -0,0 +1,33 @@
+Description: Move the pkg-config .pc file to /usr/share/pkgconfig
+ Move the pkgconfig .pc file to /usr/share/pkgconfig. Since this file
+ is architecture-independent, this is actually the proper place.
+ Furthermore, since libdir has been redefined by multi-arch, but
+ the pkgconfig data is expected in /usr/lib/pkgconfig and not a
+ multi-arch subdirectory, this new location makes more sense.
+
+Author: Johannes Kloos <[email protected]>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- libssh2-1.2.8.orig/Makefile.am
++++ libssh2-1.2.8/Makefile.am
+@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc
+
+ SUBDIRS = src example tests docs
+
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(datarootdir)/pkgconfig
+ pkgconfig_DATA = libssh2.pc
+
+ include_HEADERS = \
diff -urN libssh2-1.2.8/debian/patches/series libssh2-1.2.8-new/debian/patches/series
--- libssh2-1.2.8/debian/patches/series 2011-08-14 12:00:57.000000000 +0200
+++ libssh2-1.2.8-new/debian/patches/series 2012-03-13 20:23:16.000000000 +0100
@@ -1,2 +1,3 @@
fix-version-in-pc.patch
man-wrong-nf-macro.patch
+save-pkgconfig-data-in-usr-share
diff -urN libssh2-1.2.8/debian/rules libssh2-1.2.8-new/debian/rules
--- libssh2-1.2.8/debian/rules 2010-06-10 12:23:31.000000000 +0200
+++ libssh2-1.2.8-new/debian/rules 2012-03-13 20:22:51.000000000 +0100
@@ -2,6 +2,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
CFLAGS = -Wall -g
@@ -65,7 +66,8 @@
CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
- --with-libgcrypt
+ --with-libgcrypt \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
build: build-stamp
build-stamp: config.status
--- End Message ---
--- Begin Message ---
Source: libssh2
Source-Version: 1.4.0-1
We believe that the bug you reported is fixed in the latest version of
libssh2, which is due to be installed in the Debian FTP archive:
libssh2-1-dbg_1.4.0-1_amd64.deb
to main/libs/libssh2/libssh2-1-dbg_1.4.0-1_amd64.deb
libssh2-1-dev_1.4.0-1_amd64.deb
to main/libs/libssh2/libssh2-1-dev_1.4.0-1_amd64.deb
libssh2-1_1.4.0-1_amd64.deb
to main/libs/libssh2/libssh2-1_1.4.0-1_amd64.deb
libssh2_1.4.0-1.debian.tar.gz
to main/libs/libssh2/libssh2_1.4.0-1.debian.tar.gz
libssh2_1.4.0-1.dsc
to main/libs/libssh2/libssh2_1.4.0-1.dsc
libssh2_1.4.0.orig.tar.gz
to main/libs/libssh2/libssh2_1.4.0.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Mikhail Gusarov <[email protected]> (supplier of updated libssh2 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Mon, 19 Mar 2012 17:53:21 +0100
Source: libssh2
Binary: libssh2-1 libssh2-1-dev libssh2-1-dbg
Architecture: source amd64
Version: 1.4.0-1
Distribution: sid
Urgency: low
Maintainer: Mikhail Gusarov <[email protected]>
Changed-By: Mikhail Gusarov <[email protected]>
Description:
libssh2-1 - SSH2 client-side library
libssh2-1-dbg - SSH2 client-side library (debug package)
libssh2-1-dev - SSH2 client-side library (development headers)
Closes: 663751
Changes:
libssh2 (1.4.0-1) unstable; urgency=low
.
* New upstream release.
- Drop debian/patches/fix-version-in-pc.patch taken from git.
- Drop debian/patches/mang-wrong-nf-macro.patch, applied upstream.
- Update libssh2-1.symbols for new upstream release.
- Add debian/patches/undefined-libssh-error.patch, necessary to
facilitate compilation with GnuTLS.
* Drop Conflicts/Replaces for packages no longer in archive.
* Use dh(7) for packaging.
* Use dh-autoreconf instead of manually stashing changed files and
moving them back.
* Do not run test 'mansyntax.sh', it requires specific locale to be
available, and in general is a duplicate of lintian check.
* Update debian/copyright to version 1.0 of machine-parseable format.
* Enable multiarch, based on patch by Johannes Cloos (Closes: #663751).
* Bump Standards-Version, no changes needed.
Checksums-Sha1:
5e85fd049630d26cc049b5628215faa3035ea7d8 1808 libssh2_1.4.0-1.dsc
53428b4935ab6eb843d45f1593dc434cb287b93e 653514 libssh2_1.4.0.orig.tar.gz
bfb0385ba10a625116dd3595bb4248414f819018 5954 libssh2_1.4.0-1.debian.tar.gz
d6231b27cf3f2b0b15b9186181a156622c0da50b 77600 libssh2-1_1.4.0-1_amd64.deb
65270501e696a84c522459cf24899f1692e57976 253314 libssh2-1-dev_1.4.0-1_amd64.deb
7c19f3b442077defde0e740ad67d4c331807f80d 164238 libssh2-1-dbg_1.4.0-1_amd64.deb
Checksums-Sha256:
7a69518a0c815a43f22a3c2aa82cbe1dfdaa78b01482d3e043241de3439a4ecd 1808
libssh2_1.4.0-1.dsc
dfc5bbad14a5049fea5c5e8a7a743130bb1e365730e13e2bb7d6494c92a4c581 653514
libssh2_1.4.0.orig.tar.gz
5c6285023723bc340f5dfad354f448404c9c33be39933b8721d4691a56472e45 5954
libssh2_1.4.0-1.debian.tar.gz
5abed044301dfc8528e8be3cc0b04b5ac56df7d80fe8096ec7c0a1cd5ed1e490 77600
libssh2-1_1.4.0-1_amd64.deb
58fdd309aab4ada59bdff0a2ca80d17825150a3c42d1d419460f5bb13991b71a 253314
libssh2-1-dev_1.4.0-1_amd64.deb
f6346cb2e02c53d60db57177420c251acfa1594c7862893ed0910110010289f7 164238
libssh2-1-dbg_1.4.0-1_amd64.deb
Files:
d50fc3e8095aaf6dce14ba70e1656413 1808 libs optional libssh2_1.4.0-1.dsc
ee670161d8c5dff93ae84a3f34f15669 653514 libs optional libssh2_1.4.0.orig.tar.gz
8dc3e191fef8a9c8994dce1830bca42d 5954 libs optional
libssh2_1.4.0-1.debian.tar.gz
a4fc1d2d1971308e33a246dd2b2a0b85 77600 libs optional
libssh2-1_1.4.0-1_amd64.deb
506d53c191b33f3623f63631dcf70b38 253314 libdevel optional
libssh2-1-dev_1.4.0-1_amd64.deb
077e865d55bfb30e1aef51d0a7d366a8 164238 debug extra
libssh2-1-dbg_1.4.0-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBAgAGBQJPZ2XzAAoJEJ0g9lA+M4iIjfEQANgfudv5wwnwIjGfK2HrDy3C
ZwvieDt1ayK0dykGkZlxAFWXKDYO/DNYbqsar1AvNN7h6CY6JdNiICptn8G9IuoX
jUbgWxwhMeSMtG+jFISw4DetqXA1hnBMIhlW3y6kDxw1GfB3Uy5B8TTT/BXq3gfb
4SexyYNCVfJzjzN1ErLNFjFhDMkdGb9E4vJ5N+TZNNMo2lb7lCOBQ593WEfhYbjT
/FiAZdJnNsWkYAixogG+G/G1r5lmU5y7KAWulFOMNscQvmmrsf/S6HbVSPDUGBM+
Yklu41E2JVcBzlq4OD6iedPwyKeDuDxAoXThe2yXFdR6Z59IzOm2RGGd1UyN/+nm
IRmjj0hWhAdnmTh9quMkClaX+BQNjl37i8KcbpKVQeO6Z3lluuf5nIV3ELKuRVki
0XIfryoq1Onwj3F32frLxmTTVvCuoV33cYYedUSfvel+KHCHYtAYy4FIFb/Stxb2
chlc9TLVpurTRiiriNdyZf9nh8wms3QvFUy6RSHhbYV/7LDPTxa4mTcKJlBZNYby
R+j0e8CbzuWbhYB9Zzv8lGJkctXGF4GJZiu5DX/uJY/J/pGjxySMVs0Gx1TN3bDc
n2PfWsLh+LAzAKV5SNR0J/yAqT0OqYw+HyATpwdD+yoz2wC/ZSjKKiytdV3yfj8Q
Mr/zpcxnBW/lTpJCHuuS
=fj0T
-----END PGP SIGNATURE-----
--- End Message ---
