[Dh-make-php-commits] r349 - trunk

[Uwe Steinmann]

Author: steinm
Date: 2010-09-01 11:47:18 +0000 (Wed, 01 Sep 2010)
New Revision: 349

Modified:
   trunk/pear.mk
Log:
- get rid of the md5sum attributes in package.xml because it prevents
  from proper patching


Modified: trunk/pear.mk
===================================================================
--- trunk/pear.mk	2010-09-01 11:46:14 UTC (rev 348)
+++ trunk/pear.mk	2010-09-01 11:47:18 UTC (rev 349)
@@ -44,7 +44,9 @@
 PEAR_NEW_TEST_DIR = $(PEAR_NEW_DOC_DIR)/tests
 
 common-configure-indep::
-	ln -f -s ../package.xml $(PEAR_SOURCE_DIR)
+	# ln -f -s ../package.xml $(PEAR_SOURCE_DIR)
+	#remove md5sums to allow patching
+	cat package.xml | sed -e 's/md5sum="[^"]*"//' > $(PEAR_SOURCE_DIR)/package.xml
 
 clean::
 	-rm -f $(PEAR_PKG)-*/package.xml
@@ -64,7 +66,7 @@
 
 	# move documentation to correct location
 	mkdir -p $(DEB_DESTDIR)$(PEAR_NEW_DOC_DIR)
-	cp package.xml $(DEB_DESTDIR)$(PEAR_NEW_DOC_DIR)
+	cp $(PEAR_SOURCE_DIR)/package.xml $(DEB_DESTDIR)$(PEAR_NEW_DOC_DIR)
 	if [ -d $(DEB_DESTDIR)$(PEAR_OLD_DOC_DIR) ] ; then \
 		mv -i $(DEB_DESTDIR)$(PEAR_OLD_DOC_DIR)/* $(DEB_DESTDIR)$(PEAR_NEW_DOC_DIR); \
 		rmdir $(DEB_DESTDIR)$(PEAR_OLD_DOC_DIR); \