[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: ia32-libs update for lenny



Hi again,

Martin Zobel-Helas mentioned I should have added a full diff for
approval. Well, the full diff would be basically the full 282MiB source
package as it contains all the deb and orig.tar.gz of the packages. You
can download it from mentors.debian.net.

I listed all the packages changed in my previous mails and you (or the
security team) already approved each one individually. For a diff of
each please look at each package yourself. The diff of the non-binary
stuff, also visible via
http://svn.debian.org/viewsvn/pkg-ia32-libs/branches/lenny/ia32-libs/,
is attached below. The only chunk not related to updates of the
contained debs or lintian is this one:

--- ia32-libs/debian/rules	(revision 358)
+++ ia32-libs/debian/rules	(revision 362)
@@ -143,7 +141,7 @@
 
 	# Link the ld.so into place
 	mkdir -p $(DEST)/lib/
-	ln -s $(ROOT)lib$(SUFFIX)/ld-2.3.2.so $(DEST)/lib/ld-linux.so.2 
+	ln -s $(ROOT)lib$(SUFFIX)/ld-linux.so.2 $(DEST)/lib/ld-linux.so.2 
 
 ifneq (/,$(ROOT))
 	# Move uname into place

which fixes the broken symlink on ia64 so the ld.so can be found again,
a grave bug.

MfG
        Goswin

----------------------------------------------------------------------

Index: ia32-libs/debian/control
===================================================================
--- ia32-libs/debian/control	(revision 358)
+++ ia32-libs/debian/control	(revision 362)
@@ -8,7 +8,7 @@
 
 Package: ia32-libs
 Architecture: amd64 ia64
-Pre-Depends: dpkg (>= 1.13.21)
+Pre-Depends: ${misc:depends}, dpkg (>= 1.13.21)
 Depends: lsb-release, lib32gcc1, ${lib:Depends}
 Replaces: ia32-libs-openoffice.org, ia32-libs-dev (<< 1.6), nvidia-glx-ia32 (<< 1.0.8774-7)
 Conflicts: ia32-libs-dev (<< 1.6), nvidia-glx-ia32 (<< 1.0.8774-7)
@@ -21,14 +21,14 @@
 Package: ia32-libs-dev
 Architecture: ia64
 Section: libdevel
-Depends: ia32-libs (= ${Source-Version})
+Depends: ${misc:depends}, ia32-libs (= ${Source-Version})
 Description: ia32 development libraries and headers for use on ia32/ia64 systems
  This package contains headers and development libraries for building
  32-bit ia32 applications on amd64/ia64 Debian systems.
 
 Package: lib32gcc1
 Architecture: ia64
-Depends: ia32-libs (= ${Source-Version})
+Depends: ${misc:depends}, ia32-libs (= ${Source-Version})
 Description: GCC support library (ia32)
  Shared version of the support library, a library of internal subroutines
  that GCC uses to overcome shortcomings of particular machines, or
Index: ia32-libs/debian/compat
===================================================================
--- ia32-libs/debian/compat	(revision 0)
+++ ia32-libs/debian/compat	(revision 362)
@@ -0,0 +1 @@
+5
Index: ia32-libs/debian/extract-changlogs.sh
===================================================================
--- ia32-libs/debian/extract-changlogs.sh	(revision 0)
+++ ia32-libs/debian/extract-changlogs.sh	(revision 362)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+while read PKG VER; do
+  ( cd srcs/t/${PKG}*/
+    dpkg-parsechangelog --since $VER | sed 's/^/#/' \
+    | while read LINE; do
+        case "$LINE" in
+          ("# .") echo "# ";;
+	  ("#  "*) echo "$LINE";;
+	  ("# "*) echo "$LINE" | while read foo PKG VER REL URG; do
+	                           echo "#   [ $PKG $VER $REL $URG ]"
+	                         done;;
+	esac
+    done | cut -b3-
+    echo
+  )
+done <<EOF
+attr 1:2.4.43-1 
+audiofile 0.2.6-7 
+cairo 1.6.4-6 
+cups 1.3.8-1 
+cyrus-sasl2 2.1.22.dfsg1-21 
+dbus 1.2.1-3 
+directfb 1.0.1-9 
+e2fsprogs 1.41.0-3 
+expat 2.0.1-4 
+fontconfig 2.6.0-1 
+freetype 2.3.7-2 
+gcc-4.3 4.3.1-9 
+glibc 2.7-13 
+gnutls26 2.4.1-1 
+hal 0.5.11-3 
+isdnutils 1:3.9.20060704-3.4 
+jack-audio-connection-kit 0.109.2-3 
+keyutils 1.2-7 
+krb5 1.6.dfsg.4~beta1-4 
+lcms 1.17.dfsg-1 
+libaio 0.3.106-8 
+libdrm 2.3.1-1 
+libnss-ldap 261-2 
+libpam-ldap 184-4.1 
+libpng 1.2.27-1 
+libselinux 2.0.65-4 
+libtool 1.5.26-4 
+libusb 2:0.1.12-12 
+libwmf 0.2.8.4-6 
+libx11 2:1.1.4-2 
+libxcb 1.1-1.1 
+libxi 2:1.1.3-1 
+libxml2 2.6.32.dfsg-3 
+mesa 7.0.3-5 
+nas 1.9.1-4 
+ncurses 5.6+20080804-1 
+openldap 2.4.10-3 
+openssl 0.9.8g-13 
+pam 1.0.1-4 
+pulseaudio 0.9.10-2 
+sane-backends 1.0.19-17 
+tiff 3.8.2-11 
+xorg 1:7.3+15 
+EOF

Property changes on: ia32-libs/debian/extract-changlogs.sh
___________________________________________________________________
Added: svn:executable
   + *

Index: ia32-libs/debian/ia32-libs.overrides
===================================================================
--- ia32-libs/debian/ia32-libs.overrides	(revision 358)
+++ ia32-libs/debian/ia32-libs.overrides	(revision 362)
@@ -24,3 +24,12 @@
 ia32-libs: shared-lib-without-dependency-information ./lib32/tls/ld-2.3.2.so
 ia32-libs: unstripped-binary-or-object ./lib32/tls/libpthread-0.60.so
 ia32-libs: packages-installs-file-to-usr-x11r6
+ia32-libs: diversion-for-unknown-file usr/bin/ldd
+ia32-libs: sharedobject-in-library-directory-missing-soname emul/ia32-linux/lib/libnss_ldap-2.7.so
+ia32-libs: shlib-with-non-pic-code emul/ia32-linux/usr/lib/libGL.so.1.2
+ia32-libs: incorrect-libdir-in-la-file
+ia32-libs: non-dev-pkg-with-shlib-symlink
+ia32-libs: unused-shlib-entry-in-control-file
+W: ia32-libs: shared-lib-without-dependency-information ./emul/ia32-linux/lib/libaio.so.1.0.1
+ia32-libs: diversion-for-unknown-file usr/bin/ldd preinst:12
+ia32-libs: ldconfig-symlink-referencing-wrong-file emul/ia32-linux/usr/lib/libXaw.so.7 -> libXaw7.so.7 instead of libXaw7.so.7.0.0
Index: ia32-libs/debian/rules
===================================================================
--- ia32-libs/debian/rules	(revision 358)
+++ ia32-libs/debian/rules	(revision 362)
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 
-export DH_COMPAT=4
-
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Lowest version with fully ABI compatible libraries
-SHLIB_VERSION=2.4
+SHLIB_VERSION=2.7+lenny1
 
 OSVER=$(shell lsb_release -s -i)
 ifeq (Debian,$(OSVER))
@@ -24,7 +22,7 @@
 # On amd64 some package compile 32bit debs directly.
 # Skip converting them and Depend on them instead.
 ifeq (amd64,$(DEB_HOST_ARCH))
-  lib_depends = libc6-i386 (>= 2.3.6-2), lib32z1, lib32stdc++6, lib32asound2, lib32ncurses5
+  lib_depends = libc6-i386 (>= 2.7-18lenny1), lib32z1, lib32stdc++6, lib32asound2, lib32ncurses5
   FILTER = zlib1g libc6 libgcc1 libasound2 libstdc++6 libncurses5
   EXTRA_INSTALL =
 else
@@ -143,7 +141,7 @@
 
 	# Link the ld.so into place
 	mkdir -p $(DEST)/lib/
-	ln -s $(ROOT)lib$(SUFFIX)/ld-2.3.2.so $(DEST)/lib/ld-linux.so.2 
+	ln -s $(ROOT)lib$(SUFFIX)/ld-linux.so.2 $(DEST)/lib/ld-linux.so.2 
 
 ifneq (/,$(ROOT))
 	# Move uname into place
Index: ia32-libs/sources.list.deb
===================================================================
--- ia32-libs/sources.list.deb	(revision 358)
+++ ia32-libs/sources.list.deb	(revision 362)
@@ -1,2 +1,8 @@
-deb http://ftp.de.debian.org/debian lenny main
-deb-src http://ftp.de.debian.org/debian lenny main
+deb http://ftp.debian.org/debian lenny main
+deb-src http://ftp.debian.org/debian lenny main
+
+deb http://security.debian.org/debian-security lenny/updates main
+deb-src http://security.debian.org/debian-security lenny/updates main
+
+deb http://ftp.debian.org/debian lenny-proposed-updates main
+deb-src http://ftp.debian.org/debian lenny-proposed-updates main


Reply to: