lsb 3.2-28 Debian release.

diff --git a/debian/changelog b/debian/changelog
index b68e64da90cd1515868a477467c8707f53998a69..b62610e465c73c6ea8023bc5f4815c9f81b747e7 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lsb (3.2-28) unstable; urgency=low
+
+  * Fix symlinks for AMD64.  (Closes: #638450)
+  * Please note the RFA/ITA for this package (#616131).
+
+ -- Chris Lawrence <lawrencc@debian.org>  Fri, 26 Aug 2011 16:25:30 -0400
+
 lsb (3.2-27) unstable; urgency=low
 
   * Track down another use of dpkg --print-installation-architecture.

diff --git a/debian/postinst b/debian/postinst
index 3652152e7a2e0598ce0bae6df2e971ff2ff8df62..cb86233de4a71b8f7af218fda31249d9eb975c8d 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -22,8 +22,10 @@ setup_ldso_symlink () {
             ln -sf ld-linux.so.2 /lib/ld-lsb.so.1
             ln -sf ld-linux.so.2 /lib/ld-lsb.so.2
             ln -sf ld-linux.so.2 /lib/ld-lsb.so.3
-            ln -sf /lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.2
-            ln -sf /lib/ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
+            ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.2
+            ln -sf ld-linux-x86-64.so.2 /lib64/ld-lsb-x86-64.so.3
+            [ -L /lib/ld-lsb-x86-64.so.2 ] && rm /lib/ld-lsb-x86-64.so.2 || true
+            [ -L /lib/ld-lsb-x86-64.so.3 ] && rm /lib/ld-lsb-x86-64.so.3 || true
             ;;
         ia64)
             ln -sf ld-linux-ia64.so.2 /lib/ld-lsb-ia64.so.1

diff --git a/debian/prerm b/debian/prerm
index fb33522e22dd0f3b3e5fb8e6337331479fc15ef4..0740b5bdd13b1ef7da1029980e7f495be3b43876 100644 (file)
--- a/debian/prerm
+++ b/debian/prerm
@@ -13,7 +13,7 @@ remove_ldso_symlink () {
             rm -f /lib/ld-lsb.so.[123]
             ;;
         amd64)
-            rm -f /lib/ld-lsb.so.[123] /lib64/ld-lsb-x86-64.so.2
+            rm -f /lib/ld-lsb.so.[123] /lib64/ld-lsb-x86-64.so.[23] /lib/ld-lsb-x86-64.so.[23]
             ;;
         *)
             echo "ld-lsb-*.so.1 symlink for $ARCH is unknown; not removed."

diff --git a/debian/rules b/debian/rules
index b2970572b526925df1a27a45cf760ee83edfc0a6..257144ea84111a944e441f1bfa219debe229c817 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -28,6 +28,9 @@ lsbarch=ppc32
 endif
 
 LIBC=libc6 (>> 2.3.5)
+ifeq (${lsbarch}, amd64)
+LIBC=libc6 (>= 2.13-17)
+endif
 ifeq (${lsbarch}, hurd-i386)
 LIBC=libc0.3 (>> 2.3.5)
 endif