[Pkg-apache-commits] r1121 - in /trunk/apache2: changelog rules

[sf at alioth.debian.org]

Author: sf
Date: Wed Jan 27 20:41:35 2010
New Revision: 1121

URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=1121
Log:
Fix symlinks in apache2-dbg package

Modified:
    trunk/apache2/changelog
    trunk/apache2/rules

Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=1121&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Wed Jan 27 20:41:35 2010
@@ -1,6 +1,7 @@
 apache2 (2.2.14-6) UNRELEASED; urgency=low
 
   * Move ab and logresolve from /usr/sbin to /usr/bin. Closes: #351450, #564061
+  * Fix symlinks in apache2-dbg package. Closes: #567076
   * Add new init script action graceful-stop (LP: #456381)
   * Make bug script also display php extensions.
 

Modified: trunk/apache2/rules
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/rules?rev=1121&op=diff
==============================================================================
--- trunk/apache2/rules (original)
+++ trunk/apache2/rules Wed Jan 27 20:41:35 2010
@@ -281,10 +281,10 @@
 	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 ;\
+			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-mpm-$$i debian/apache2.2-bin/$$MPM ;\
+			objcopy --add-gnu-debuglink=debian/apache2-dbg/usr/lib/debug/$$MPM debian/apache2.2-bin/$$MPM ;\
 		done ;\
 	fi