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

[sf at alioth.debian.org]

Author: sf
Date: Fri Jul 16 18:08:00 2010
New Revision: 1201

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1201
Log:
fix debug info

Modified:
    trunk/apache2/apache2-dbg.links
    trunk/apache2/changelog
    trunk/apache2/rules

Modified: trunk/apache2/apache2-dbg.links
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/apache2-dbg.links?rev=1201&op=diff
==============================================================================
--- trunk/apache2/apache2-dbg.links (original)
+++ trunk/apache2/apache2-dbg.links Fri Jul 16 18:08:00 2010
@@ -1,4 +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
+usr/lib/debug/usr/lib/apache2/mpm-itk/apache2-mpm-itk		usr/lib/debug/usr/sbin/apache2-mpm-itk
+usr/lib/debug/usr/lib/apache2/mpm-prefork/apache2-mpm-prefork	usr/lib/debug/usr/sbin/apache2-mpm-prefork
+usr/lib/debug/usr/lib/apache2/mpm-worker/apache2-mpm-worker	usr/lib/debug/usr/sbin/apache2-mpm-worker
+usr/lib/debug/usr/lib/apache2/mpm-event/apache2-mpm-event	usr/lib/debug/usr/sbin/apache2-mpm-event

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1201&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Fri Jul 16 18:08:00 2010
@@ -3,6 +3,7 @@
   * Fix init script not correctly killing htcacheclean. Closes: #580971
   * Add a separate entry in README.Debian about the need to use apache2ctl
     for starting instead of calling apache2 directly. Closes: #580445
+  * Fix debug info to allow gdb loading it automatically. Closes: #581514
   * Build as PIE, since gdb in squeeze now supports it.
   * Update the postrm script to also purge the version of /var/www/index.html
     introduced in 2.2.11-7.

Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1201&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Fri Jul 16 18:08:00 2010
@@ -282,10 +282,13 @@
 	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 ;\
-			chmod 644 debian/apache2-dbg/usr/lib/debug/$$MPM ;\
-			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 debian/apache2.2-bin/$$MPM ;\
+			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