[Pkg-openssl-changes] r599 - openssl/trunk/debian

[Kurt Roeckx]

Author: kroeckx
Date: 2013-05-20 14:33:09 +0000 (Mon, 20 May 2013)
New Revision: 599

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/control
   openssl/trunk/debian/rules
Log:
Move <openssl/opensslconf.h> to /usr/include/$(DEB_HOST_MULTIARCH), and
mark libssl-dev Multi-Arch: same.
Patch by Colin Watson <cjwatson at ubuntu.com> (Closes: #689093)


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2013-03-18 19:37:58 UTC (rev 598)
+++ openssl/trunk/debian/changelog	2013-05-20 14:33:09 UTC (rev 599)
@@ -1,3 +1,11 @@
+openssl (1.0.1e-3) unstable; urgency=low
+
+  * Move <openssl/opensslconf.h> to /usr/include/$(DEB_HOST_MULTIARCH), and
+    mark libssl-dev Multi-Arch: same.
+    Patch by Colin Watson <cjwatson at ubuntu.com> (Closes: #689093)
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Mon, 20 May 2013 16:30:15 +0200
+
 openssl (1.0.1e-2) unstable; urgency=high
 
   * Bump shlibs.  It's needed for the udeb.

Modified: openssl/trunk/debian/control
===================================================================
--- openssl/trunk/debian/control	2013-03-18 19:37:58 UTC (rev 598)
+++ openssl/trunk/debian/control	2013-05-20 14:33:09 UTC (rev 599)
@@ -54,6 +54,7 @@
 Section: libdevel
 Priority: optional
 Architecture: any
+Multi-Arch: same
 Recommends: libssl-doc
 Depends: libssl1.0.0 (= ${binary:Version}), zlib1g-dev, ${misc:Depends}
 Description: SSL development libraries, header files and documentation

Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules	2013-03-18 19:37:58 UTC (rev 598)
+++ openssl/trunk/debian/rules	2013-05-20 14:33:09 UTC (rev 599)
@@ -120,6 +120,8 @@
 	cp -pf debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libcrypto.so.* debian/libcrypto1.0.0-udeb/usr/lib/
 	cp -auv lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	for opt in $(OPTS); do set -xe; mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt; cp -auv $$opt/lib*.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/$$opt/; done
+	mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl
+	mv debian/tmp/usr/include/openssl/opensslconf.h debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/openssl/
 	install debian/copyright debian/libssl1.0.0/usr/share/doc/libssl1.0.0/
 	install debian/changelog debian/libssl1.0.0/usr/share/doc/libssl1.0.0/changelog.Debian
 	install debian/copyright debian/libssl-dev/usr/share/doc/libssl-dev/