[SCM] mate-user-share Debian package branch, master, updated. 2fe71151a772f869c39d6aa2f0bc1839f82b94f6

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/mate-user-share.git;a=commitdiff;h=4c85464

The following commit has been merged in the master branch:
commit 4c8546412a6f91861bb283af93ba07570545bbcf
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Apr 25 13:12:16 2014 +0200

    debian/patches: Rename 01_apache-config.patch to 1001_apache-config.patch and use same patching for the Apache2.4 config example.
---
 debian/patches/01_apache-config.patch   | 17 ---------------
 debian/patches/1001_apache-config.patch | 37 +++++++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/debian/patches/01_apache-config.patch b/debian/patches/01_apache-config.patch
deleted file mode 100644
index ad50ffc..0000000
--- a/debian/patches/01_apache-config.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/data/dav_user_2.2.conf.orig	2009-06-27 10:28:32.044136148 +0200
-+++ b/data/dav_user_2.2.conf	2009-06-27 10:30:11.067899425 +0200
-@@ -14,11 +14,14 @@
- LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so
- LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so
- LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so
-+LoadModule mime_module ${HTTP_MODULES_PATH}/mod_mime.so
- 
- DNSSDEnable on
- DNSSDAutoRegisterVHosts Off
- DNSSDAutoRegisterUserDir Off
- 
-+TypesConfig /etc/mime.types
-+
- <VirtualHost *>
-   DocumentRoot ${XDG_PUBLICSHARE_DIR}
- 
diff --git a/debian/patches/1001_apache-config.patch b/debian/patches/1001_apache-config.patch
new file mode 100644
index 0000000..b0ae0bb
--- /dev/null
+++ b/debian/patches/1001_apache-config.patch
@@ -0,0 +1,37 @@
+Author: Steve Zesch <https://github.com/szesch>
+ Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Description: Add MIME type support
+--- a/data/dav_user_2.2.conf
++++ b/data/dav_user_2.2.conf
+@@ -14,11 +14,14 @@
+ LoadModule auth_digest_module ${HTTP_MODULES_PATH}/mod_auth_digest.so
+ LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so
+ LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so
++LoadModule mime_module ${HTTP_MODULES_PATH}/mod_mime.so
+ 
+ DNSSDEnable on
+ DNSSDAutoRegisterVHosts Off
+ DNSSDAutoRegisterUserDir Off
+ 
++TypesConfig /etc/mime.types
++
+ <VirtualHost *>
+   DocumentRoot ${XDG_PUBLICSHARE_DIR}
+ 
+--- a/data/dav_user_2.4.conf
++++ b/data/dav_user_2.4.conf
+@@ -19,11 +19,14 @@
+ LoadModule authz_user_module ${HTTP_MODULES_PATH}/mod_authz_user.so
+ LoadModule authz_groupfile_module ${HTTP_MODULES_PATH}/mod_authz_groupfile.so
+ LoadModule dnssd_module ${HTTP_MODULES_PATH}/mod_dnssd.so
++LoadModule mime_module ${HTTP_MODULES_PATH}/mod_mime.so
+ 
+ DNSSDEnable on
+ DNSSDAutoRegisterVHosts Off
+ DNSSDAutoRegisterUserDir Off
+ 
++TypesConfig /etc/mime.types
++
+ <VirtualHost *>
+   DocumentRoot ${XDG_PUBLICSHARE_DIR}
+ 

-- 
mate-user-share Debian package