Move location of postmark-php lib

postmark-php-postmark-location.patch

diff --git a/README.txt b/README.txt
index 7f79661..1bd1203 100644
--- a/README.txt
+++ b/README.txt
@@ -1,8 +1,8 @@
 Module description
 ------------------
 
-The Postmark module allows the administrator to switch the standard SMTP 
-library over to use the third party Postmark library. An account with 
+The Postmark module allows the administrator to switch the standard SMTP
+library over to use the third party Postmark library. An account with
 Postmark is required to use this module.
 
 The recommended third party library for this module is the latest version
@@ -19,13 +19,13 @@ Installing the Drupal 7 version of the Postmark module requires a few steps :
 1) Download the Mail System module into sites/all/modules, then enable it.
    http://drupal.org/project/mailsystem
 
-2) Copy the postmark folder to the modules folder in your installation 
+2) Copy the postmark folder to the modules folder in your installation
    This is usually sites/all/modules.
 
 3) Obtain the Postmark PHP library from http://github.com/Znarkus/postmark-php.
 
 4) Copy the files to the includes directory in the module folder
-   /modules/postmark/includes.
+   /modules/postmark/includes/postmark-php.
 
 5) You must ensure you get the Certificate folder too as this is now implemented
    within the PHP class.
@@ -33,17 +33,17 @@ Installing the Drupal 7 version of the Postmark module requires a few steps :
 6) Enable the module using Administer > Modules (/admin/build/modules).
 
 7) Go to Site configuration > Postmark (/admin/settings/postmark)
-   
+
 8) Enable Postmark functionality and add your API key from your Postmark account.
 
-9) The test functionality enables you to test the integration is working, this 
+9) The test functionality enables you to test the integration is working, this
    will use a credit by default each time you submit an email address.
 
-10) The email address that emails are sent from on your site must have a valid 
-   Sender Signature set up in your Postmark account. Different modules use 
-   different settings for the "From" address. One important place to check is 
+10) The email address that emails are sent from on your site must have a valid
+   Sender Signature set up in your Postmark account. Different modules use
+   different settings for the "From" address. One important place to check is
    the address on Administer > Site configuration > Site information.
-	 
+
 11) Emails sent from the Contact module will use the sender email as the Reply To
    address, and will append the sender's email address to the bottom of the email
 	 so the recipient can see who submitted the Contact form.  This is necessary
@@ -61,7 +61,7 @@ Installing the Drupal 7 version of the Postmark module requires a few steps :
 Support and bugs
 ----------------
 
-If you have any problems using the module, please submit an issue in the 
+If you have any problems using the module, please submit an issue in the
 Postmark queue (http://drupal.org/project/issues/postmark).
 
 That's also a good place to check for known problems and "todos".
@@ -74,5 +74,5 @@ The Postmark module was developed by
  * Allister Price (alli.price)
 from Deeson Online (http://www.deeson.co.uk/online).
 
-Credit also goes to the phpmailer (http://drupal.org/project/phpmailer) module on 
+Credit also goes to the phpmailer (http://drupal.org/project/phpmailer) module on
 which this module is heavily based.
diff --git a/postmark.info b/postmark.info
index e3f187a..162afad 100644
--- a/postmark.info
+++ b/postmark.info
@@ -8,4 +8,4 @@ configure = admin/config/system/postmark
 files[] = postmark.module
 files[] = postmark.admin.inc
 files[] = postmark.mail.inc
-files[] = includes/Postmark.php
+files[] = includes/postmark-php/Postmark.php
diff --git a/postmark.mail.inc b/postmark.mail.inc
index 2c017b9..694983f 100644
--- a/postmark.mail.inc
+++ b/postmark.mail.inc
@@ -5,7 +5,7 @@
  */
 define('POSTMARKAPP_API_KEY', variable_get('postmark_api_key', ''));
 
-module_load_include('php', 'postmark', 'includes/Postmark');
+module_load_include('php', 'postmark', 'includes/postmark-php/Postmark');
 
 /**
 * Modify the drupal mail system to use smtp when sending emails.
@@ -122,7 +122,7 @@ class PostmarkMailSystem implements MailSystemInterface {
 
 		// If debug mode is on, output the message
 		if ($debug_mode) {
-			drupal_set_message('Message array: <pre>'. print_r($message, TRUE) .'</pre>', 'warning');    
+			drupal_set_message('Message array: <pre>'. print_r($message, TRUE) .'</pre>', 'warning');
 		}
 
 		// If the debug option of not sending a credit, i.e.