tags 183139 patch tags 183143 patch thanks I attached a patch which fixes the bugs #183139 and #183143. Additional it adds a small package with libnss_dns which fixes a workaround in d-i to include that neccesary library. Bastian -- Those who hate and fight must stop themselves -- otherwise it is not stopped. -- Spock, "Day of the Dove", stardate unknown
? diff
? libnss-dns-udeb
? libnss-dns-udeb.install
Index: changelog
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/changelog,v
retrieving revision 1.398
diff -u -r1.398 changelog
--- changelog 17 Apr 2004 00:03:31 -0000 1.398
+++ changelog 17 Apr 2004 14:56:13 -0000
@@ -139,7 +139,14 @@
- Added and enabled a sparc v9b target (UltraSPARC III).
- -- Daniel Jacobowitz <dan@debian.org> Mon, 9 Feb 2004 14:05:18 -0500
+ * Bastian Blank <waldi@debian.org>
+
+ - Add libnss-dns-udeb package.
+ - Rename udebs to match the real packages. (closes: #183139)
+ - Fix provides of udebs. (closes: #183143)
+ - Use debhelper udeb knowledge.
+
+ -- Bastian Blank <waldi@debian.org> Sat, 17 Apr 2004 12:45:48 +0200
glibc (2.3.2.ds1-11) unstable; urgency=low
Index: control
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/control,v
retrieving revision 1.38
diff -u -r1.38 control
--- control 14 Apr 2004 12:27:28 -0000 1.38
+++ control 17 Apr 2004 14:56:13 -0000
@@ -106,6 +106,20 @@
boot floppies. If you are not making your own set of Debian boot floppies
using the `boot-floppies' package, you probably don't need this package.
+Package: libc6-udeb
+XC-Package-Type: udeb
+Architecture: arm i386 m68k mips mipsel powerpc sparc s390 hppa sh3 sh4 sh3eb sh4eb
+Section: debian-installer
+Priority: extra
+Provides: libc6, libc-udeb, ${locale:Depends}
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the debian
+ installer. Do not install it on a normal system.
+
Package: libc6.1
Architecture: alpha ia64
Section: base
@@ -163,6 +177,20 @@
boot floppies. If you are not making your own set of Debian boot floppies
using the `boot-floppies' package, you probably don't need this package.
+Package: libc6.1-udeb
+XC-Package-Type: udeb
+Architecture: alpha ia64
+Section: debian-installer
+Priority: extra
+Provides: libc6.1, libc-udeb, ${locale:Depends}
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the debian
+ installer. Do not install it on a normal system.
+
Package: libc0.3
Architecture: hurd-i386
Section: base
@@ -220,6 +248,20 @@
boot floppies. If you are not making your own set of Debian boot floppies
using the `boot-floppies' package, you probably don't need this package.
+Package: libc0.3-udeb
+XC-Package-Type: udeb
+Architecture: hurd-i386
+Section: debian-installer
+Priority: extra
+Provides: libc0.3, libc-udeb, ${locale:Depends}
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the debian
+ installer. Do not install it on a normal system.
+
Package: libc1
Architecture: freebsd-i386
Section: base
@@ -277,6 +319,20 @@
boot floppies. If you are not making your own set of Debian boot floppies
using the `boot-floppies' package, you probably don't need this package.
+Package: libc1-udeb
+XC-Package-Type: udeb
+Architecture: freebsd-i386
+Section: debian-installer
+Priority: extra
+Provides: libc1, libc-udeb, ${locale:Depends}
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the debian
+ installer. Do not install it on a normal system.
+
Package: libc6-sparc64
Architecture: sparc
Section: base
@@ -365,10 +421,10 @@
library and the standard math library, as well as many others.
.
This set of libraries is optimized for i686 machines, and will only be
- used if you are running a 2.6 kernel on an i686 class CPU (check the
- output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV,
- Celeron CPU's and similar class CPU's (including clones such as AMD
- Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
+ used if you are running a 2.6 kernel on an i686 class CPU (check the
+ output of `uname -m'). This includes Pentium Pro, Pentium II/III/IV,
+ Celeron CPU's and similar class CPU's (including clones such as AMD
+ Athlon/Opteron, VIA C3 Nehemiah, but not VIA C3 Ezla).
.
This package includes support for NPTL.
.
@@ -376,17 +432,16 @@
Most notably, IBM's JDK. If you experience problems with such
applications, you will need to remove this package.
-Package: libc-udeb
+Package: libnss-dns-udeb
+XC-Package-Type: udeb
Architecture: any
Section: debian-installer
-Priority: required
-Provides: ${locale:Depends}
-Description: GNU C Library: Shared libraries and Timezone data - udeb
+Priority: extra
+Description: GNU C Library: NSS helper for DNS
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
and the standard math library, as well as many others.
- Timezone data is also included.
.
- This package contains a minimal set of libraries needed for the debian
- installer. Do not install it on a normal system.
+ This package contains dns nss helper needed for the debian installer. Do not
+ install it on a normal system.
Index: rules
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/rules,v
retrieving revision 1.21
diff -u -r1.21 rules
--- rules 27 Jan 2004 03:30:39 -0000 1.21
+++ rules 17 Apr 2004 14:56:13 -0000
@@ -114,7 +114,7 @@
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic
DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales
-DEB_UDEB_PACKAGES = libc-udeb
+DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb
# Generic kernel version check
define kernel_check
Index: control.in/libc
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/control.in/libc,v
retrieving revision 1.8
diff -u -r1.8 libc
--- control.in/libc 3 Nov 2003 17:38:59 -0000 1.8
+++ control.in/libc 17 Apr 2004 14:56:13 -0000
@@ -55,3 +55,17 @@
boot floppies. If you are not making your own set of Debian boot floppies
using the `boot-floppies' package, you probably don't need this package.
+Package: @libc@-udeb
+XC-Package-Type: udeb
+Architecture: @archs@
+Section: debian-installer
+Priority: extra
+Provides: @libc@, libc-udeb, ${locale:Depends}
+Description: GNU C Library: Shared libraries - udeb
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains a minimal set of libraries needed for the debian
+ installer. Do not install it on a normal system.
+
Index: control.in/libc-udeb
===================================================================
RCS file: control.in/libc-udeb
diff -N control.in/libc-udeb
--- control.in/libc-udeb 28 Oct 2003 22:56:54 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Package: libc-udeb
-Architecture: any
-Section: debian-installer
-Priority: required
-Provides: ${locale:Depends}
-Description: GNU C Library: Shared libraries and Timezone data - udeb
- Contains the standard libraries that are used by nearly all programs on
- the system. This package includes shared versions of the standard C library
- and the standard math library, as well as many others.
- Timezone data is also included.
- .
- This package contains a minimal set of libraries needed for the debian
- installer. Do not install it on a normal system.
-
Index: control.in/libnss-dns-udeb
===================================================================
RCS file: control.in/libnss-dns-udeb
diff -N control.in/libnss-dns-udeb
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ control.in/libnss-dns-udeb 17 Apr 2004 14:56:13 -0000
@@ -0,0 +1,13 @@
+Package: libnss-dns-udeb
+XC-Package-Type: udeb
+Architecture: any
+Section: debian-installer
+Priority: extra
+Description: GNU C Library: NSS helper for DNS
+ Contains the standard libraries that are used by nearly all programs on
+ the system. This package includes shared versions of the standard C library
+ and the standard math library, as well as many others.
+ .
+ This package contains dns nss helper needed for the debian installer. Do not
+ install it on a normal system.
+
Index: debhelper.in/libnss-dns-udeb.install
===================================================================
RCS file: debhelper.in/libnss-dns-udeb.install
diff -N debhelper.in/libnss-dns-udeb.install
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ debhelper.in/libnss-dns-udeb.install 17 Apr 2004 14:56:13 -0000
@@ -0,0 +1,3 @@
+# FIXME: someday we may need to handle installing into non-lib.
+debian/tmp-libc/lib/libnss_dns*.so* lib
+
Index: rules.d/control.mk
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/rules.d/control.mk,v
retrieving revision 1.9
diff -u -r1.9 control.mk
--- rules.d/control.mk 28 Oct 2003 22:56:56 -0000 1.9
+++ rules.d/control.mk 17 Apr 2004 14:56:13 -0000
@@ -25,7 +25,7 @@
cat debian/control.in/sparc64 >> $@T
cat debian/control.in/s390x >> $@T
cat debian/control.in/opt >> $@T
- cat debian/control.in/libc-udeb >> $@T
+ cat debian/control.in/libnss-dns-udeb >> $@T
sed -e 's%@libc@%$(libc)%g;s%@glibc@%glibc%g' \
-e 's%@threads_archs@%$(threads_archs)%g' < $@T > $@
rm $@T
Index: rules.d/debhelper.mk
===================================================================
RCS file: /cvs/glibc/glibc-package/debian/rules.d/debhelper.mk,v
retrieving revision 1.8
diff -u -r1.8 debhelper.mk
--- rules.d/debhelper.mk 9 Feb 2004 19:13:05 -0000 1.8
+++ rules.d/debhelper.mk 17 Apr 2004 14:56:13 -0000
@@ -117,7 +117,6 @@
touch $@
-# We may eventually want $(libc)-udeb instead of libc-udeb.
$(patsubst %,binaryinst_%,$(DEB_UDEB_PACKAGES)) :: binaryinst_% : $(stamp)binaryinst_%
$(patsubst %,$(stamp)binaryinst_%,$(DEB_UDEB_PACKAGES)): $(stamp)debhelper
@echo Running debhelper for $(curpass)
@@ -132,9 +131,8 @@
# dh_makeshlibs -p$(curpass) -V "$(call xx,shlib_dep)"
dh_installdeb -p$(curpass)
# dh_shlibdeps -p$(curpass)
- dh_gencontrol -p$(curpass) -- -fdebian/files~
- dpkg-distaddfile $(curpass)_$(DEB_VERSION)_$(DEB_BUILD_ARCH).udeb debian-installer required
- dh_builddeb -p$(curpass) --filename=$(curpass)_$(DEB_VERSION)_$(DEB_BUILD_ARCH).udeb
+ dh_gencontrol -p$(curpass)
+ dh_builddeb -p$(curpass)
touch $@
@@ -154,14 +152,9 @@
debhelper: $(stamp)debhelper
$(stamp)debhelper:
-# This little bit of fun works around the bug that libc-udeb is misnamed:
-# It doesn't have the version number attached to it. We'll piss off the
-# d-i folks *after* sarge has release by fixing this. In the mean time
-# we suck it up and deal.
-
for x in `find debian/debhelper.in -type f -maxdepth 1`; do \
y=debian/`basename $$x`; \
- z=`echo $$y | sed -e '/udeb/! s#/libc#/$(libc)#'`; \
+ 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; \
Attachment:
signature.asc
Description: Digital signature