[pycsw] 20/20: Fix apache site, refresh patches

[Johan Van de Wauw]

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

johanvdw-guest pushed a commit to branch master
in repository pycsw.

commit 9179ce6d09bacc09db8172e48e915464f8557964
Author: Johan Van de Wauw <johan.vandewauw at gmail.com>
Date:   Tue Sep 30 21:12:17 2014 +0200

    Fix apache site, refresh patches
---
 debian/patches/0001-Remove-google-analytics.patch   |  4 ++++
 ...ch => 0002-Remove-externally-linked-files.patch} |  0
 ...look-for-configuration-in-correct-etc-pat.patch} |  0
 ...dg-open-instead-of-firefox-in-desktop-file.patch | 21 +++++++++++++++++++++
 debian/patches/0005-Fix-apache-site.patch           | 19 +++++++++++++++++++
 debian/patches/series                               |  6 ++++--
 6 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/debian/patches/0001-Remove-google-analytics.patch b/debian/patches/0001-Remove-google-analytics.patch
index 153975c..7358ea5 100644
--- a/debian/patches/0001-Remove-google-analytics.patch
+++ b/debian/patches/0001-Remove-google-analytics.patch
@@ -2,6 +2,10 @@ From: Johan Van de Wauw <johan.vandewauw at gmail.com>
 Date: Mon, 29 Sep 2014 15:56:00 +0200
 Subject: Remove google analytics
 
+---
+ docs/_templates/layout.html | 15 ---------------
+ 1 file changed, 15 deletions(-)
+
 diff --git a/docs/_templates/layout.html b/docs/_templates/layout.html
 index 631e4ee..0a95a9d 100644
 --- a/docs/_templates/layout.html
diff --git a/debian/patches/0009-Remove-externally-linked-files.patch b/debian/patches/0002-Remove-externally-linked-files.patch
similarity index 100%
rename from debian/patches/0009-Remove-externally-linked-files.patch
rename to debian/patches/0002-Remove-externally-linked-files.patch
diff --git a/debian/patches/0010-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch b/debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
similarity index 100%
rename from debian/patches/0010-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
rename to debian/patches/0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
diff --git a/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch b/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
new file mode 100644
index 0000000..37ce556
--- /dev/null
+++ b/debian/patches/0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
@@ -0,0 +1,21 @@
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Tue, 30 Sep 2014 21:00:54 +0200
+Subject: Use xdg-open instead of firefox in desktop file
+
+---
+ etc/pycsw.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/etc/pycsw.desktop b/etc/pycsw.desktop
+index 5c5b5f7..cdbe940 100644
+--- a/etc/pycsw.desktop
++++ b/etc/pycsw.desktop
+@@ -4,7 +4,7 @@ Encoding=UTF-8
+ Name=pycsw
+ Comment=pycsw catalog server
+ Categories=Application;Education;Geography;
+-Exec=firefox http://localhost/pycsw/tests/index.html
++Exec=xdg-open http://localhost/pycsw/tests/index.html
+ Icon=/var/www/html/pycsw/docs/_static/pycsw-logo.png
+ Terminal=false
+ StartupNotify=false
diff --git a/debian/patches/0005-Fix-apache-site.patch b/debian/patches/0005-Fix-apache-site.patch
new file mode 100644
index 0000000..580d4a7
--- /dev/null
+++ b/debian/patches/0005-Fix-apache-site.patch
@@ -0,0 +1,19 @@
+From: Johan Van de Wauw <johan.vandewauw at gmail.com>
+Date: Tue, 30 Sep 2014 21:05:50 +0200
+Subject: Fix apache site
+
+---
+ etc/pycsw.conf | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/etc/pycsw.conf b/etc/pycsw.conf
+index d402735..726aca1 100644
+--- a/etc/pycsw.conf
++++ b/etc/pycsw.conf
+@@ -1,4 +1,5 @@
+-<Directory /var/www/html/pycsw>
++Alias /pycsw /usr/share/pycsw
++<Directory /usr/share/pycsw>
+   Options +FollowSymLinks +ExecCGI
+   Require all granted
+   AddHandler cgi-script .py
diff --git a/debian/patches/series b/debian/patches/series
index 63d3fb9..b461616 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 0001-Remove-google-analytics.patch
-0009-Remove-externally-linked-files.patch
-0010-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
+0002-Remove-externally-linked-files.patch
+0003-Make-pycsw-look-for-configuration-in-correct-etc-pat.patch
+0004-Use-xdg-open-instead-of-firefox-in-desktop-file.patch
+0005-Fix-apache-site.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pycsw.git