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

[Christoph Martin]

Author: chrism
Date: 2005-10-17 17:21:39 +0000 (Mon, 17 Oct 2005)
New Revision: 71

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/control
   openssl/trunk/debian/rules
Log:
cleanup shlib dependencies
add missing changelog entry about swedish debconf translation


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2005-10-17 11:27:16 UTC (rev 70)
+++ openssl/trunk/debian/changelog	2005-10-17 17:21:39 UTC (rev 71)
@@ -6,12 +6,15 @@
   * include symbol versioning in Configure (closes: #330867)
   * include debian-armeb arch (closes: #333579)
   * include new upstream patches; includes some minor fixes
+  * fix dh_shlibdeps line, removing the redundant dependency on
+    libssl0.9.8 (closes: #332755)
+  * add swedish debconf template (closes: #330554)
 
   Kurt Roeckx:
   * Also add noexecstack option for amd64, since it now has an 
     executable stack with the assembler fixes for amd64.
 
- -- Christoph Martin <christoph.martin at uni-mainz.de>  Mon, 17 Oct 2005 11:24:23 +0200
+ -- Christoph Martin <christoph.martin at uni-mainz.de>  Mon, 17 Oct 2005 17:01:06 +0200
 
 openssl (0.9.8-3) unstable; urgency=low
 

Modified: openssl/trunk/debian/control
===================================================================
--- openssl/trunk/debian/control	2005-10-17 11:27:16 UTC (rev 70)
+++ openssl/trunk/debian/control	2005-10-17 17:21:39 UTC (rev 71)
@@ -9,7 +9,7 @@
 Package: openssl
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${perl:Depends}
+Depends: libssl0.9.8 (= ${Source-Version}), ${shlibs:Depends}, ${perl:Depends}
 Conflicts: ssleay (<< 0.9.2b)
 Suggests: ca-certificates
 Description: Secure Socket Layer (SSL) binary and related cryptographic tools

Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules	2005-10-17 11:27:16 UTC (rev 70)
+++ openssl/trunk/debian/rules	2005-10-17 17:21:39 UTC (rev 71)
@@ -150,19 +150,9 @@
 	dh_strip --dbg-package=libssl0.9.8
 	dh_perl -d
 #	dh_suidregister
-	dh_shlibdeps -l`pwd` -Xlibssl.so
-	# Hack, to depend on version of libc6 which supports the i686 directory
-	if [ "${DEB_HOST_ARCH}" == "i386" ]; \
-	then \
-	  SHLIB=`cat debian/libssl0.9.8.substvars`; \
-	  LIBC_VERSION=`echo $$SHLIB | sed s'/.*libc6 (>= \(.*\))/\1/'`; \
-	  if dpkg --compare-versions ${WANTED_LIBC_VERSION} gt $$LIBC_VERSION; \
-	  then \
-	    echo $$SHLIB | sed s'/libc6 (>= \(.*\))/libc6 (>= ${WANTED_LIBC_VERSION})/' > debian/libssl0.9.8.substvars; \
-	  fi \
-	fi
+	dh_shlibdeps -L libssl0.9.8 -l debian/libssl0.9.8/usr/lib
 	dh_gencontrol
-	dh_makeshlibs -m 0.9.8
+	dh_makeshlibs
 	dh_installdeb
 	dh_md5sums
 	dh_builddeb