Author: aurel32
Date: 2015-09-10 09:21:46 +0000 (Thu, 10 Sep 2015)
New Revision: 6552
Modified:
glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
Log:
Stop handling conflict between armel and armhf in libc6-dbg
Now that we have build-id based debug files, the conflict can't
happen anymore
Modified: glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
2015-09-10 09:19:26 UTC (rev 6551)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/debhelper.mk
2015-09-10 09:21:46 UTC (rev 6552)
@@ -79,18 +79,6 @@
dh_strip -p$(curpass) -Xlibpthread;
\
fi
\
fi
-
- # ARM archs always use multiarch locations, don't let libc6-dbg conflict
- if test "$(curpass)" = "$(libc)-dbg"; then
\
- if test "$(DEB_HOST_ARCH)" = "armel"; then
\
- rm -rf debian/$(curpass)/usr/lib/debug/lib/arm-linux-gnueabihf;
\
- rm -rf debian/$(curpass)/usr/lib/debug/usr/lib/arm-linux-gnueabihf;
\
- fi;
\
- if test "$(DEB_HOST_ARCH)" = "armhf"; then
\
- rm -rf debian/$(curpass)/usr/lib/debug/lib/arm-linux-gnueabi;
\
- rm -rf debian/$(curpass)/usr/lib/debug/usr/lib/arm-linux-gnueabi;
\
- fi;
\
- fi
endif
dh_compress -p$(curpass)
