From cba38a59f34a894899863ba8042013263429e7bb Mon Sep 17 00:00:00 2001 From: thewilkybarkid <chriswilkinson84@gmail.com> Date: Tue, 2 Sep 2014 14:52:55 +0100 Subject: [PATCH] Don't put patched modules in a separate directory --- src/cambridge/cambridge.make | 8 -------- src/cambridge_base.make | 1 - 2 files changed, 9 deletions(-) diff --git a/src/cambridge/cambridge.make b/src/cambridge/cambridge.make index a17040f..f89011d 100644 --- a/src/cambridge/cambridge.make +++ b/src/cambridge/cambridge.make @@ -21,18 +21,15 @@ projects[entityreference] = "1.1" projects[environment_indicator] = "2.3" projects[expire] = "1.0-beta1" projects[fancybox][version] = "2.0-beta2" -projects[fancybox][subdir] = "patched" projects[fancybox][patch][] = "https://gist.github.com/thewilkybarkid/6550012/raw/27aa33685c0f484b6e1b9f63d61e98d73af9775b/fancybox_jquery.patch" libraries[fancybox][download][type] = "file" libraries[fancybox][download][url] = "https://github.com/fancyapps/fancyBox/archive/v2.1.5.tar.gz" projects[features_extra] = "1.0-beta1" projects[feeds] = "2.0-alpha8" projects[feeds_xpathparser][version] = "1.0-beta4" -projects[feeds_xpathparser][subdir] = "patched" projects[feeds_xpathparser][patch][] = "http://cgit.drupalcode.org/feeds_xpathparser/patch/?id=166cbdb" projects[feeds_xpathparser][patch][] = "http://cgit.drupalcode.org/feeds_xpathparser/patch/?id=11a0f79" projects[field_collection][version] = "1.0-beta7" -projects[field_collection][subdir] = "patched" projects[field_collection][patch][] = "http://cgit.drupalcode.org/field_collection/patch/?id=75cae85" projects[field_collection][patch][] = "http://cgit.drupalcode.org/field_collection/patch/?id=44bec68" projects[field_collection][patch][] = "http://cgit.drupalcode.org/field_collection/patch/?id=ae778f2" @@ -44,31 +41,26 @@ projects[job_scheduler] = "2.0-alpha3" projects[linkchecker] = "1.1" projects[media] = "1.4" projects[memcache][version] = "1.0" -projects[memcache][subdir] = "patched" projects[memcache][patch][] = "http://drupal.org/files/memcache-missing-extension-1470324-7.patch" projects[memcache][patch][] = "http://drupal.org/files/memcache-display-connection-error-1830496-6.patch" projects[menu_admin_per_menu] = "1.0" projects[menu_force] = "1.2" projects[menu_trail_by_path] = "2.0" projects[metatag][version] = "1.0-beta9" -projects[metatag][subdir] = "patched" projects[metatag][patch][] = "http://drupal.org/files/issues/2237507-5-metatag_revision_condition.patch" projects[nodequeue] = "2.0-beta1" projects[pathologic] = "2.12" projects[realname] = "1.2" projects[redirect][version] = "1.0-rc1" -projects[redirect][subdir] = "patched" projects[redirect][patch][] = "http://drupal.org/files/redirect-prevent_circular_redirects-1817976-42.patch" projects[rules] = "2.7" projects[scheduler] = "1.2" projects[smart_trim][version] = "1.4" -projects[smart_trim][subdir] = "patched" projects[smart_trim][patch][] = "http://drupal.org/files/issues/smart_trim_remove_punctuation_from_end_of_truncated_output-2169583-3.patch" projects[strongarm] = "2.0" projects[tac_lite] = "1.2" projects[transliteration] = "3.2" projects[varnish][version] = "1.0-beta2" -projects[varnish][subdir] = "patched" projects[varnish][patch][] = "https://gist.github.com/thewilkybarkid/6595645/raw/e53554206350c1b00316fcf02f2ff61c0bdfee36/varnish_watchdog_success.patch" projects[varnish][patch][] = "https://gist.github.com/thewilkybarkid/6595676/raw/4ddb6a03ce521ab5520e27099997650a2e390679/varnish_authentication_fix.patch" projects[varnish][patch][] = "https://gist.github.com/thewilkybarkid/6595681/raw/be6e7a25f20745d875d28030f6f4b10b82735089/varnish_site_alias.patch" diff --git a/src/cambridge_base.make b/src/cambridge_base.make index 9773178..8f9517d 100644 --- a/src/cambridge_base.make +++ b/src/cambridge_base.make @@ -16,7 +16,6 @@ projects[ctools] = "1.4" projects[features][version] = "2.0" projects[features][subdir] = "contrib" projects[imagecrop][version] = "1.0-rc3" -projects[imagecrop][subdir] = "patched" projects[imagecrop][patch][] = "https://gist.github.com/thewilkybarkid/6241365/raw/fccdba35efbd5ec106d8b92a8af98f71172e1870/imagecrop_query_string.patch" projects[imagecrop][patch][] = "https://gist.github.com/thewilkybarkid/6351355/raw/a34c91e4480aa7c4c0b79644e13aeeec914c1726/imagecrop_theme.patch" projects[libraries] = "2.2" -- GitLab