[glibc] 01/01: Drop libnss-dns-udeb and libnss-files-udeb and merge the files they include in libc6-udeb.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit a1319a909a197712e822ce6af2f460dcb2455f71
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon Mar 28 13:52:25 2016 +0200
Drop libnss-dns-udeb and libnss-files-udeb and merge the files they include in libc6-udeb.
---
debian/changelog | 4 +++
debian/control | 36 +++------------------------
debian/control.in/libc | 2 +-
debian/control.in/libnss-dns-udeb | 14 -----------
debian/control.in/libnss-files-udeb | 14 -----------
debian/debhelper.in/libc-udeb.install | 3 ++-
debian/debhelper.in/libnss-dns-udeb.install | 3 ---
debian/debhelper.in/libnss-files-udeb.install | 3 ---
debian/rules | 2 +-
debian/rules.d/control.mk | 2 --
debian/rules.d/debhelper.mk | 2 +-
debian/shlibs-add-udebs | 11 ++------
12 files changed, 15 insertions(+), 81 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 75701ca..5300c36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ glibc (2.22-5) UNRELEASED; urgency=medium
[ Samuel Thibault ]
* testsuite-xfail-debian.mk: Disable the problematic test-lfs test on hurd.
+ [ Aurelien Jarno ]
+ * Drop libnss-dns-udeb and libnss-files-udeb and merge the files they
+ include in libc6-udeb.
+
-- Aurelien Jarno <aurel32@debian.org> Mon, 21 Mar 2016 18:45:40 +0100
glibc (2.22-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 30abd77..05cbe9c 100644
--- a/debian/control
+++ b/debian/control
@@ -234,7 +234,7 @@ Package-Type: udeb
Architecture: amd64 arm64 armel armhf hppa i386 m68k mips mipsel mipsn32 mipsn32el mips64 mips64el nios2 powerpc powerpcspe ppc64 ppc64el sparc sparc64 s390x sh4 x32
Section: debian-installer
Priority: extra
-Provides: libc6, libc-udeb, ${locale-compat:Depends}
+Provides: libc6, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
@@ -320,7 +320,7 @@ Package-Type: udeb
Architecture: alpha
Section: debian-installer
Priority: extra
-Provides: libc6.1, libc-udeb, ${locale-compat:Depends}
+Provides: libc6.1, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
@@ -406,7 +406,7 @@ Package-Type: udeb
Architecture: hurd-i386
Section: debian-installer
Priority: extra
-Provides: libc0.3, libc-udeb, ${locale-compat:Depends}
+Provides: libc0.3, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
@@ -492,7 +492,7 @@ Package-Type: udeb
Architecture: kfreebsd-amd64 kfreebsd-i386
Section: debian-installer
Priority: extra
-Provides: libc0.1, libc-udeb, ${locale-compat:Depends}
+Provides: libc0.1, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
@@ -886,31 +886,3 @@ Description: GNU C Library: Shared libraries (EV67 optimized)
needs to be installed on Alpha EV67/68 and EV7 machines. If you install
this on an older machine, it won't even be used.
-Package: libnss-dns-udeb
-Package-Type: udeb
-Architecture: any
-Section: debian-installer
-Priority: extra
-Build-Profiles: <!stage1>
-Description: GNU C Library: NSS helper for DNS - 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 the DNS NSS helper needed for the Debian installer.
- Do not install it on a normal system.
-
-Package: libnss-files-udeb
-Package-Type: udeb
-Architecture: any
-Section: debian-installer
-Priority: extra
-Build-Profiles: <!stage1>
-Description: GNU C Library: NSS helper for files - 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 the files NSS helper needed for the Debian installer.
- Do not install it on a normal system.
-
diff --git a/debian/control.in/libc b/debian/control.in/libc
index 510b53f..59714c5 100644
--- a/debian/control.in/libc
+++ b/debian/control.in/libc
@@ -74,7 +74,7 @@ Package-Type: udeb
Architecture: @archs@
Section: debian-installer
Priority: extra
-Provides: @libc@, libc-udeb, ${locale-compat:Depends}
+Provides: @libc@, libc-udeb, libnss-dns-udeb, libnss-files-udeb, ${locale-compat:Depends}
Build-Profiles: <!stage1>
Description: GNU C Library: Shared libraries - udeb
Contains the standard libraries that are used by nearly all programs on
diff --git a/debian/control.in/libnss-dns-udeb b/debian/control.in/libnss-dns-udeb
deleted file mode 100644
index 827e276..0000000
--- a/debian/control.in/libnss-dns-udeb
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: libnss-dns-udeb
-Package-Type: udeb
-Architecture: any
-Section: debian-installer
-Priority: extra
-Build-Profiles: <!stage1>
-Description: GNU C Library: NSS helper for DNS - 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 the DNS NSS helper needed for the Debian installer.
- Do not install it on a normal system.
-
diff --git a/debian/control.in/libnss-files-udeb b/debian/control.in/libnss-files-udeb
deleted file mode 100644
index be43dfb..0000000
--- a/debian/control.in/libnss-files-udeb
+++ /dev/null
@@ -1,14 +0,0 @@
-Package: libnss-files-udeb
-Package-Type: udeb
-Architecture: any
-Section: debian-installer
-Priority: extra
-Build-Profiles: <!stage1>
-Description: GNU C Library: NSS helper for files - 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 the files NSS helper needed for the Debian installer.
- Do not install it on a normal system.
-
diff --git a/debian/debhelper.in/libc-udeb.install b/debian/debhelper.in/libc-udeb.install
index 070c608..a333dde 100644
--- a/debian/debhelper.in/libc-udeb.install
+++ b/debian/debhelper.in/libc-udeb.install
@@ -12,4 +12,5 @@ TMPDIR/SLIBDIR/libutil* lib
TMPDIR/SLIBDIR/libcrypt* lib
TMPDIR/SLIBDIR/librt*.so* lib
TMPDIR/SLIBDIR/libpthread*.so* lib
-
+TMPDIR/SLIBDIR/libnss_dns*.so* lib
+TMPDIR/SLIBDIR/libnss_files*.so* lib
diff --git a/debian/debhelper.in/libnss-dns-udeb.install b/debian/debhelper.in/libnss-dns-udeb.install
deleted file mode 100644
index 40c5d4a..0000000
--- a/debian/debhelper.in/libnss-dns-udeb.install
+++ /dev/null
@@ -1,3 +0,0 @@
-# FIXME: someday we may need to handle installing into non-lib.
-TMPDIR/SLIBDIR/libnss_dns*.so* lib
-
diff --git a/debian/debhelper.in/libnss-files-udeb.install b/debian/debhelper.in/libnss-files-udeb.install
deleted file mode 100644
index 4a5b580..0000000
--- a/debian/debhelper.in/libnss-files-udeb.install
+++ /dev/null
@@ -1,3 +0,0 @@
-# FIXME: someday we may need to handle installing into non-lib.
-TMPDIR/SLIBDIR/libnss_files*.so* lib
-
diff --git a/debian/rules b/debian/rules
index 0f6473e..9021c77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -152,7 +152,7 @@ ifneq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
else
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-pic libc-bin libc-dev-bin multiarch-support
DEB_INDEP_REGULAR_PACKAGES = glibc-doc glibc-source libc-l10n locales
- DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
+ DEB_UDEB_PACKAGES = $(libc)-udeb
## Locales can only be pre-generated during native compiles
ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
DEB_ARCH_REGULAR_PACKAGES += locales-all
diff --git a/debian/rules.d/control.mk b/debian/rules.d/control.mk
index 805a54a..412192f 100644
--- a/debian/rules.d/control.mk
+++ b/debian/rules.d/control.mk
@@ -40,8 +40,6 @@ $(stamp)control: debian/rules.d/control.mk $(control_deps)
cat debian/control.in/kfreebsd-i386 >> $@T
cat debian/control.in/x32 >> $@T
cat debian/control.in/opt >> $@T
- cat debian/control.in/libnss-dns-udeb >> $@T
- cat debian/control.in/libnss-files-udeb >> $@T
sed -e 's%@libc@%$(libc)%g' -e 's%@GLIBC_VERSION@%$(GLIBC_VERSION)%g' < $@T > debian/control
rm $@T
touch $@
diff --git a/debian/rules.d/debhelper.mk b/debian/rules.d/debhelper.mk
index 6fe4ec5..fb1d0d7 100644
--- a/debian/rules.d/debhelper.mk
+++ b/debian/rules.d/debhelper.mk
@@ -206,7 +206,7 @@ $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_%
rtld_so=`LANG=C LC_ALL=C readelf -l debian/tmp-$$curpass/usr/bin/iconv | grep "interpreter" | sed -e 's/.*interpreter: \(.*\)]/\1/g'`; \
case "$$curpass:$$slibdir" in \
libc:*) \
- templates="libc libc-dev libc-pic libc-udeb libnss-dns-udeb libnss-files-udeb" \
+ templates="libc libc-dev libc-pic libc-udeb" \
pass="" \
suffix="" \
;; \
diff --git a/debian/shlibs-add-udebs b/debian/shlibs-add-udebs
index d2bde0d..73328f8 100644
--- a/debian/shlibs-add-udebs
+++ b/debian/shlibs-add-udebs
@@ -37,16 +37,9 @@ W="[^[:space:]]*"
# in debian/debhelper.in; $W replaces any "*" wildcards there.
expr_libc1="ld$W libm-$W libm libdl$W libresolv$W libc-$W libc"
expr_libc2="libutil$W libcrypt$W librt$W libpthread$W libmvec$W"
+expr_libc3="libnss_dns$W libnss_files$W"
expr_hurd="libmachuser$W libhurduser$W"
-expr_nss_dns="libnss_dns$W"
-expr_nss_files="libnss_files$W"
-for expr in $expr_libc1 $expr_libc2 $expr_hurd; do
+for expr in $expr_libc1 $expr_libc2 $expr_libc3 $expr_hurd; do
add_udeb_line "$expr" $package-udeb
done
-for expr in $expr_nss_dns; do
- add_udeb_line "$expr" libnss-dns-udeb
-done
-for expr in $expr_nss_files; do
- add_udeb_line "$expr" libnss-files-udeb
-done
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: