distmaker - Fix the *.info filter and apply it to all Drupal builds

diff --git a/distmaker/dists/common.sh b/distmaker/dists/common.sh
index 8451f65a1637323d604408d122443bbdc8ca1f20..cbd35024842f20ce47dc846d5b6996013e63aa09 100644 (file)
--- a/distmaker/dists/common.sh
+++ b/distmaker/dists/common.sh
@@ -100,12 +100,6 @@ function dm_install_drupal() {
   local repo="$1"
   local to="$2"
   dm_install_dir "$repo" "$to"
-}
-
-## TODO: Merge this into dm_install_drupal; use on all Drupal releases
-## usage: dm_install_drupal_info <to_path>
-function dm_install_drupal_info() {
-  local to="$1"
 
   # set full version in .info files
   local MODULE_DIRS=`find "$to" -type f -name "*.info"`

diff --git a/distmaker/dists/drupal_php5.sh b/distmaker/dists/drupal_php5.sh
index 581eae32063be0f08e94d4c051e2859a39eeed31..b8b5e9ec8a3d525ba77046547c6a65a28a17ec48 100755 (executable)
--- a/distmaker/dists/drupal_php5.sh
+++ b/distmaker/dists/drupal_php5.sh
@@ -21,7 +21,6 @@ dm_generate_version "$TRG/civicrm-version.php" Drupal
 dm_install_core "$SRC" "$TRG"
 dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
-dm_install_drupal_info "$DM_SOURCEDIR/drupal"
 
 # gen tarball
 cd $TRG/..