r1871 - in glibc-package/branches/glibc-2.5/debian: . debhelper.in local/manpages rules.d
Author: aurel32
Date: 2006-11-02 08:44:40 +0100 (Thu, 02 Nov 2006)
New Revision: 1871
Added:
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt.lintian
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev-alt.install
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev-alt.lintian
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev.lintian
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.lintian
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.lintian
Removed:
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt-dev.install
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dbg.install
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postinst
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postrm
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.preinst
glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.dirs
glibc-package/branches/glibc-2.5/debian/debhelper.in/nscd.init
glibc-package/branches/glibc-2.5/debian/local/manpages/catchsegv.1
glibc-package/branches/glibc-2.5/debian/local/manpages/gencat.1
glibc-package/branches/glibc-2.5/debian/local/manpages/getconf.1
glibc-package/branches/glibc-2.5/debian/local/manpages/getent.1
glibc-package/branches/glibc-2.5/debian/local/manpages/iconv.1
glibc-package/branches/glibc-2.5/debian/local/manpages/iconvconfig.8
glibc-package/branches/glibc-2.5/debian/local/manpages/mtrace.1
glibc-package/branches/glibc-2.5/debian/local/manpages/rpcgen.1
glibc-package/branches/glibc-2.5/debian/local/manpages/sprof.1
glibc-package/branches/glibc-2.5/debian/local/manpages/tzselect.1
glibc-package/branches/glibc-2.5/debian/rules.d/build.mk
glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk
Log:
* debian/local/manpages/*: fix typos. Closes: #395427.
* debian/debhelper.in/libc.dirs: don't provide /sys, now provided by
initscripts.
* debian/debhelper.in/nscd.init: add lsb header.
* debian/rules.d/debhelper.mk: add support for installing lintian and linda
overrides files.
* debian/debhelper.in/libc.overrides: new file.
* debian/debhelper.in/libc-dev.overrides: new file.
* debian/debhelper.in/libc-alt.overrides: new file.
* debian/debhelper.in/libc-otherbuild.overrides: new file.
* debian/debhelper.in/libc-dev-otherbuild.overrides: new file.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-11-02 07:44:40 UTC (rev 1871)
@@ -33,7 +33,7 @@
* sysdeps/powerpc.mk: install 64-bit headers (actually gnu/stubs-64.h)
directly into /usr/include and provide /usr/include/powerpc64-linux-gnu as
a symlink to /usr/include for compatibility reasons. Closes: #391858.
- * sparc/cvs-pause-sigprocmask.diff: new patch (fix sparc64 build) from
+ * sparc/cvs-pause-sigprocmask.diff: new patch (fix sparc64 build) from
upstream CVS.
* kfreebsd/local-scripts.diff: update.
* kfreebsd/local-sys_queue_h.diff: update.
@@ -45,6 +45,17 @@
#394128.
* alpha/submitted-sigsuspend.diff: new patch (fix the build on alpha) from
the libc-alpha mailing list.
+ * debian/local/manpages/*: fix typos. Closes: #395427.
+ * debian/debhelper.in/libc.dirs: don't provide /sys, now provided by
+ initscripts.
+ * debian/debhelper.in/nscd.init: add lsb header.
+ * debian/rules.d/debhelper.mk: add support for installing lintian and linda
+ overrides files.
+ * debian/debhelper.in/libc.overrides: new file.
+ * debian/debhelper.in/libc-dev.overrides: new file.
+ * debian/debhelper.in/libc-alt.overrides: new file.
+ * debian/debhelper.in/libc-otherbuild.overrides: new file.
+ * debian/debhelper.in/libc-dev-otherbuild.overrides: new file.
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
@@ -64,7 +75,7 @@
* Update localedata/fix-lang.diff
* Update localedata/first_weekday.diff
- -- Aurelien Jarno <aurel32@debian.org> Wed, 11 Oct 2006 16:27:42 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Mon, 30 Oct 2006 21:59:07 +0100
glibc (2.4-1) UNRELEASED; urgency=low
Deleted: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt-dev.install
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt-dev.install 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt-dev.install 2006-11-02 07:44:40 UTC (rev 1871)
@@ -1,21 +0,0 @@
-# This file is used for making biarch libraries development packages.
-TMPDIR/LIBDIR/libanl.a LIBDIR
-TMPDIR/LIBDIR/libBrokenLocale.a LIBDIR
-TMPDIR/LIBDIR/libbsd-compat.a LIBDIR
-TMPDIR/LIBDIR/libc.a LIBDIR
-TMPDIR/LIBDIR/libc_nonshared.a LIBDIR
-TMPDIR/LIBDIR/libcrypt.a LIBDIR
-TMPDIR/LIBDIR/libdl.a LIBDIR
-TMPDIR/LIBDIR/libg.a LIBDIR
-TMPDIR/LIBDIR/libieee.a LIBDIR
-TMPDIR/LIBDIR/libm.a LIBDIR
-TMPDIR/LIBDIR/libmcheck.a LIBDIR
-TMPDIR/LIBDIR/libnsl.a LIBDIR
-TMPDIR/LIBDIR/libpthread.a LIBDIR
-TMPDIR/LIBDIR/libpthread_nonshared.a LIBDIR
-TMPDIR/LIBDIR/libresolv.a LIBDIR
-TMPDIR/LIBDIR/librt.a LIBDIR
-TMPDIR/LIBDIR/libutil.a LIBDIR
-
-TMPDIR/LIBDIR/*.o LIBDIR
-TMPDIR/LIBDIR/*.so LIBDIR
Added: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt.lintian
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt.lintian 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt.lintian 2006-11-02 07:44:40 UTC (rev 1871)
@@ -0,0 +1,12 @@
+# libpthread must be stripped specially; GDB needs the non-dynamic
+# symbol table in order to load the thread debugging library.
+LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.5.so
+
+# Those file are actually .o files not package in a ar archive, and
+# thus should not be stripped
+LIBC-FLAVOR: unstripped-binary-or-object .LIBDIR/libieee.a
+LIBC-FLAVOR: unstripped-binary-or-object .LIBDIR/libmcheck.a
+
+# It is normal that the ELF dynamic linker does not need any other
+# library
+LIBC-FLAVOR: shared-lib-without-dependency-information .SLIBDIR/ld-2.5.so
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dbg.install
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dbg.install 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dbg.install 2006-11-02 07:44:40 UTC (rev 1871)
@@ -1 +1 @@
-TMPDIR/lib/*.so* usr/lib/debug
+debian/tmp-libc/lib/*.so* usr/lib/debug
Copied: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev-alt.install (from rev 1870, glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-alt-dev.install)
Added: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev-alt.lintian
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev-alt.lintian 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev-alt.lintian 2006-11-02 07:44:40 UTC (rev 1871)
@@ -0,0 +1,4 @@
+# Those file are actually .o files not package in a ar archive, and
+# thus should not be stripped
+LIBC-dev-FLAVOR: unstripped-binary-or-object .LIBDIR/libieee.a
+LIBC-dev-FLAVOR: unstripped-binary-or-object .LIBDIR/libmcheck.a
Added: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev.lintian
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev.lintian 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-dev.lintian 2006-11-02 07:44:40 UTC (rev 1871)
@@ -0,0 +1,6 @@
+# Those file are actually .o files not package in a ar archive, and
+# thus should not be stripped
+LIBC-dev: unstripped-binary-or-object ./usr/lib/libieee.a
+LIBC-dev: unstripped-binary-or-object ./usr/lib/libmcheck.a
+LIBC-dev: unstripped-binary-or-object ./usr/lib/xen/libieee.a
+LIBC-dev: unstripped-binary-or-object ./usr/lib/xen/libmcheck.a
Added: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.lintian
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.lintian 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.lintian 2006-11-02 07:44:40 UTC (rev 1871)
@@ -0,0 +1,3 @@
+# libpthread must be stripped specially; GDB needs the non-dynamic
+# symbol table in order to load the thread debugging library.
+LIBC-FLAVOR: unstripped-binary-or-object .SLIBDIR/libpthread-2.5.so
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postinst
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postinst 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postinst 2006-11-02 07:44:40 UTC (rev 1871)
@@ -13,7 +13,7 @@
if [ "$1" = "configure" ]
then
- opt=OPT
+ opt=LIBC-FLAVOR
curver=CURRENT_VER
if [ -f /etc/ld.so.hwcappkgs ]; then
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postrm
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postrm 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.postrm 2006-11-02 07:44:40 UTC (rev 1871)
@@ -12,7 +12,7 @@
}
if [ "$1" = "remove" ]; then
- opt=OPT
+ opt=LIBC-FLAVOR
curver=CURRENT_VER
if [ -f /etc/ld.so.hwcappkgs ]; then
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.preinst
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.preinst 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc-otherbuild.preinst 2006-11-02 07:44:40 UTC (rev 1871)
@@ -3,7 +3,7 @@
set -e
if [ "$1" != abort-upgrade ]; then
- opt=OPT
+ opt=LIBC-FLAVOR
touch /etc/ld.so.nohwcap
echo $opt >> /etc/ld.so.nohwcap
fi
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.dirs
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.dirs 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.dirs 2006-11-02 07:44:40 UTC (rev 1871)
@@ -1,3 +1,2 @@
-sys
etc/init.d
etc/ld.so.conf.d
Added: glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.lintian
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.lintian 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/libc.lintian 2006-11-02 07:44:40 UTC (rev 1871)
@@ -0,0 +1,18 @@
+# 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.5.so
+
+# ld.so must be executable, otherwise the system will not work
+LIBC: shlib-with-executable-bit lib/ld-2.5.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.5.so
Modified: glibc-package/branches/glibc-2.5/debian/debhelper.in/nscd.init
===================================================================
--- glibc-package/branches/glibc-2.5/debian/debhelper.in/nscd.init 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/debhelper.in/nscd.init 2006-11-02 07:44:40 UTC (rev 1871)
@@ -1,4 +1,13 @@
#!/bin/sh
+### BEGIN INIT INFO
+# Provides: nscd
+# Required-Start: $local_fs
+# Required-Stop: $local_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Starts the Name Service Cache Daemon
+### END INIT INFO
+
#
# nscd: Starts the Name Service Cache Daemon
#
@@ -9,7 +18,6 @@
# Sanity checks.
-
NAME="nscd"
DESC="Name Service Cache Daemon"
DAEMON="/usr/sbin/nscd"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/catchsegv.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/catchsegv.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/catchsegv.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -88,7 +88,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/gencat.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/gencat.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/gencat.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -100,7 +100,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/getconf.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/getconf.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/getconf.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -88,7 +88,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/getent.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/getent.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/getent.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -88,7 +88,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/iconv.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/iconv.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/iconv.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -93,7 +93,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/iconvconfig.8
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/iconvconfig.8 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/iconvconfig.8 2006-11-02 07:44:40 UTC (rev 1871)
@@ -100,7 +100,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/mtrace.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/mtrace.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/mtrace.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -100,7 +100,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/rpcgen.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/rpcgen.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/rpcgen.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -213,7 +213,7 @@
.TP
\f4\-b\f1
This generates code for the SunOS4.1 style of rpc. It is
-for backward compatibilty. This is the default.
+for backward compatibility. This is the default.
.TP
\f4\-5\f1
This generates code for the SysVr4 style of rpc. It is used by the
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/sprof.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/sprof.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/sprof.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -88,7 +88,7 @@
.\" Ip Item
.\" X<> Xref (embedded
.\" Of course, you have to process the output yourself
-.\" in some meaninful fashion.
+.\" in some meaningful fashion.
.if \nF \{
.de IX
.tm Index:\\$1\t\\n%\t"\\$2"
Modified: glibc-package/branches/glibc-2.5/debian/local/manpages/tzselect.1
===================================================================
--- glibc-package/branches/glibc-2.5/debian/local/manpages/tzselect.1 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/local/manpages/tzselect.1 2006-11-02 07:44:40 UTC (rev 1871)
@@ -46,7 +46,7 @@
.B Ctrl-C
to interrupt the script at any time.
-Nothe that
+Note that
.B tzselect
will not actually change the timezone for you. Use the
.BR tzconfig (8)
Modified: glibc-package/branches/glibc-2.5/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/rules.d/build.mk 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/rules.d/build.mk 2006-11-02 07:44:40 UTC (rev 1871)
@@ -125,7 +125,7 @@
fi
# Remove ld.so from optimized libraries
- if [ $(curpass) != libc ] && [ $(call xx,configure_build) = $(call xx,configure_target) ]; then \
+ if echo $(call xx,slibdir) | grep -q "/lib/.\+" ; then \
rm -f debian/tmp-$(curpass)/$(call xx,slibdir)/ld*.so* ; \
fi
Modified: glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk 2006-10-25 10:13:24 UTC (rev 1870)
+++ glibc-package/branches/glibc-2.5/debian/rules.d/debhelper.mk 2006-11-02 07:44:40 UTC (rev 1871)
@@ -122,6 +122,18 @@
-exec chmod a+x '{}' ';'
dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
+ 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
+
+ if [ -f debian/$(curpass).linda ] ; then \
+ install -d -m 755 -o root -g root debian/$(curpass)/usr/share/linda/overrides/ ; \
+ install -m 644 -o root -g root debian/$(curpass).linda \
+ debian/$(curpass)/usr/share/linda/overrides/$(curpass) ; \
+ fi
+
dh_installdeb -p$(curpass)
# dh_shlibdeps -p$(curpass)
dh_gencontrol -p$(curpass) -- $($(curpass)_control_flags)
@@ -174,7 +186,6 @@
y=debian/`basename $$x`; \
z=`echo $$y | sed -e 's#/libc#/$(libc)#'`; \
cp $$x $$z; \
- sed -e "s#TMPDIR#debian/tmp-libc#" -i $$z; \
sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#" -i $$z; \
sed -e "s#LIBC#$(libc)#" -i $$z; \
sed -e "s#CURRENT_VER#$(DEB_VERSION)#" -i $$z; \
@@ -208,39 +219,24 @@
for x in $(OPT_PASSES); do \
slibdir=$$1; \
shift; \
- z=debian/$(libc)-$$x.install; \
case $$slibdir in \
/lib32 | /lib64 | /emul/ia32-linux/lib) \
+ suffix="alt"; \
libdir=$$1; \
shift; \
- cp debian/debhelper.in/libc-alt.install $$z; \
- zd=debian/$(libc)-dev-$$x.install; \
- cp debian/debhelper.in/libc-alt-dev.install $$zd; \
- sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$zd; \
- sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#g" -i $$zd; \
- sed -e "s#LIBC#$(libc)#" -i $$z; \
- sed -e "s#LIBDIR#$$libdir#g" -i $$zd; \
- sed -e "s/^#.*//g" -i $$zd; \
;; \
*) \
- cp debian/debhelper.in/libc-otherbuild.install $$z; \
- cp debian/debhelper.in/libc-otherbuild.preinst debian/$(libc)-$$x.preinst ; \
- cp debian/debhelper.in/libc-otherbuild.postinst debian/$(libc)-$$x.postinst ; \
- cp debian/debhelper.in/libc-otherbuild.postrm debian/$(libc)-$$x.postrm ; \
- sed -e "s#OPT#$(libc)-$$x#g" -i debian/$(libc)-$$x.preinst; \
- sed -e "s#OPT#$(libc)-$$x#g" -i debian/$(libc)-$$x.postinst; \
- sed -e "s#OPT#$(libc)-$$x#g" -i debian/$(libc)-$$x.postrm; \
- sed -e "s#CURRENT_VER#$(DEB_VERSION)#g" -i debian/$(libc)-$$x.postinst; \
- sed -e "s#CURRENT_VER#$(DEB_VERSION)#g" -i debian/$(libc)-$$x.postrm; \
+ suffix="otherbuild"; \
;; \
esac; \
- sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$z; \
- sed -e "s#DEB_SRCDIR#$(DEB_SRCDIR)#g" -i $$z; \
- sed -e "s#SLIBDIR#$$slibdir#g" -i $$z; \
- sed -e "s#LIBDIR#$$libdir#g" -i $$z; \
- sed -e "s#FLAVOR#$$x#g" -i $$z; \
- sed -e "s#LIBC#$(libc)#g" -i $$z; \
- sed -e "s/^#.*//" -i $$z; \
+ for y in debian/$(libc)*-$$suffix.* ; do \
+ z=`echo $$y | sed -e "s/$$suffix/$$x/"` ; \
+ cp $$y $$z ; \
+ sed -e "s#TMPDIR#debian/tmp-$$x#g" -i $$z; \
+ sed -e "s#SLIBDIR#$$slibdir#g" -i $$z; \
+ sed -e "s#LIBDIR#$$libdir#g" -i $$z; \
+ sed -e "s#FLAVOR#$$x#g" -i $$z; \
+ done ; \
done
# Substitute __SUPPORTED_LOCALES__.
@@ -277,5 +273,7 @@
rm -f debian/*.docs
rm -f debian/*.doc-base
rm -f debian/*.generated
+ rm -f debian/*.lintian
+ rm -f debian/*.linda
rm -f $(stamp)binaryinst*
Reply to: