r1211 - in glibc-package/trunk/debian: . rules.d sysdeps
Author: aurel32
Date: 2006-02-22 19:08:01 +0000 (Wed, 22 Feb 2006)
New Revision: 1211
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/debhelper.mk
glibc-package/trunk/debian/sysdeps/amd64.mk
Log:
* Add support for extra_pkg_install hooks for udeb packages.
* Add a symlink /lib64 -> /lib in libc6-udeb on amd64.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-02-22 16:12:19 UTC (rev 1210)
+++ glibc-package/trunk/debian/changelog 2006-02-22 19:08:01 UTC (rev 1211)
@@ -82,6 +82,8 @@
* Fix glibc235-hppa-lt.diff (restore ret0 across calls to CDISABLE)
from Randolph Chung. (Closes: #326581)
* Switch to gcc-4.0 on hppa.
+ * Add support for extra_pkg_install hooks for udeb packages.
+ * Add a symlink /lib64 -> /lib in libc6-udeb on amd64.
-- Clint Adams <schizo@debian.org> Sun, 12 Feb 2006 11:04:38 -0500
Modified: glibc-package/trunk/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-22 16:12:19 UTC (rev 1210)
+++ glibc-package/trunk/debian/rules.d/debhelper.mk 2006-02-22 19:08:01 UTC (rev 1211)
@@ -139,6 +139,10 @@
dh_installdirs -p$(curpass)
dh_install -p$(curpass)
dh_strip -p$(curpass)
+
+ # when you want to install extra packages, use extra_pkg_install.
+ $(call xx,extra_pkg_install)
+
dh_compress -p$(curpass)
dh_fixperms -p$(curpass)
find debian/$(curpass) -type f \( -regex '.*lib.*/ld.*so.*' \
Modified: glibc-package/trunk/debian/sysdeps/amd64.mk
===================================================================
--- glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-22 16:12:19 UTC (rev 1210)
+++ glibc-package/trunk/debian/sysdeps/amd64.mk 2006-02-22 19:08:01 UTC (rev 1211)
@@ -9,6 +9,9 @@
ln -sf /lib debian/$(curpass)/lib64
ln -sf lib debian/$(curpass)/usr/lib64
endef
+define libc6-udeb_extra_pkg_install
+ln -sf /lib debian/$(curpass)/lib64
+endef
define libc_extra_install
mv debian/tmp-libc/lib64 debian/tmp-libc/lib
Reply to: