# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1393117136 -3600
# Node ID 73b3ff89bc421258edd9307eddc2b5f357629c37
# Parent  df79b92a5a9712d9ec8398ba690cd8914503d040
Adopted quilt packaging and added a temporary patch for file uploads.

diff -r df79b92a5a97 -r 73b3ff89bc42 debian/changelog
--- a/debian/changelog	Sun Feb 23 01:51:59 2014 +0100
+++ b/debian/changelog	Sun Feb 23 01:58:56 2014 +0100
@@ -1,3 +1,10 @@
+chwala (0.2-0~kolab6.1) unstable; urgency=low
+
+  * Adopted quilt packaging for source patches.
+  * Added temporary file upload patch.
+
+ -- Paul Boddie <paul@boddie.org.uk>  Sun, 23 Feb 2014 01:57:49 +0100
+
 chwala (0.2-0~kolab6) unstable; urgency=low
 
   * Bump release to rebuild the debian packages
diff -r df79b92a5a97 -r 73b3ff89bc42 debian/control
--- a/debian/control	Sun Feb 23 01:51:59 2014 +0100
+++ b/debian/control	Sun Feb 23 01:58:56 2014 +0100
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 8), quilt
 Homepage: http://www.chwala.org/
 Standards-Version: 3.9.3
 
diff -r df79b92a5a97 -r 73b3ff89bc42 debian/patches/file-upload.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/file-upload.diff	Sun Feb 23 01:58:56 2014 +0100
@@ -0,0 +1,11 @@
+--- a/lib/kolab/kolab_file_storage.php
++++ b/lib/kolab/kolab_file_storage.php
+@@ -872,7 +872,7 @@
+             array('filename', '=', $file_name)
+         ));
+ 
+-        return array_shift($files);
++        return $files[0];
+     }
+ 
+     /**
diff -r df79b92a5a97 -r 73b3ff89bc42 debian/patches/public-html.diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/public-html.diff	Sun Feb 23 01:58:56 2014 +0100
@@ -0,0 +1,17 @@
+--- a/public_html/.htaccess
++++ b/public_html/.htaccess
+@@ -1,6 +1,7 @@
+-php_flag  session.auto_start   Off
+-php_flag  display_errors       Off
+-php_flag  log_errors           On
+-php_value error_log            ../logs/errors
+-php_value post_max_size        20M
+-php_value upload_max_filesize  20M
+\ No newline at end of file
++php_flag  session.auto_start        Off
++php_flag  display_errors            Off
++php_flag  log_errors                On
++php_flag  suhosin.session.encrypt   Off
++php_value error_log                 ../logs/errors
++php_value post_max_size             20M
++php_value upload_max_filesize       20M
diff -r df79b92a5a97 -r 73b3ff89bc42 debian/patches/series
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/series	Sun Feb 23 01:58:56 2014 +0100
@@ -0,0 +1,2 @@
+public-html.diff
+file-upload.diff
diff -r df79b92a5a97 -r 73b3ff89bc42 debian/source/format
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/source/format	Sun Feb 23 01:58:56 2014 +0100
@@ -0,0 +1,1 @@
+3.0 (quilt)