Commit 5800ebe69d04526ef5e4b63518a30d83f79d6879 - civicrm

+12

-0

debian/changelog less more

	0	civicrm (4.7.8+dfsg-1) unstable; urgency=medium
	1
	2	* New upstream release [June 2016].
	3	* Standards-Version: 3.9.8.
	4	* Corrected Vcs-Git URL.
	5	* Build-Depends:
	6	- php-gettext
	7	- php-mail-mimedecode
	8	+ libjs-jquery-datatables (>= 1.10.11~)
	9
	10	-- Dmitry Smirnov <onlyjob@debian.org> Sun, 05 Jun 2016 16:58:57 +1000
	11
0	12	civicrm (4.7.6+dfsg-1) unstable; urgency=medium
1	13
2	14	* New upstream release [April 2016].

+2

-2

debian/civicrm-common.linktrees less more

30	30	replace /usr/share/javascript/jquery/jquery.js /usr/share/civicrm/packages/jquery/plugins/DataTables/media/js/jquery.js
31	31	replace /usr/share/javascript/jquery/jquery.js /usr/share/civicrm/packages/kcfinder/js/000._jquery.js
32	32
33		## libjs-jquery-datatables (1.10.10 vs 1.10.11); noBPO
34		#replace /usr/share/javascript/jquery-datatables/ /usr/share/civicrm/bower_components/datatables
	33	## libjs-jquery-datatables (1.10.12 vs 1.10.12);
	34	replace /usr/share/javascript/jquery-datatables/ /usr/share/civicrm/bower_components/datatables
35	35
36	36	## libjs-jquery-form (10/3.0.9 vs 3.51)
37	37	replace /usr/share/javascript/jquery-form/jquery.form.js /usr/share/civicrm/packages/jquery/plugins/jquery.form.js

+1

-1

debian/control less more

9	9	,libjs-backbone
10	10	,libjs-d3
11	11	,libjs-jquery (>= 1.11.3~)
12		# ,libjs-jquery-datatables
	12	,libjs-jquery-datatables (>= 1.10.11~)
13	13	,libjs-jquery-form
14	14	,libjs-jquery-mousewheel
15	15	,libjs-jquery-ui (>= 1.10.1~)

+0

-3

debian/copyright less more

452	452	packages/PHP/Beautifier/*
453	453	packages/PHP/Beautifier.php
454	454	packages/PHP/php_beautifier
455		packages/XML/RPC.php
456		packages/XML/RPC/Dump.php
457		packages/XML/RPC/Server.php
458	455	packages/DB.php
459	456	Copyright:
460	457	2004-2006 Claudio Bustos

+3

-6

debian/patches/debian-paths.patch less more

36	36	// make sure that we can write to uploads/civicrm/
37	37	--- a/civicrm.config.php
38	38	+++ b/civicrm.config.php
39		@@ -65,11 +65,11 @@
	39	@@ -64,9 +64,9 @@
	40	// check to see if this is under sites/all/modules
40	41	} else if ( strpos( $currentDir, $moduleDir ) !== false ) {
41	42	$confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..';
42		} else if ( strpos( $currentDir, 'plugins' . DIRECTORY_SEPARATOR . 'civicrm' . DIRECTORY_SEPARATOR . 'civicrm' ) !== false ) {
43		//if its wordpress
44		- $confdir = $currentDir . DIRECTORY_SEPARATOR . '..';
45		+ $confdir = $currentDir . '..';
46	43	} else {
47	44	- $confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
48	45	+ $confdir = $currentDir;

50	47	}
51	48
52	49	if ( file_exists( $confdir . DIRECTORY_SEPARATOR . 'civicrm.settings.php' ) ) {
53		@@ -108,10 +108,10 @@
	50	@@ -105,10 +105,10 @@
54	51	}
55	52	}
56	53

+9

-9

debian/patches/debian-split-confname.patch less more

4	4
5	5	--- a/drupal/civicrm.config.php.drupal
6	6	+++ b/drupal/civicrm.config.php.drupal
7		@@ -71,9 +71,9 @@
	7	@@ -68,9 +68,9 @@
8	8	$confdir = $currentDir . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR;
9	9	}
10	10	}

15	15	}
16	16
17	17	if ( ! file_exists( $confdir ) && ! $skipConfigError ) {
18		@@ -95,9 +95,9 @@
	18	@@ -92,9 +92,9 @@
19	19	$server = explode('.', implode('.', array_reverse(explode(':', rtrim($httpHost, '.')))));
20	20	for ($i = count($uri) - 1; $i > 0; $i--) {
21	21	for ($j = count($server); $j > 0; $j--) {

26	26	return $conf;
27	27	}
28	28	// check for alias
29		@@ -112,9 +112,9 @@
	29	@@ -109,9 +109,9 @@
30	30	$conf = "$confdir/default";
31	31	return $conf;
32	32	}

80	80	return FALSE;
81	81	--- a/drupal/drush/civicrm.drush.inc
82	82	+++ b/drupal/drush/civicrm.drush.inc
83		@@ -502,9 +502,9 @@
	83	@@ -505,9 +505,9 @@
84	84	$str = str_replace('%%' . $key . '%%', $value, $str);
85	85	}
86	86	$str = trim($str);

91	91	@drush_op('chmod', "$configFile", 0644);
92	92	drush_log(dt("Settings file generated: !file", array('!file' => $configFile)), 'ok');
93	93	}
94		@@ -1455,13 +1455,13 @@
	94	@@ -1458,13 +1458,13 @@
95	95
96	96	global $cmsPath;
97	97	$cmsPath = $drupal_root = drush_get_context('DRUSH_DRUPAL_ROOT');

142	142	}
143	143	--- a/wordpress/wp-cli/civicrm.php
144	144	+++ b/wordpress/wp-cli/civicrm.php
145		@@ -435,9 +435,9 @@
	145	@@ -449,9 +449,9 @@
146	146	$str = str_replace('%%' . $key . '%%', $value, $str);
147	147
148	148	$str = trim($str);

153	153	WP_CLI::launch("chmod 0644 $configFile");
154	154	WP_CLI::success(sprintf("Settings file generated: %s", $configFile));
155	155
156		@@ -866,11 +866,11 @@
	156	@@ -880,11 +880,11 @@
157	157	define('CIVICRM_UPGRADE_ACTIVE', 1);
158	158
159	159	$wp_root = ABSPATH;

167	167	return WP_CLI::error('Unable to locate settings file at ' . $legacy_settings_file . 'or at ' . $settings_file );
168	168
169	169	# nb: we don't want to require civicrm.settings.php here, because ..
170		@@ -896,16 +896,16 @@
	170	@@ -910,16 +910,16 @@
171	171	elseif ($civicrm_root_code = reset(preg_grep('/^\s\$civicrm_root\s=.*$/', $settings))){
172	172	eval($civicrm_root_code);
173	173	}

186	186
187	187	if (!defined('CIVICRM_OLD_DSN'))
188	188	return WP_CLI::error('Unable to set CIVICRM_OLD_DSN');
189		@@ -977,12 +977,12 @@
	189	@@ -991,12 +991,12 @@
190	190	}
191	191
192	192	WP_CLI::success('3. Archive unpacked.');