r3668 - in glibc-package/branches/multiarch/debian: . control.in debhelper.in local/etc local/etc/ld.so.conf.d rules.d
Author: aurel32
Date: 2009-07-26 15:58:27 +0000 (Sun, 26 Jul 2009)
New Revision: 3668
Added:
glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.dirs
glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.install
glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian
glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.postinst
glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.preinst
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.docs
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.install
glibc-package/branches/multiarch/debian/local/etc/ld.so.conf.d/
glibc-package/branches/multiarch/debian/local/etc/ld.so.conf.d/libc.conf
Modified:
glibc-package/branches/multiarch/debian/changelog
glibc-package/branches/multiarch/debian/control
glibc-package/branches/multiarch/debian/control.in/libc
glibc-package/branches/multiarch/debian/control.in/main
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install.hurd-i386
glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.manpages
glibc-package/branches/multiarch/debian/debhelper.in/libc.dirs
glibc-package/branches/multiarch/debian/debhelper.in/libc.docs
glibc-package/branches/multiarch/debian/debhelper.in/libc.install
glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian
glibc-package/branches/multiarch/debian/debhelper.in/libc.manpages
glibc-package/branches/multiarch/debian/rules
glibc-package/branches/multiarch/debian/rules.d/build.mk
glibc-package/branches/multiarch/debian/rules.d/debhelper.mk
Log:
* Split out libc-bin from libc6 and libc-dev-bin from libc6-dev.
Closes: #330735.
Modified: glibc-package/branches/multiarch/debian/changelog
===================================================================
--- glibc-package/branches/multiarch/debian/changelog 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/changelog 2009-07-26 15:58:27 UTC (rev 3668)
@@ -1,3 +1,10 @@
+eglibc (2.9-22+multiarch) experimental; urgency=low
+
+ * Split out libc-bin from libc6 and libc-dev-bin from libc6-dev.
+ Closes: #330735.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 26 Jul 2009 17:55:10 +0200
+
eglibc (2.9-23) UNRELEASED; urgency=low
* debhelper.in/libc.postinst, sysdeps/depflags.pl: remove upgrade code
Modified: glibc-package/branches/multiarch/debian/control
===================================================================
--- glibc-package/branches/multiarch/debian/control 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/control 2009-07-26 15:58:27 UTC (rev 3668)
@@ -16,6 +16,22 @@
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
+Depends: ${shlibs:Depends}
+Description: GNU C Library: Binaries
+ To be filled .
+
+Package: libc-dev-bin
+Architecture: any
+Section: libdevel
+Priority: optional
+Depends: ${shlibs:Depends}
+Description: GNU C Library: Development binaries
+ To be filled .
+
Package: glibc-doc
Architecture: all
Section: doc
@@ -79,6 +95,7 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
+Pre-Depends: libc-bin (= ${binary:Version})
Provides: ${locale-compat:Depends}
Suggests: debconf | debconf-2.0
Description: GNU C Library: Shared libraries
@@ -90,7 +107,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})
+Depends: libc6 (= ${binary:Version}), libc-dev-bin (= ${binary:Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
@@ -147,6 +164,7 @@
Architecture: alpha ia64
Section: libs
Priority: required
+Pre-Depends: libc-bin (= ${binary:Version})
Provides: ${locale-compat:Depends}
Suggests: debconf | debconf-2.0
Description: GNU C Library: Shared libraries
@@ -158,7 +176,7 @@
Architecture: alpha ia64
Section: libdevel
Priority: optional
-Depends: libc6.1 (= ${binary:Version})
+Depends: libc6.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
@@ -215,6 +233,7 @@
Architecture: hurd-i386
Section: libs
Priority: required
+Pre-Depends: libc-bin (= ${binary:Version})
Provides: ${locale-compat:Depends}
Suggests: debconf | debconf-2.0
Description: GNU C Library: Shared libraries
@@ -226,7 +245,7 @@
Architecture: hurd-i386
Section: libdevel
Priority: optional
-Depends: libc0.3 (= ${binary:Version})
+Depends: libc0.3 (= ${binary:Version}), libc-dev-bin (= ${binary:Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
@@ -283,6 +302,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libs
Priority: required
+Pre-Depends: libc-bin (= ${binary:Version})
Provides: ${locale-compat:Depends}
Suggests: debconf | debconf-2.0
Description: GNU C Library: Shared libraries
@@ -294,7 +314,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: optional
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), libc-dev-bin (= ${binary:Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
Modified: glibc-package/branches/multiarch/debian/control.in/libc
===================================================================
--- glibc-package/branches/multiarch/debian/control.in/libc 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/control.in/libc 2009-07-26 15:58:27 UTC (rev 3668)
@@ -2,6 +2,7 @@
Architecture: @archs@
Section: libs
Priority: required
+Pre-Depends: libc-bin (= ${binary:Version})
Provides: ${locale-compat:Depends}
Suggests: debconf | debconf-2.0
Description: GNU C Library: Shared libraries
@@ -13,7 +14,7 @@
Architecture: @archs@
Section: libdevel
Priority: optional
-Depends: @libc@ (= ${binary:Version})
+Depends: @libc@ (= ${binary:Version}), libc-dev-bin (= ${binary:Version})
Recommends: gcc | c-compiler
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
Modified: glibc-package/branches/multiarch/debian/control.in/main
===================================================================
--- glibc-package/branches/multiarch/debian/control.in/main 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/control.in/main 2009-07-26 15:58:27 UTC (rev 3668)
@@ -16,6 +16,24 @@
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
+Depends: ${shlibs:Depends}
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Description: GNU C Library: Binaries
+ To be filled .
+
+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
+ To be filled .
+
Package: glibc-doc
Architecture: all
Section: doc
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.dirs
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.dirs (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.dirs 2009-07-26 15:58:27 UTC (rev 3668)
@@ -0,0 +1 @@
+etc/init.d
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.install (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.install 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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/multiarch/debian/debhelper.in/libc-bin.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.lintian 2009-07-26 15:58:27 UTC (rev 3668)
@@ -0,0 +1,10 @@
+# ldconfig must be executable even when the libc is not configured, and
+# thus must be linked statically
+LIBC: statically-linked-binary ./sbin/ldconfig
+
+# ld.so must be executable, otherwise the system will not work
+LIBC: 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: setuid-binary usr/lib/pt_chown 4755 root/root
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.postinst
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.postinst (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.postinst 2009-07-26 15:58:27 UTC (rev 3668)
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+# Move a conffile without triggering a dpkg question
+mv_conffile() {
+ OLDCONFFILE="$1"
+ NEWCONFFILE="$2"
+
+ if [ -e "$OLDCONFFILE" ]; then
+ echo "Preserving user changes to $NEWCONFFILE ..."
+ mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
+ mv -f "$OLDCONFFILE" "$NEWCONFFILE"
+ fi
+}
+
+LASTVERSION=2.9-22
+
+case "$1" in
+configure)
+ if dpkg --compare-versions "$2" le "$LASTVERSION"; then
+ mv_conffile "/etc/bindresvport.blacklist"
+ mv_conffile "/etc/gai.conf"
+ mv_conffile "/etc/ld.so.conf.d/libc.conf"
+ fi
+esac
+
+#DEBHELPER#
+
+exit 0
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.preinst
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.preinst (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-bin.preinst 2009-07-26 15:58:27 UTC (rev 3668)
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# Prepare to move a conffile without triggering a dpkg question
+prep_mv_conffile() {
+ CONFFILE="$1"
+
+ if [ -e "$CONFFILE" ]; then
+ md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
+ old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
+ if [ "$md5sum" = "$old_md5sum" ]; then
+ rm -f "$CONFFILE"
+ fi
+ fi
+}
+
+LASTVERSION=2.9-22
+
+case "$1" in
+install|upgrade)
+ if dpkg --compare-versions "$2" le "$LASTVERSION"; then
+ prep_mv_conffile "/etc/bindresvport.blacklist"
+ prep_mv_conffile "/etc/gai.conf"
+ prep_mv_conffile "/etc/ld.so.conf.d/libc.conf"
+ fi
+esac
+
+#DEBHELPER#
+
+exit 0
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.docs
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.docs (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.docs 2009-07-26 15:58:27 UTC (rev 3668)
@@ -0,0 +1,2 @@
+NOTES
+NAMESPACE
Added: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.install (rev 0)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev-bin.install 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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/multiarch/debian/debhelper.in/libc-dev.install.hurd-i386
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install.hurd-i386 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.install.hurd-i386 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.manpages
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.manpages 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc-dev.manpages 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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/multiarch/debian/debhelper.in/libc.dirs
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.dirs 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.dirs 2009-07-26 15:58:27 UTC (rev 3668)
@@ -1,2 +1 @@
-etc/init.d
etc/ld.so.conf.d
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.docs
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.docs 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.docs 2009-07-26 15:58:27 UTC (rev 3668)
@@ -1,10 +1,8 @@
BUGS
FAQ
NEWS
-NOTES
PROJECTS
README
hesiod/README.hesiod
CONFORMANCE
-NAMESPACE
debian/TODO
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.install 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.install 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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/multiarch/debian/debhelper.in/libc.lintian
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.lintian 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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.9.so
@@ -9,10 +5,6 @@
# ld.so must be executable, otherwise the system will not work
LIBC: 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: 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.9.so
Modified: glibc-package/branches/multiarch/debian/debhelper.in/libc.manpages
===================================================================
--- glibc-package/branches/multiarch/debian/debhelper.in/libc.manpages 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/debhelper.in/libc.manpages 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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/multiarch/debian/local/etc/ld.so.conf.d/libc.conf
===================================================================
--- glibc-package/branches/multiarch/debian/local/etc/ld.so.conf.d/libc.conf (rev 0)
+++ glibc-package/branches/multiarch/debian/local/etc/ld.so.conf.d/libc.conf 2009-07-26 15:58:27 UTC (rev 3668)
@@ -0,0 +1,2 @@
+# libc default configuration
+/usr/local/lib
Modified: glibc-package/branches/multiarch/debian/rules
===================================================================
--- glibc-package/branches/multiarch/debian/rules 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/rules 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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/multiarch/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/rules.d/build.mk 2009-07-26 15:58:27 UTC (rev 3668)
@@ -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/multiarch/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-07-26 15:49:55 UTC (rev 3667)
+++ glibc-package/branches/multiarch/debian/rules.d/debhelper.mk 2009-07-26 15:58:27 UTC (rev 3668)
@@ -20,10 +20,12 @@
define $(libc)_extra_debhelper_pkg_install
install --mode=0644 ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
install --mode=0644 nptl/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.nptl
- # 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
+endef
- install --mode=0644 debian/FAQ debian/$(curpass)/usr/share/doc/$(curpass)/README.Debian
+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
+ install --mode=0644 debian/FAQ debian/$(curpass)/usr/share/doc/libc-bin/README.Debian
endef
# Should each of these have per-package options?
@@ -149,7 +151,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 +163,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 +185,7 @@
slibdir=$$1; \
shift; \
case $$slibdir in \
- /lib32 | /lib64 | /emul/ia32-linux/lib) \
+ /lib32 | /lib64) \
suffix="alt"; \
libdir=$$1; \
shift; \
Reply to: