[Pkg-owncloud-commits] [php-sabredav] 08/13: Install sabredav.php in /usr/share/php/Sabre

[David Prévot]

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

taffit pushed a commit to branch 2.1
in repository php-sabredav.

commit 0a66ba7d495614317a18099804a596826f4817ae
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 26 14:10:40 2015 -0400

    Install sabredav.php in /usr/share/php/Sabre
    
    Git-Dch: Ignore
---
 debian/install                                          |  3 ++-
 ...04-Install-sabredav.php-in-usr-share-php-Sabre.patch | 17 +++++++++++++++++
 debian/patches/series                                   |  1 +
 debian/rules                                            |  4 ++++
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/debian/install b/debian/install
index 3e70efa..42ca720 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,4 @@
 bin/naturalselection	usr/bin
-bin/sabredav*		usr/bin
+bin/sabredav		usr/bin
+bin/sabredav.php	usr/share/php/Sabre
 lib/*			usr/share/php/Sabre
diff --git a/debian/patches/0004-Install-sabredav.php-in-usr-share-php-Sabre.patch b/debian/patches/0004-Install-sabredav.php-in-usr-share-php-Sabre.patch
new file mode 100644
index 0000000..f054e11
--- /dev/null
+++ b/debian/patches/0004-Install-sabredav.php-in-usr-share-php-Sabre.patch
@@ -0,0 +1,17 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Thu, 26 Feb 2015 14:07:53 -0400
+Subject: Install sabredav.php in /usr/share/php/Sabre
+
+Forwarded: not-needed
+---
+ bin/sabredav | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/sabredav b/bin/sabredav
+index 032371b..25509d7 100755
+--- a/bin/sabredav
++++ b/bin/sabredav
+@@ -1,2 +1,2 @@
+ #!/bin/sh
+-php -S 0.0.0.0:8080 `dirname $0`/sabredav.php
++php -S 0.0.0.0:8080 `dirname $0`/../share/php/Sabre/sabredav.php
diff --git a/debian/patches/series b/debian/patches/series
index 4a5378b..855acbf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-Use-homemade-autoload.php.patch
 0002-Drop-Composer-autoLoader-calls.patch
 0003-Increase-timeout.patch
+0004-Install-sabredav.php-in-usr-share-php-Sabre.patch
diff --git a/debian/rules b/debian/rules
index 82eb9a0..997ca78 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,10 @@ else
 	@echo "** tests disabled"
 endif
 
+override_dh_fixperms:
+	dh_fixperms
+	chmod -x $(CURDIR)/debian/php-sabre-dav/usr/share/php/Sabre/sabredav.php
+
 override_dh_installman:
 	mkdir --parent $(CURDIR)/debian/tmp
 	help2man \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git