[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r4581 - in glibc-package/branches/eglibc-2.13/debian: . control.in debhelper.in rules.d



Author: aurel32
Date: 2011-03-11 21:36:31 +0000 (Fri, 11 Mar 2011)
New Revision: 4581

Modified:
   glibc-package/branches/eglibc-2.13/debian/changelog
   glibc-package/branches/eglibc-2.13/debian/control.in/main
   glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install
   glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk
Log:
  [ Steve Langasek ]
  * Set Multi-Arch: foreign on the appropriate packages.
  * debian/rules.d/debhelper.mk: set $rtlddir in the debhelper substitution
    rules, so we don't substitute an empty string.
  * debian/debhelper.in/libc.install: ld is always installed relative to
    RTLDDIR, not SLIBDIR; a no-op for the moment, but relevant once we start
    building for multiarch.



Modified: glibc-package/branches/eglibc-2.13/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/changelog	2011-03-11 21:20:16 UTC (rev 4580)
+++ glibc-package/branches/eglibc-2.13/debian/changelog	2011-03-11 21:36:31 UTC (rev 4581)
@@ -147,6 +147,14 @@
   * Add patches/hurd-i386/local-add-needed.diff to fix getting functions from
     libmachuser and libhurduser with gold linking.
 
+  [ Steve Langasek ]
+  * Set Multi-Arch: foreign on the appropriate packages.
+  * debian/rules.d/debhelper.mk: set $rtlddir in the debhelper substitution
+    rules, so we don't substitute an empty string.
+  * debian/debhelper.in/libc.install: ld is always installed relative to
+    RTLDDIR, not SLIBDIR; a no-op for the moment, but relevant once we start
+    building for multiarch.
+
  -- Aurelien Jarno <aurel32@debian.org>  Mon, 28 Feb 2011 23:43:03 +0100
 
 eglibc (2.11.2-13) unstable; urgency=low

Modified: glibc-package/branches/eglibc-2.13/debian/control.in/main
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/control.in/main	2011-03-11 21:20:16 UTC (rev 4580)
+++ glibc-package/branches/eglibc-2.13/debian/control.in/main	2011-03-11 21:36:31 UTC (rev 4581)
@@ -20,6 +20,7 @@
 Architecture: any
 Section: libs
 Priority: required
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Breaks: libc0.1 (<< 2.10), libc0.3 (<< 2.10), libc6 (<< 2.10), libc6.1 (<< 2.10)
 Replaces: libc0.1, libc0.3, libc6, libc6.1
@@ -39,6 +40,7 @@
 Architecture: any
 Section: libdevel
 Priority: optional
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Recommends: manpages-dev
 Replaces: libc0.1-dev, libc0.3-dev, libc6-dev, libc6.1-dev
@@ -89,6 +91,7 @@
 Architecture: any
 Section: localization
 Priority: extra
+Multi-Arch: foreign
 Depends: ${locale:Depends}, ${misc:Depends}, lzma
 Provides: locales
 Description: Embedded GNU C Library: Precompiled locale data
@@ -100,6 +103,7 @@
 Package: nscd
 Architecture: any
 Section: admin
+Multi-Arch: foreign
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Embedded GNU C Library: Name Service Cache Daemon

Modified: glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install	2011-03-11 21:20:16 UTC (rev 4580)
+++ glibc-package/branches/eglibc-2.13/debian/debhelper.in/libc.install	2011-03-11 21:36:31 UTC (rev 4581)
@@ -1,3 +1,4 @@
+TMPDIR/RTLDDIR/*.so* RTLDDIR
 TMPDIR/SLIBDIR/*.so* SLIBDIR
 TMPDIR/LIBDIR/gconv/* LIBDIR/gconv
 

Modified: glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk	2011-03-11 21:20:16 UTC (rev 4580)
+++ glibc-package/branches/eglibc-2.13/debian/rules.d/debhelper.mk	2011-03-11 21:36:31 UTC (rev 4581)
@@ -182,6 +182,7 @@
 $(stamp)debhelper_%: $(stamp)debhelper-common $(stamp)install_%
 	libdir=$(call xx,libdir) ; \
 	slibdir=$(call xx,slibdir) ; \
+	rtlddir=$(call xx,rtlddir) ; \
 	curpass=$(curpass) ; \
 	c_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libc\.so\."` ; \
 	m_so=`ls debian/tmp-$$curpass/$$slibdir | grep "libm\.so\."` ; \


Reply to: