Re-introduce objcopy magic to avoid dangling symlinks to the debug info

in the mpm packages. Closes: #563278

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@1113 01b336ce-410b-0410-9a02-a0e7f243c266

5 files changed, 22 insertions, 3 deletions

diff --git a/debian/apache2-dbg.dirs b/debian/apache2-dbg.dirs
index e2245d01..f644dfc2 100644
--- a/debian/apache2-dbg.dirs
+++ b/debian/apache2-dbg.dirs
@@ -1 +1,5 @@
 usr/lib/debug/usr/sbin
+usr/lib/debug/usr/lib/apache2/mpm-worker
+usr/lib/debug/usr/lib/apache2/mpm-prefork
+usr/lib/debug/usr/lib/apache2/mpm-event
+usr/lib/debug/usr/lib/apache2/mpm-itk
diff --git a/debian/apache2-dbg.links b/debian/apache2-dbg.links
new file mode 100644
index 00000000..ecddbab5
--- /dev/null
+++ b/debian/apache2-dbg.links
@@ -0,0 +1,4 @@
+usr/lib/debug/usr/lib/apache2/mpm-itk/apache2		usr/lib/debug/usr/sbin/apache2-mpm-itk
+usr/lib/debug/usr/lib/apache2/mpm-prefork/apache2	usr/lib/debug/usr/sbin/apache2-mpm-prefork
+usr/lib/debug/usr/lib/apache2/mpm-worker/apache2	usr/lib/debug/usr/sbin/apache2-mpm-worker
+usr/lib/debug/usr/lib/apache2/mpm-event/apache2		usr/lib/debug/usr/sbin/apache2-mpm-event
diff --git a/debian/changelog b/debian/changelog
index 7c003922..b9fa9c2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ apache2 (2.2.14-5) UNRELEASED; urgency=low
   * Improve function to detect apache2 pid in init-script (closes: #562583).
   * Add hint README.Debian on how to pass auth info to CGI scripts.
     Closes: #483219
+  * Re-introduce objcopy magic to avoid dangling symlinks to the debug info
+    in the mpm packages. Closes: #563278
   * Point to README.backtrace in apache2-dbg's description.
   * Use more debhelper functions to simplify debian/rules.
   * Add misc-depends to various packages to make lintian happy.
diff --git a/debian/mpms.links b/debian/mpms.links
index cef047b0..26465380 100644
--- a/debian/mpms.links
+++ b/debian/mpms.links
@@ -1,3 +1,2 @@
 usr/lib/apache2/mpm-MPMXXX/apache2			usr/sbin/apache2
-usr/lib/debug/usr/lib/apache2/mpm-MPMXXX/apache2	usr/lib/debug/usr/sbin/apache2
 usr/share/bug/apache2.2-common/script			usr/share/bug/apache2-mpm-MPMXXX/script
diff --git a/debian/rules b/debian/rules
index 1c910449..21130274 100755
--- a/debian/rules
+++ b/debian/rules
@@ -261,7 +261,6 @@ install: build install-dev
 		find debian/$$pkg/ -name .svn -exec rm -rf {} + ; \
 	done
 
-	# common dh stuff
 	dh_installdocs debian/README.backtrace -papache2.2-common -papache2.2-bin
 	dh_installdocs debian/README.backtrace -Napache2.2-common -Napache2.2-bin
 	cp debian/README.Debian debian/apache2-doc/usr/share/doc/apache2-doc/
@@ -274,7 +273,18 @@ install: build install-dev
 	dh_lintian
 	rm -f debian/apache2.2-bin/usr/share/doc/apache2.2-bin/NEWS.Debian
 	rm -f debian/apache2-utils/usr/share/doc/apache2-utils/NEWS.Debian
-	dh_strip --dbg-package=apache2-dbg -Napache2-dbg;
+
+	dh_strip --dbg-package=apache2-dbg -Napache2-dbg -Xusr/lib/apache2/mpm
+	if [ "$(LSB_RELEASE)" != "Ubuntu" ] && [ -n "$(DEB_BUILD_STRIP)" ] ; then \
+		for i in worker prefork event itk; do \
+			MPM=usr/lib/apache2/mpm-$$i/apache2 ;\
+			objcopy --only-keep-debug $(BUILD)/$$i/apache2 debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i ;\
+			chmod 644 debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i ;\
+			strip --remove-section=.comment --remove-section=.note --strip-unneeded debian/apache2.2-bin/$$MPM ;\
+			objcopy --add-gnu-debuglink=debian/apache2-dbg/usr/lib/debug/$$MPM-mpm-$$i debian/apache2.2-bin/$$MPM ;\
+		done ;\
+	fi
+
 	cp debian/mpm-itk/README debian/apache2.2-common/usr/share/doc/apache2.2-common/README.mpm-itk
 	cp debian/mpm-itk/CHANGES debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk
 	cp debian/mpm-itk/debian/changelog debian/apache2.2-common/usr/share/doc/apache2.2-common/changelog.mpm-itk.Debian