[med-svn] [openemr] 01/01: Added in patches for latest bug fixes in package and lintian-overrides for the phpmyadmin javascirpt files which come with the tarball but are never packaged. Lintian still picks them up as 'source-is-missing' errors. Requested upstream to remove redundant phpmyadmin code.

[Ian Wallace]

This is an automated email from the git hooks/post-receive script.

iankarlwallace-guest pushed a commit to branch master
in repository openemr.

commit 80a2cde4cb5a0451cd6b7461eea5e46a37eea522
Author: Ian Wallace <iankarlwallace at gmail.com>
Date:   Fri Jun 20 22:14:18 2014 -0700

    Added in patches for latest bug fixes in package and lintian-overrides for the phpmyadmin javascirpt files which come with the tarball but are never packaged.  Lintian still picks them up as 'source-is-missing' errors.  Requested upstream to remove redundant phpmyadmin code.
---
 debian/patches/correct_webroot_dirs_globals_conf         |  9 +++++++++
 debian/patches/series                                    |  1 +
 .../startup_developer_appliance_fails_syntax_check       | 16 ++++++++++++++++
 debian/postinst                                          |  6 +++++-
 debian/source.lintian-overrides                          |  3 +++
 5 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/debian/patches/correct_webroot_dirs_globals_conf b/debian/patches/correct_webroot_dirs_globals_conf
index 2dd513c..87f6949 100644
--- a/debian/patches/correct_webroot_dirs_globals_conf
+++ b/debian/patches/correct_webroot_dirs_globals_conf
@@ -1,3 +1,12 @@
+Description: Hardcode webroot dirs
+ Original maintainer script calculates the webroot dirs but it doesn't seem to work
+ correctly when the source is split between /usr/share/openemr and /var/lib/openemr
+Author: Ian Wallace <iankarlwallace at gmail.com>
+Origin: other
+Reviewed-by: Ian Wallace <iankarlwallace at gmail.com>
+Last-Update: 2014-06-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/interface/globals.php
 +++ b/interface/globals.php
 @@ -70,8 +70,8 @@ if (preg_match("/^[^\/]/",$web_root)) {
diff --git a/debian/patches/series b/debian/patches/series
index f5ef4f1..0d461ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+startup_developer_appliance_fails_syntax_check
 correct_webroot_dirs_globals_conf
 convert_logcomments_perl_invocation_fix
 upstream_patch_6
diff --git a/debian/patches/startup_developer_appliance_fails_syntax_check b/debian/patches/startup_developer_appliance_fails_syntax_check
new file mode 100644
index 0000000..af9aa06
--- /dev/null
+++ b/debian/patches/startup_developer_appliance_fails_syntax_check
@@ -0,0 +1,16 @@
+Description: Startup Appliance fails with sh -n syntax check.
+ Appears to be using something that is available in bash only and not in bash POSIX mode.
+Author: Brady Miller <brady at sparmy.com>
+Origin: upstream
+Reviewed-by: Ian Wallace <iankarlwallace at gmail.com>
+Last-Update: 2014-06-19
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/contrib/util/installScripts/cvsDemoMisc/StartupDeveloperAppliance2
++++ b/contrib/util/installScripts/cvsDemoMisc/StartupDeveloperAppliance2
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ #This program is free software; you can redistribute it and/or modify
+ #it under the terms of the GNU General Public License as published by
diff --git a/debian/postinst b/debian/postinst
index 97749f6..8f20c28 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -46,7 +46,11 @@
 
 function unsecure-file {
 		chown www-data:www-data $1
-			chmod 660 $1
+		if [ -f "$1" ]; then
+			chmod 660 "$1"
+		else
+			chmod 770 "$1"
+		fi
 }
 
 unsecure-file /var/lib/openemr/sites/default/sqlconf.php
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
new file mode 100644
index 0000000..2f8d2d3
--- /dev/null
+++ b/debian/source.lintian-overrides
@@ -0,0 +1,3 @@
+# phpmyadmin is NOT packaged with Debian version of OpenEMR 
+# Requested remove from upstream tarball if developers appropriate
+openemr source: source-is-missing phpmyadmin/*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/openemr.git