r3770 - in glibc-package/branches/eglibc-2.10/debian: . control.in debhelper.in local/etc local/etc/ld.so.conf.d patches/any rules.d
Author: aurel32
Date: 2009-08-18 19:29:25 +0000 (Tue, 18 Aug 2009)
New Revision: 3770
Added:
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.lintian
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.manpages
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.docs
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.manpages
glibc-package/branches/eglibc-2.10/debian/local/etc/ld.so.conf.d/
glibc-package/branches/eglibc-2.10/debian/local/etc/ld.so.conf.d/libc.conf
Removed:
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.manpages
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.manpages
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/control
glibc-package/branches/eglibc-2.10/debian/control.in/libc
glibc-package/branches/eglibc-2.10/debian/control.in/main
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install.hurd-i386
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.dirs
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian
glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff
glibc-package/branches/eglibc-2.10/debian/rules
glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk
Log:
Merge from trunk, revisions 3748-3752
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-08-18 19:29:25 UTC (rev 3770)
@@ -133,11 +133,15 @@
* Don't access dpkg files directly in libc6.preinst.
* patches/any/local-ld-multiarch.diff: convert i586 and i686 into i486
(Closes: bug#540646).
+ * debian/rules.d/debhelper.mk: use dh_lintian instead doing the work
+ manually.
+ * Split out libc-bin from libc6 and libc-dev-bin from libc6-dev.
+ (Closes: #330735).
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 2696 (from glibc-bsd).
- -- Aurelien Jarno <aurel32@debian.org> Sun, 09 Aug 2009 21:12:43 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 09 Aug 2009 21:48:02 +0200
eglibc (2.9-23) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.10/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/control 2009-08-18 19:29:25 UTC (rev 3770)
@@ -16,6 +16,25 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
+Package: libc-bin
+Architecture: any
+Section: libs
+Priority: required
+Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Description: GNU C Library: Binaries
+ This package contains utility programs related to the GNU C Library.
+
+Package: libc-dev-bin
+Architecture: any
+Section: libdevel
+Priority: optional
+Depends: ${shlibs:Depends}
+Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev
+Description: GNU C Library: Development binaries
+ This package contains utility programs related to the GNU C Library
+ development package.
+
Package: glibc-doc
Architecture: all
Section: doc
@@ -79,7 +98,7 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
-Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -94,7 +113,7 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
-Depends: libc6 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
+Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -154,7 +173,7 @@
Architecture: alpha ia64
Section: libs
Priority: required
-Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -169,7 +188,7 @@
Architecture: alpha ia64
Section: libdevel
Priority: optional
-Depends: libc6.1 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
+Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -229,7 +248,7 @@
Architecture: hurd-i386
Section: libs
Priority: required
-Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -244,7 +263,7 @@
Architecture: hurd-i386
Section: libdevel
Priority: optional
-Depends: libc0.3 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
+Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
@@ -304,7 +323,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libs
Priority: required
-Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -319,7 +338,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: optional
-Depends: libc0.1 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
+Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Modified: glibc-package/branches/eglibc-2.10/debian/control.in/libc
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control.in/libc 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/control.in/libc 2009-08-18 19:29:25 UTC (rev 3770)
@@ -2,7 +2,7 @@
Architecture: @archs@
Section: libs
Priority: required
-Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Depends: libc-bin (= ${binary:Version}), hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
@@ -17,7 +17,7 @@
Architecture: @archs@
Section: libdevel
Priority: optional
-Depends: @libc@ (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
+Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
Suggests: glibc-doc, manpages-dev
Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
Modified: glibc-package/branches/eglibc-2.10/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control.in/main 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/control.in/main 2009-08-18 19:29:25 UTC (rev 3770)
@@ -16,6 +16,25 @@
Vcs-Browser: http://svn.debian.org/wsvn/pkg-glibc/glibc-package/
Vcs-Svn: svn://svn.debian.org/pkg-glibc/glibc-package/
+Package: libc-bin
+Architecture: any
+Section: libs
+Priority: required
+Breaks: libc0.1 (<< 2.9), libc0.3 (<< 2.9), libc6 (<< 2.9), libc6.1 (<< 2.9)
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Description: GNU C Library: Binaries
+ This package contains utility programs related to the GNU C Library.
+
+Package: libc-dev-bin
+Architecture: any
+Section: libdevel
+Priority: optional
+Depends: ${shlibs:Depends}
+Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev
+Description: GNU C Library: Development binaries
+ This package contains utility programs related to the GNU C Library
+ development package.
+
Package: glibc-doc
Architecture: all
Section: doc
Added: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.install (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.install 2009-08-18 19:29:25 UTC (rev 3770)
@@ -0,0 +1,16 @@
+debian/local/etc/* /etc
+posix/gai.conf /etc
+debian/tmp-libc/sbin/ldconfig sbin
+debian/tmp-libc/usr/bin/catchsegv usr/bin
+debian/tmp-libc/usr/bin/getconf usr/bin
+debian/tmp-libc/usr/bin/getent usr/bin
+debian/tmp-libc/usr/bin/iconv usr/bin
+debian/tmp-libc/usr/bin/ldd usr/bin
+debian/tmp-libc/usr/bin/localedef usr/bin
+debian/tmp-libc/usr/bin/locale usr/bin
+debian/tmp-libc/usr/bin/tzselect usr/bin
+debian/tmp-libc/usr/lib/pt_chown usr/lib
+debian/tmp-libc/usr/sbin/iconvconfig usr/sbin
+debian/tmp-libc/usr/sbin/rpcinfo usr/bin
+debian/tmp-libc/usr/sbin/zdump usr/bin
+debian/tmp-libc/usr/sbin/zic usr/sbin
Added: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.lintian
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.lintian (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.lintian 2009-08-18 19:29:25 UTC (rev 3770)
@@ -0,0 +1,13 @@
+# ldconfig must be executable even when the libc is not configured, and
+# thus must be linked statically
+libc-bin: statically-linked-binary ./sbin/ldconfig
+
+# ld.so must be executable, otherwise the system will not work
+libc-bin: shlib-with-executable-bit lib/ld-2.9.so 0755
+
+# pt_chown must be setuid root, otherwise non-root users won't be able
+# to login
+libc-bin: setuid-binary usr/lib/pt_chown 4755 root/root
+
+# libc-bin depending on libc6 make apt crazy...
+libc-bin: missing-depends-line
Added: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.manpages
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.manpages (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-bin.manpages 2009-08-18 19:29:25 UTC (rev 3770)
@@ -0,0 +1,14 @@
+debian/local/manpages/catchsegv.1
+debian/local/manpages/gai.conf.5
+debian/local/manpages/getent.1
+debian/local/manpages/getconf.1
+debian/local/manpages/iconv.1
+debian/local/manpages/iconvconfig.8
+debian/local/manpages/ldconfig.8
+debian/local/manpages/ldd.1
+debian/local/manpages/locale.1
+debian/local/manpages/localedef.1
+debian/local/manpages/rpcinfo.8
+debian/local/manpages/tzselect.1
+debian/local/manpages/zdump.1
+debian/local/manpages/zic.8
Added: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.docs
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.docs (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.docs 2009-08-18 19:29:25 UTC (rev 3770)
@@ -0,0 +1,2 @@
+NOTES
+NAMESPACE
Added: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.install (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.install 2009-08-18 19:29:25 UTC (rev 3770)
@@ -0,0 +1,4 @@
+debian/tmp-libc/usr/bin/gencat usr/bin
+debian/tmp-libc/usr/bin/mtrace usr/bin
+debian/tmp-libc/usr/bin/rpcgen usr/bin
+debian/tmp-libc/usr/bin/sprof usr/bin
Added: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.manpages
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.manpages (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev-bin.manpages 2009-08-18 19:29:25 UTC (rev 3770)
@@ -0,0 +1,4 @@
+debian/local/manpages/gencat.1
+debian/local/manpages/mtrace.1
+debian/local/manpages/rpcgen.1
+debian/local/manpages/sprof.1
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install 2009-08-18 19:29:25 UTC (rev 3770)
@@ -1,8 +1,3 @@
-debian/tmp-libc/usr/bin/gencat usr/bin
-debian/tmp-libc/usr/bin/mtrace usr/bin
-debian/tmp-libc/usr/bin/rpcgen usr/bin
-debian/tmp-libc/usr/bin/sprof usr/bin
-
debian/tmp-libc/usr/lib/libanl.a usr/lib
debian/tmp-libc/usr/lib/libBrokenLocale.a usr/lib
debian/tmp-libc/usr/lib/libbsd-compat.a usr/lib
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install.hurd-i386
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install.hurd-i386 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.install.hurd-i386 2009-08-18 19:29:25 UTC (rev 3770)
@@ -1,8 +1,3 @@
-debian/tmp-libc/usr/bin/gencat usr/bin
-debian/tmp-libc/usr/bin/mtrace usr/bin
-debian/tmp-libc/usr/bin/rpcgen usr/bin
-debian/tmp-libc/usr/bin/sprof usr/bin
-
debian/tmp-libc/usr/lib/libBrokenLocale.a usr/lib
debian/tmp-libc/usr/lib/libbsd-compat.a usr/lib
debian/tmp-libc/usr/lib/libc.a usr/lib
Deleted: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.manpages
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.manpages 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-dev.manpages 2009-08-18 19:29:25 UTC (rev 3770)
@@ -1,4 +0,0 @@
-debian/local/manpages/gencat.1
-debian/local/manpages/mtrace.1
-debian/local/manpages/rpcgen.1
-debian/local/manpages/sprof.1
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.dirs
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.dirs 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.dirs 2009-08-18 19:29:25 UTC (rev 3770)
@@ -1,2 +1 @@
-etc/init.d
etc/ld.so.conf.d
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.install 2009-08-18 19:29:25 UTC (rev 3770)
@@ -1,29 +1,10 @@
debian/tmp-libc/lib/*.so* lib
debian/tmp-libc/usr/lib/gconv/*.so usr/lib/gconv
debian/tmp-libc/usr/lib/gconv/gconv-modules usr/lib/gconv
-debian/tmp-libc/usr/bin/iconv usr/bin
-debian/tmp-libc/usr/bin/locale usr/bin
-debian/tmp-libc/usr/bin/localedef usr/bin
-debian/tmp-libc/usr/bin/getent usr/bin
-debian/tmp-libc/usr/bin/getconf usr/bin
-debian/tmp-libc/usr/bin/catchsegv usr/bin
-debian/tmp-libc/usr/bin/tzselect usr/bin
-debian/tmp-libc/usr/bin/ldd usr/bin
-debian/tmp-libc/usr/sbin/zdump usr/bin
-debian/tmp-libc/usr/sbin/rpcinfo usr/bin
-debian/tmp-libc/usr/sbin/zic usr/sbin
-debian/tmp-libc/usr/sbin/iconvconfig usr/sbin
-
-debian/tmp-libc/sbin/ldconfig sbin
-
-debian/tmp-libc/usr/lib/pt_chown usr/lib
-
debian/tmp-libc/lib/*-*-gnu*/ lib
debian/tmp-libc/usr/lib/*-*-gnu*/ usr/lib
debian/tmp-libc/etc/ld.so.conf.d /etc
-posix/gai.conf /etc
-debian/local/etc/bindresvport.blacklist /etc
BUILD-TREE/test-results-*-libc usr/share/doc/LIBC
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.lintian 2009-08-18 19:29:25 UTC (rev 3770)
@@ -1,7 +1,3 @@
-# ldconfig must be executable even when the libc is not configured, and
-# thus must be linked statically
-LIBC: statically-linked-binary ./sbin/ldconfig
-
# libpthread must be stripped specially; GDB needs the non-dynamic
# symbol table in order to load the thread debugging library.
LIBC: unstripped-binary-or-object ./lib/libpthread-2.10.1.so
@@ -9,10 +5,6 @@
# ld.so must be executable, otherwise the system will not work
LIBC: shlib-with-executable-bit lib/ld-2.10.1.so 0755
-# pt_chown must be setuid root, otherwise non-root users won't be able
-# to login
-LIBC: setuid-binary usr/lib/pt_chown 4755 root/root
-
# It is normal that the ELF dynamic linker does not need any other
# library
LIBC: shared-lib-without-dependency-information ./lib/ld-2.10.1.so
Deleted: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.manpages
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.manpages 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.manpages 2009-08-18 19:29:25 UTC (rev 3770)
@@ -1,14 +0,0 @@
-debian/local/manpages/catchsegv.1
-debian/local/manpages/gai.conf.5
-debian/local/manpages/getent.1
-debian/local/manpages/getconf.1
-debian/local/manpages/iconv.1
-debian/local/manpages/iconvconfig.8
-debian/local/manpages/ldconfig.8
-debian/local/manpages/ldd.1
-debian/local/manpages/locale.1
-debian/local/manpages/localedef.1
-debian/local/manpages/rpcinfo.8
-debian/local/manpages/tzselect.1
-debian/local/manpages/zdump.1
-debian/local/manpages/zic.8
Added: glibc-package/branches/eglibc-2.10/debian/local/etc/ld.so.conf.d/libc.conf
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/local/etc/ld.so.conf.d/libc.conf (rev 0)
+++ glibc-package/branches/eglibc-2.10/debian/local/etc/ld.so.conf.d/libc.conf 2009-08-18 19:29:25 UTC (rev 3770)
@@ -0,0 +1,2 @@
+# libc default configuration
+/usr/local/lib
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff 2009-08-18 19:29:25 UTC (rev 3770)
@@ -8,21 +8,24 @@
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,13 @@
+@@ -191,6 +191,16 @@
endif
inst_libdir = $(install_root)$(libdir)
+# Multiarch places to look for libraries
+ifndef extra_libdir
-+multiarch-machine = $(subst i586,i486,$(config-machine))
-+multiarch-machine = $(subst i686,i486,$(multiarch-machine))
++ifneq (,$(findstring $(config-machine),i586 i686))
++multiarch-machine = i486
++else
++multiarch-machine = $(config-machine)
++endif
+extra_libdir = /lib/$(multiarch-machine)-$(config-os):$(exec_prefix)/lib/$(multiarch-machine)-$(config-os)
+endif
+
# Where to install the shared library and dynamic linker.
ifndef slibdir
slibdir = $(exec_prefix)/lib
-@@ -501,6 +508,10 @@
+@@ -501,6 +511,10 @@
default-rpath = $(libdir)
endif
Modified: glibc-package/branches/eglibc-2.10/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/rules 2009-08-18 19:29:25 UTC (rev 3770)
@@ -123,7 +123,7 @@
# Which build pass are we on?
curpass = $(filter-out %_,$(subst _,_ ,$@))
-DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic locales-all
+DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin locales-all
DEB_INDEP_REGULAR_PACKAGES = glibc-doc eglibc-source locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-08-18 19:29:25 UTC (rev 3770)
@@ -155,13 +155,6 @@
echo /usr/lib/$$triplet >> $$conffile; \
fi
- # Create a default configuration file that adds /usr/local/lib to the search path
- if [ $(curpass) = libc ]; then \
- mkdir -p debian/tmp-$(curpass)/etc/ld.so.conf.d; \
- echo "# libc default configuration" > debian/tmp-$(curpass)/etc/ld.so.conf.d/libc.conf ; \
- echo /usr/local/lib >> debian/tmp-$(curpass)/etc/ld.so.conf.d/libc.conf ; \
- fi
-
$(call xx,extra_install)
touch $@
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk 2009-08-18 19:21:15 UTC (rev 3769)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/debhelper.mk 2009-08-18 19:29:25 UTC (rev 3770)
@@ -17,9 +17,9 @@
install --mode=0644 build-tree/$(DEB_HOST_ARCH)-libc/libresolv.map debian/$(libc)-pic/usr/lib/libresolv_pic.map
# Some per-package extra files to install.
-define $(libc)_extra_debhelper_pkg_install
- # dh_installmanpages thinks that .so is a language.
- install --mode=0644 debian/local/manpages/ld.so.8 debian/$(curpass)/usr/share/man/man8/ld.so.8
+define libc-bin_extra_debhelper_pkg_install
+ # dh_installmanpages thinks that .so is a language.
+ install --mode=0644 debian/local/manpages/ld.so.8 debian/libc-bin/usr/share/man/man8/ld.so.8
endef
# Should each of these have per-package options?
@@ -47,6 +47,7 @@
fi
dh_installinit -p$(curpass)
dh_installdocs -p$(curpass)
+ dh_lintian -p $(curpass)
dh_link -p$(curpass)
set -e; if test -d debian/bug/$(curpass); then \
dh_installdirs -p$(curpass) usr/share/bug; \
@@ -99,18 +100,10 @@
chmod a+x debian/shlibs-add-udebs
./debian/shlibs-add-udebs $(curpass)
- if [ -f debian/$(curpass).lintian ] ; then \
- install -d -m 755 -o root -g root debian/$(curpass)/usr/share/lintian/overrides/ ; \
- install -m 644 -o root -g root debian/$(curpass).lintian \
- debian/$(curpass)/usr/share/lintian/overrides/$(curpass) ; \
- fi
-
dh_installdeb -p$(curpass)
+ dh_shlibdeps -p$(curpass)
+ dh_gencontrol -p$(curpass)
if [ $(curpass) = nscd ] ; then \
- dh_shlibdeps -p$(curpass) ; \
- fi
- dh_gencontrol -p$(curpass) -- $($(curpass)_control_flags)
- if [ $(curpass) = nscd ] ; then \
sed -i -e "s/\(Depends:.*libc[0-9.]\+\)-[a-z0-9]\+/\1/" debian/nscd/DEBIAN/control ; \
fi
dh_md5sums -p$(curpass)
@@ -149,7 +142,7 @@
$(stamp)debhelper:
for x in `find debian/debhelper.in -maxdepth 1 -type f`; do \
y=debian/`basename $$x`; \
- z=`echo $$y | sed -e 's#/libc#/$(libc)#'`; \
+ z=`echo $$y | sed -e 's#libc\(\|-alt\|-dev\|-dev-alt\|-otherbuild\|-pic\|-proc\|-udev\)\.#$(libc)\1.#g'`; \
cp $$x $$z; \
sed -e "s#BUILD-TREE#$(build-tree)#" -i $$z; \
sed -e "/NSS_CHECK/r debian/script.in/nsscheck.sh" -i $$z; \
@@ -161,9 +154,6 @@
case $$z in \
*.install) \
sed -e "s/^#.*//" -i $$z ; \
- if [ $(DEB_HOST_ARCH) != $(DEB_BUILD_ARCH) ]; then \
- sed -i "/^.*librpcsvc.a.*/d" $$z ; \
- fi ; \
;; \
debian/$(libc).preinst) \
rtld=`LANG=C LC_ALL=C readelf -l debian/tmp-libc/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
@@ -186,7 +176,7 @@
slibdir=$$1; \
shift; \
case $$slibdir in \
- /lib32 | /lib64 | /emul/ia32-linux/lib) \
+ /lib32 | /lib64) \
suffix="alt"; \
libdir=$$1; \
shift; \
Reply to: