r2877 - in glibc-package/trunk/debian: . control.in rules.d
Author: aurel32
Date: 2008-03-18 19:52:43 +0000 (Tue, 18 Mar 2008)
New Revision: 2877
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/rules.d/control.mk
Log:
* control.in/main, rules.d/control.mk: remove @threads_arches@, as all
architectures now support threads.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2008-03-18 15:28:05 UTC (rev 2876)
+++ glibc-package/trunk/debian/changelog 2008-03-18 19:52:43 UTC (rev 2877)
@@ -33,6 +33,8 @@
* Replace any/submitted-gcc-4.3.diff by any/cvs-gcc-4.3.diff.
* debhelper.in/libc.preinst, debhelper.in/libc.postinst: remove support for
upgrade from Potato, and misc fixes.
+ * control.in/main, rules.d/control.mk: remove @threads_arches@, as all
+ architectures now support threads.
[ Samuel Thibault ]
* patches/hurd-i386/cvs-blocked-exceptions.diff: new patch to dump
@@ -44,7 +46,7 @@
* patches/hurd-i386/submitted-mig-init.diff: new patch to fix uninitialized
local variables.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 16 Mar 2008 16:52:46 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 18 Mar 2008 20:51:55 +0100
glibc (2.7-9) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2008-03-18 15:28:05 UTC (rev 2876)
+++ glibc-package/trunk/debian/control 2008-03-18 19:52:43 UTC (rev 2877)
@@ -55,7 +55,7 @@
locale files take a lot of memory to be compiled.
Package: nscd
-Architecture: alpha amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
+Architecture: any
Section: admin
Priority: optional
Depends: ${shlibs:Depends}
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2008-03-18 15:28:05 UTC (rev 2876)
+++ glibc-package/trunk/debian/control.in/main 2008-03-18 19:52:43 UTC (rev 2877)
@@ -55,7 +55,7 @@
locale files take a lot of memory to be compiled.
Package: nscd
-Architecture: @threads_archs@
+Architecture: any
Section: admin
Priority: optional
Depends: ${shlibs:Depends}
Modified: glibc-package/trunk/debian/rules.d/control.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/control.mk 2008-03-18 15:28:05 UTC (rev 2876)
+++ glibc-package/trunk/debian/rules.d/control.mk 2008-03-18 19:52:43 UTC (rev 2877)
@@ -1,7 +1,5 @@
control_deps := $(addprefix debian/control.in/, libc6 libc6.1 libc0.1 libc0.3 sparc64 s390x powerpc ppc64 opt amd64 mipsn32 mips64)
-threads_archs := alpha amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
-
debian/control.in/libc6: debian/control.in/libc debian/rules.d/control.mk
sed -e 's%@libc@%libc6%g' \
-e 's%@archs@%amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb%g' < $< > $@
@@ -41,7 +39,6 @@
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;s%@glibc@%glibc%g' \
- -e 's%@threads_archs@%$(threads_archs)%g' < $@T > debian/control
+ sed -e 's%@libc@%$(libc)%g;s%@glibc@%glibc%g' < $@T > debian/control
rm $@T
touch $@
Reply to: