r1324 - in glibc-package/trunk/debian: . control.in debhelper.in rules.d
Author: aurel32
Date: 2006-04-05 22:31:42 +0000 (Wed, 05 Apr 2006)
New Revision: 1324
Added:
glibc-package/trunk/debian/debhelper.in/libc-bin.dirs
glibc-package/trunk/debian/debhelper.in/libc-bin.docs
glibc-package/trunk/debian/debhelper.in/libc-bin.install
glibc-package/trunk/debian/debhelper.in/libc-bin.manpages
glibc-package/trunk/debian/debhelper.in/libc-bin.postinst
glibc-package/trunk/debian/debhelper.in/libc-bin.postrm
glibc-package/trunk/debian/debhelper.in/libc-dev-bin.install
glibc-package/trunk/debian/debhelper.in/libc-dev-bin.manpages
Removed:
glibc-package/trunk/debian/debhelper.in/libc-dev.manpages
glibc-package/trunk/debian/debhelper.in/libc.docs
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control.in/amd64
glibc-package/trunk/debian/control.in/libc
glibc-package/trunk/debian/control.in/libc0.1
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/control.in/powerpc
glibc-package/trunk/debian/control.in/ppc64
glibc-package/trunk/debian/control.in/s390x
glibc-package/trunk/debian/control.in/sparc64
glibc-package/trunk/debian/debhelper.in/libc-dev.install
glibc-package/trunk/debian/debhelper.in/libc.dirs
glibc-package/trunk/debian/debhelper.in/libc.install
glibc-package/trunk/debian/debhelper.in/libc.manpages
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/debhelper.in/libc.postrm
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/debhelper.mk
Log:
* Split out binaries from libc6 into libc-bin, and binaries from libc6-bin
into libc-bin-dev. (Closes: #330735)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/changelog 2006-04-05 22:31:42 UTC (rev 1324)
@@ -3,6 +3,8 @@
[ Aurelien Jarno ]
* Split out timezone data in a separate package. It's a first step, it
should finally be built from a separate source package.
+ * Split out binaries from libc6 into libc-bin, and binaries from libc6-bin
+ into libc-bin-dev. (Closes: #330735)
[ Denis Barbier ]
* debian/debhelper.in/locales.config: /etc/locale.gen was not generated at
Modified: glibc-package/trunk/debian/control.in/amd64
===================================================================
--- glibc-package/trunk/debian/control.in/amd64 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/amd64 2006-04-05 22:31:42 UTC (rev 1324)
@@ -2,7 +2,7 @@
Architecture: i386
Section: libs
Priority: standard
-Depends: libc6 (= ${Source-Version})
+Depends: libc-bin (>= ${Source-Version})
Conflicts: amd64-libs (<= 1.2)
Description: GNU C Library: 64bit Shared libraries for AMD64
This package includes shared versions of the standard C library and the
@@ -13,7 +13,7 @@
Architecture: i386
Section: libdevel
Priority: optional
-Depends: libc6-amd64 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib64gcc1
+Depends: libc6-amd64 (= ${Source-Version}), libc-dev-bin (>= ${Source-Version}), lib64gcc1
Replaces: amd64-libs-dev (<= 1.2)
Provides: lib64c-dev
Description: GNU C Library: 64bit Development Libraries for AMD64
Modified: glibc-package/trunk/debian/control.in/libc
===================================================================
--- glibc-package/trunk/debian/control.in/libc 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/libc 2006-04-05 22:31:42 UTC (rev 1324)
@@ -3,7 +3,7 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
+Depends: libc-bin (>= ${Source-Version}), tzdata
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -13,7 +13,7 @@
Architecture: @archs@
Section: libdevel
Priority: standard
-Depends: @libc@ (= ${Source-Version})
+Depends: @libc@ (= ${Source-Version}), libc-dev-bin (>= ${Source-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/trunk/debian/control.in/libc0.1
===================================================================
--- glibc-package/trunk/debian/control.in/libc0.1 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/libc0.1 2006-04-05 22:31:42 UTC (rev 1324)
@@ -3,7 +3,7 @@
Section: libs
Priority: required
Provides: ${locale-compat:Depends}
-Depends: tzdata
+Depends: libc-bin (>= ${Source-Version}), tzdata
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -13,7 +13,7 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: standard
-Depends: libc0.1 (= ${Source-Version})
+Depends: libc0.1 (= ${Source-Version}), libc-dev-bin (>= ${Source-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/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/main 2006-04-05 22:31:42 UTC (rev 1324)
@@ -15,6 +15,25 @@
Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@raspberryginger.com>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>, Denis Barbier <barbier@debian.org>, Aurelien Jarno <aurel32@debian.org>
Standards-Version: 3.6.2
+Package: libc-bin
+Architecture: any
+Section: libs
+Priority: required
+Depends: @libc@ (>= ${Source-Version})
+Replaces: libc0.1, libc0.3, libc6, libc6.1
+Description: GNU C Library: Binaries
+ Contains the binary programs needed by the standard C library.
+
+Package: libc-dev-bin
+Architecture: any
+Section: libdevel
+Priority: required
+Depends: @libc@ (>= ${Source-Version})
+Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev
+Description: GNU C Library: Development Binaries
+ Contains the binary programs needed to compile and link programs which
+ use the standard C library.
+
Package: @glibc@-doc
Architecture: all
Section: doc
@@ -48,6 +67,7 @@
Architecture: all
Section: libs
Priority: required
+Depends: libc-bin (>= ${Source-Version})
Replaces: libc0.1, libc0.3, libc6, libc6.1
Description: GNU C Library: Timezone data
This package contains data files with rules for various timezones around
Modified: glibc-package/trunk/debian/control.in/powerpc
===================================================================
--- glibc-package/trunk/debian/control.in/powerpc 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/powerpc 2006-04-05 22:31:42 UTC (rev 1324)
@@ -2,7 +2,7 @@
Architecture: ppc64
Section: libs
Priority: standard
-Depends: libc6 (= ${Source-Version})
+Depends: libc-bin (>= ${Source-Version})
Description: GNU C Library: 32bit powerpc shared libraries for ppc64
This package includes shared versions of the standard C
library and the standard math library, as well as many others.
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib32c-dev
-Depends: libc6-powerpc (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib32gcc1
+Depends: libc6-powerpc (= ${Source-Version}), libc-dev-bin (= ${Source-Version}), lib32gcc1
Description: GNU C Library: 32bit powerpc development libraries for ppc64
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 32bit version of the
Modified: glibc-package/trunk/debian/control.in/ppc64
===================================================================
--- glibc-package/trunk/debian/control.in/ppc64 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/ppc64 2006-04-05 22:31:42 UTC (rev 1324)
@@ -2,7 +2,7 @@
Architecture: powerpc
Section: libs
Priority: standard
-Depends: libc6 (= ${Source-Version})
+Depends: libc-bin (>= ${Source-Version})
Description: GNU C Library: 64bit Shared libraries for PowerPC64
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-ppc64 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib64gcc1
+Depends: libc6-ppc64 (= ${Source-Version}), libc-dev-bin (>= ${Source-Version}), lib64gcc1
Description: GNU C Library: 64bit Development Libraries for PowerPC64
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 64bit version of the
Modified: glibc-package/trunk/debian/control.in/s390x
===================================================================
--- glibc-package/trunk/debian/control.in/s390x 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/s390x 2006-04-05 22:31:42 UTC (rev 1324)
@@ -2,7 +2,7 @@
Architecture: s390
Section: libs
Priority: standard
-Depends: libc6 (= ${Source-Version})
+Depends: libc-bin (>= ${Source-Version})
Description: GNU C Library: 64bit Shared libraries for IBM zSeries
This package includes shared versions of the standard C library and the
standard math library, as well as many others. This is the 64bit version
@@ -13,7 +13,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-s390x (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib64gcc1
+Depends: libc6-s390x (= ${Source-Version}), libc-dev-bin (>= ${Source-Version}), lib64gcc1
Description: GNU C Library: 64bit Development Libraries for IBM zSeries
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 64bit version of the
Modified: glibc-package/trunk/debian/control.in/sparc64
===================================================================
--- glibc-package/trunk/debian/control.in/sparc64 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/control.in/sparc64 2006-04-05 22:31:42 UTC (rev 1324)
@@ -2,7 +2,7 @@
Architecture: sparc
Section: libs
Priority: standard
-Depends: libc6 (= ${Source-Version})
+Depends: libc-bin (>= ${Source-Version})
Conflicts: gcc-3.0 (<< 1:3.0.4ds3-11), libgcc1 (<< 1:3.0.4ds3-11), fakeroot (<< 0.4.5-2.7)
Description: GNU C Library: 64bit Shared libraries for UltraSPARC
This package includes shared versions of the standard C library and the
@@ -14,7 +14,7 @@
Section: libdevel
Priority: optional
Provides: lib64c-dev
-Depends: libc6-sparc64 (= ${Source-Version}), libc6-dev (= ${Source-Version}), lib64gcc1
+Depends: libc6-sparc64 (= ${Source-Version}), libc-dev-bin (>= ${Source-Version}), lib64gcc1
Description: GNU C Library: 64bit Development Libraries for UltraSPARC
Contains the symlinks and object files needed to compile and link programs
which use the standard C library. This is the 64bit version of the
Added: glibc-package/trunk/debian/debhelper.in/libc-bin.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.dirs 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.dirs 2006-04-05 22:31:42 UTC (rev 1324)
@@ -0,0 +1,2 @@
+sys
+etc/init.d
Added: glibc-package/trunk/debian/debhelper.in/libc-bin.docs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.docs 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.docs 2006-04-05 22:31:42 UTC (rev 1324)
@@ -0,0 +1,11 @@
+DEB_SRCDIR/BUGS
+DEB_SRCDIR/FAQ
+DEB_SRCDIR/INTERFACE
+DEB_SRCDIR/NEWS
+DEB_SRCDIR/NOTES
+DEB_SRCDIR/PROJECTS
+DEB_SRCDIR/README
+DEB_SRCDIR/hesiod/README.hesiod
+DEB_SRCDIR/CONFORMANCE
+DEB_SRCDIR/NAMESPACE
+debian/TODO
Added: glibc-package/trunk/debian/debhelper.in/libc-bin.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.install 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.install 2006-04-05 22:31:42 UTC (rev 1324)
@@ -0,0 +1,19 @@
+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/local/usr_sbin/tzconfig usr/sbin
Added: glibc-package/trunk/debian/debhelper.in/libc-bin.manpages
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.manpages 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.manpages 2006-04-05 22:31:42 UTC (rev 1324)
@@ -0,0 +1,14 @@
+debian/local/manpages/catchsegv.1
+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/tzconfig.8
+debian/local/manpages/zdump.1
+debian/local/manpages/zic.8
Added: glibc-package/trunk/debian/debhelper.in/libc-bin.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.postinst 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.postinst 2006-04-05 22:31:42 UTC (rev 1324)
@@ -0,0 +1,72 @@
+#!/bin/bash
+set -e
+export LC_ALL=C
+
+type=$1
+preversion=$2
+
+# Borrowed from sysvinit's postinst.
+# Function like update-rc.d but simpler & faster.
+# Usage: updatercd basename start|stop NN runlevel .
+#
+# Now we use the real update-rc.d, so now this function should
+# be equivalent to /usr/sbin/update-rc.d.
+#
+updatercd() {
+
+ if [ ! -f /etc/init.d/$1 ]
+ then
+ return
+ fi
+
+ if [ -x /usr/sbin/update-rc.d ]
+ then
+ update-rc.d "$@" > /dev/null
+ return $?
+ fi
+
+ base=$1
+ shift
+ while [ "$1" != "" ]
+ do
+ if [ "$1" = stop ]
+ then
+ tlet=K
+ else
+ tlet=S
+ fi
+ lev=$2
+ shift 2
+ while [ "$1" != "." ]
+ do
+ cd /etc/rc$1.d
+ tmp="`echo $tlet??$base`"
+ case "$tmp" in
+ "$tlet??$base")
+ # Not present yet.
+ ln -s ../init.d/$base $tlet$lev$base
+ ;;
+ *)
+ # Already present.
+ ;;
+ esac
+ shift
+ done
+ shift
+ done
+}
+
+if [ "$type" = "configure" ]
+then
+# # DO NOT FOLLOW THIS EXAMPLE IN OTHER PACKAGES
+ updatercd glibc.sh start 01 S .
+ if [ -x /usr/sbin/invoke-rc.d ]; then
+ invoke-rc.d glibc.sh start
+ else
+ /etc/init.d/glibc.sh 2>/dev/null || true
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
Added: glibc-package/trunk/debian/debhelper.in/libc-bin.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-bin.postrm 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-bin.postrm 2006-04-05 22:31:42 UTC (rev 1324)
@@ -0,0 +1,16 @@
+#! /bin/sh
+set -e
+
+if [ "$1" = remove ]; then
+ if command -v suidunregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then
+ if [ -x /usr/lib/pt_chown ]; then
+ suidunregister -s LIBC /usr/lib/pt_chown
+ elif [ -x /usr/libexec/pt_chown ]; then
+ suidunregister -s LIBC /usr/libexec/pt_chown
+ fi
+ fi
+fi
+
+#DEBHELPER#
+
+exit 0
Added: glibc-package/trunk/debian/debhelper.in/libc-dev-bin.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-dev-bin.install 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-dev-bin.install 2006-04-05 22:31:42 UTC (rev 1324)
@@ -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/trunk/debian/debhelper.in/libc-dev-bin.manpages
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-dev-bin.manpages 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-dev-bin.manpages 2006-04-05 22:31:42 UTC (rev 1324)
@@ -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/trunk/debian/debhelper.in/libc-dev.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-dev.install 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-dev.install 2006-04-05 22:31:42 UTC (rev 1324)
@@ -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
Deleted: glibc-package/trunk/debian/debhelper.in/libc-dev.manpages
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc-dev.manpages 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc-dev.manpages 2006-04-05 22:31:42 UTC (rev 1324)
@@ -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/trunk/debian/debhelper.in/libc.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.dirs 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc.dirs 2006-04-05 22:31:42 UTC (rev 1324)
@@ -1,2 +0,0 @@
-sys
-etc/init.d
Deleted: glibc-package/trunk/debian/debhelper.in/libc.docs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.docs 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc.docs 2006-04-05 22:31:42 UTC (rev 1324)
@@ -1,12 +0,0 @@
-log-test-*
-DEB_SRCDIR/BUGS
-DEB_SRCDIR/FAQ
-DEB_SRCDIR/INTERFACE
-DEB_SRCDIR/NEWS
-DEB_SRCDIR/NOTES
-DEB_SRCDIR/PROJECTS
-DEB_SRCDIR/README
-DEB_SRCDIR/hesiod/README.hesiod
-DEB_SRCDIR/CONFORMANCE
-DEB_SRCDIR/NAMESPACE
-debian/TODO
Modified: glibc-package/trunk/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.install 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc.install 2006-04-05 22:31:42 UTC (rev 1324)
@@ -1,26 +1,7 @@
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/local/usr_sbin/tzconfig usr/sbin
-
debian/tmp-libc/lib/ldconfig/* lib/ldconfig
debian/tmp-libc/lib/*-*-gnu/ lib
debian/tmp-libc/usr/lib/*-*-gnu/ usr/lib
Modified: glibc-package/trunk/debian/debhelper.in/libc.manpages
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.manpages 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc.manpages 2006-04-05 22:31:42 UTC (rev 1324)
@@ -1,14 +0,0 @@
-debian/local/manpages/catchsegv.1
-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/tzconfig.8
-debian/local/manpages/zdump.1
-debian/local/manpages/zic.8
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2006-04-05 22:31:42 UTC (rev 1324)
@@ -10,57 +10,6 @@
echo LIBC
}
-# Borrowed from sysvinit's postinst.
-# Function like update-rc.d but simpler & faster.
-# Usage: updatercd basename start|stop NN runlevel .
-#
-# Now we use the real update-rc.d, so now this function should
-# be equivalent to /usr/sbin/update-rc.d.
-#
-updatercd() {
-
- if [ ! -f /etc/init.d/$1 ]
- then
- return
- fi
-
- if [ -x /usr/sbin/update-rc.d ]
- then
- update-rc.d "$@" > /dev/null
- return $?
- fi
-
- base=$1
- shift
- while [ "$1" != "" ]
- do
- if [ "$1" = stop ]
- then
- tlet=K
- else
- tlet=S
- fi
- lev=$2
- shift 2
- while [ "$1" != "." ]
- do
- cd /etc/rc$1.d
- tmp="`echo $tlet??$base`"
- case "$tmp" in
- "$tlet??$base")
- # Not present yet.
- ln -s ../init.d/$base $tlet$lev$base
- ;;
- *)
- # Already present.
- ;;
- esac
- shift
- done
- shift
- done
-}
-
# element() is a helper function for file-rc:
element() {
local element list IFS
@@ -336,14 +285,6 @@
fi
fi # end upgrading and $preversion lt 2.3.5-1
fi # Upgrading
-
-# # DO NOT FOLLOW THIS EXAMPLE IN OTHER PACKAGES
- updatercd glibc.sh start 01 S .
- if [ -x /usr/sbin/invoke-rc.d ]; then
- invoke-rc.d glibc.sh start
- else
- /etc/init.d/glibc.sh 2>/dev/null || true
- fi
fi
if [ "`uname -s`" = Linux ]; then
Modified: glibc-package/trunk/debian/debhelper.in/libc.postrm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postrm 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/debhelper.in/libc.postrm 2006-04-05 22:31:42 UTC (rev 1324)
@@ -1,16 +1,6 @@
#! /bin/sh
set -e
-if [ "$1" = remove ]; then
- if command -v suidunregister >/dev/null 2>&1 && [ -e /etc/suid.conf ]; then
- if [ -x /usr/lib/pt_chown ]; then
- suidunregister -s LIBC /usr/lib/pt_chown
- elif [ -x /usr/libexec/pt_chown ]; then
- suidunregister -s LIBC /usr/libexec/pt_chown
- fi
- fi
-fi
-
if [ "$1" = upgrade ]; then
case $(dpkg --print-architecture) in
i386|sparc)
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/rules 2006-04-05 22:31:42 UTC (rev 1324)
@@ -117,7 +117,7 @@
# Which build pass are we on?
curpass = $(filter-out %_,$(subst _,_ ,$@))
-DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic
+DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin
DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales tzdata
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-05 20:58:54 UTC (rev 1323)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-04-05 22:31:42 UTC (rev 1324)
@@ -17,23 +17,18 @@
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
- install --mode=0644 $(DEB_SRCDIR)/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
- install --mode=0644 $(DEB_SRCDIR)/linuxthreads/README debian/$(curpass)/usr/share/doc/$(curpass)/README.linuxthreads
- install --mode=0644 $(DEB_SRCDIR)/linuxthreads/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.linuxthreads
- case " $(GLIBC_PASSES) " in \
- *" nptl "*) \
- install --mode=0644 $(DEB_SRCDIR)/nptl/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.nptl; \
- ;; \
- esac
+define libc-bin_debhelper_pkg_install
sed -e "/KERNEL_VERSION_CHECK/r debian/script.in/kernelcheck.sh" \
debian/local/etc_init.d/glibc.sh | \
sed -e "s/EXIT_CHECK/sleep 5/" -e "s/DEB_HOST_ARCH/$(DEB_HOST_ARCH)/" > debian/glibc.sh.generated
install --mode=0755 debian/glibc.sh.generated debian/$(curpass)/etc/init.d/glibc.sh
# 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
-
install --mode=0644 debian/FAQ debian/$(curpass)/usr/share/doc/$(curpass)/README.Debian
+ install --mode=0644 $(DEB_SRCDIR)/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/changelog
+ install --mode=0644 $(DEB_SRCDIR)/linuxthreads/README debian/$(curpass)/usr/share/doc/$(curpass)/README.linuxthreads
+ install --mode=0644 $(DEB_SRCDIR)/linuxthreads/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.linuxthreads
+ install --mode=0644 $(DEB_SRCDIR)/nptl/ChangeLog debian/$(curpass)/usr/share/doc/$(curpass)/ChangeLog.nptl
endef
define locales_extra_debhelper_pkg_install
@@ -63,9 +58,19 @@
dh_installman -p$(curpass)
dh_installinfo -p$(curpass)
dh_installdebconf -p$(curpass)
- dh_installchangelogs -p$(curpass)
+ case $(curpass) in \
+ $(libc)*-bin) \
+ dh_installchangelogs -p$(curpass) ; \
+ dh_installdocs -p$(curpass) ;; \
+ $(libc)-dev*) \
+ dh_link -p$(curpass) usr/share/doc/libc-dev-bin usr/share/doc/$(curpass) ;; \
+ $(libc)-*) \
+ dh_link -p$(curpass) usr/share/doc/libc-bin usr/share/doc/$(curpass) ;; \
+ *) \
+ dh_installchangelogs -p$(curpass) ; \
+ dh_installdocs -p$(curpass) ;; \
+ esac
dh_installinit -p$(curpass)
- dh_installdocs -p$(curpass)
dh_link -p$(curpass)
# extra_debhelper_pkg_install is used for debhelper.mk only.
@@ -176,6 +181,12 @@
for x in `find debian/debhelper.in -type f -maxdepth 1`; do \
y=debian/`basename $$x`; \
z=`echo $$y | sed -e 's#/libc#/$(libc)#'`; \
+ case $$y in \
+ debian/libc-bin* | debian/libc-dev-bin*) \
+ z=$$y ;; \
+ *) \
+ z=`echo $$y | sed -e 's#/libc#/$(libc)#'` ;; \
+ esac; \
cp $$x $$z; \
sed -e "s#TMPDIR#debian/tmp-libc#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
Reply to: