[Pkg-apache-commits] r1113 - in /trunk/apache2: apache2-dbg.dirs apache2-dbg.links changelog mpms.links rules

[sf at alioth.debian.org]

Author: sf
Date: Sat Jan  2 20:24:28 2010
New Revision: 1113

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1113
Log:
Re-introduce objcopy magic to avoid dangling symlinks to the debug info
in the mpm packages. Closes: #563278

Added:
    trunk/apache2/apache2-dbg.links
Modified:
    trunk/apache2/apache2-dbg.dirs
    trunk/apache2/changelog
    trunk/apache2/mpms.links
    trunk/apache2/rules

Modified: trunk/apache2/apache2-dbg.dirs
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2-dbg.dirs?rev=1113&op=diff
==============================================================================
--- trunk/apache2/apache2-dbg.dirs (original)
+++ trunk/apache2/apache2-dbg.dirs Sat Jan  2 20:24:28 2010
@@ -1,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

Added: trunk/apache2/apache2-dbg.links
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2-dbg.links?rev=1113&op=file
==============================================================================
--- trunk/apache2/apache2-dbg.links (added)
+++ trunk/apache2/apache2-dbg.links Sat Jan  2 20:24:28 2010
@@ -1,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

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1113&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sat Jan  2 20:24:28 2010
@@ -6,6 +6,8 @@
   * 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.

Modified: trunk/apache2/mpms.links
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/mpms.links?rev=1113&op=diff
==============================================================================
--- trunk/apache2/mpms.links (original)
+++ trunk/apache2/mpms.links Sat Jan  2 20:24:28 2010
@@ -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

Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1113&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Sat Jan  2 20:24:28 2010
@@ -261,7 +261,6 @@
 		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 @@
 	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