[Pkg-owncloud-commits] [php-sabredav] 09/11: Install naturalselection and sabredav CLIs

[David Prévot]

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

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

commit ac59f191419530c7d413195f7a14e5ab332801c5
Author: David Prévot <taffit at debian.org>
Date:   Thu Feb 26 11:59:23 2015 -0400

    Install naturalselection and sabredav CLIs
---
 debian/control                                     |  5 ++++-
 debian/install                                     |  5 ++++-
 debian/links                                       |  2 ++
 debian/manpages                                    |  2 ++
 ...stall-sabredav.php-in-usr-share-php-Sabre.patch | 17 ++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       | 23 ++++++++++++++++++++++
 debian/sabredav.1.in                               |  5 +++++
 8 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index fc0c936..0550396 100644
--- a/debian/control
+++ b/debian/control
@@ -6,12 +6,14 @@ Uploaders: Thomas Mueller <thomas.mueller at tmit.eu>,
            Paul van Tilburg <paulvt at debian.org>,
            David Prévot <taffit at debian.org>
 Build-Depends: debhelper (>= 8.0.0),
+               help2man,
                php-sabre-vobject (>= 2.1.7),
                php5-curl,
                php5-sqlite,
                phpab,
                phpunit,
-               pkg-php-tools (>= 1.7~)
+               pkg-php-tools (>= 1.7~),
+               python
 Standards-Version: 3.9.6
 Homepage: http://sabre.io/dav/
 Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabredav.git -b 1.8
@@ -22,6 +24,7 @@ Architecture: all
 Depends: php-sabre-vobject (>= 2.1.7),
          ${misc:Depends},
          ${phpcomposer:Debian-require}
+Recommends: python
 Suggests: ${phpcomposer:Debian-suggest}
 Replaces: ${phpcomposer:Debian-replace}
 Breaks: ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace}
diff --git a/debian/install b/debian/install
index 4f15715..99d06c7 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,4 @@
-lib/* /usr/share/php/
+bin/naturalselection.py	usr/bin
+bin/sabredav		usr/bin
+bin/sabredav.php	usr/share/php/Sabre
+lib/*			usr/share/php
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..3d66f86
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,2 @@
+usr/bin/naturalselection.py		usr/bin/naturalselection
+usr/share/man/man1/naturalselection.1	usr/share/man/man1/naturalselection.py.1
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..9878088
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1,2 @@
+debian/tmp/naturalselection.1
+debian/tmp/sabredav.1
diff --git a/debian/patches/0002-Install-sabredav.php-in-usr-share-php-Sabre.patch b/debian/patches/0002-Install-sabredav.php-in-usr-share-php-Sabre.patch
new file mode 100644
index 0000000..f054e11
--- /dev/null
+++ b/debian/patches/0002-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 91f7a1b..2581174 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Use-homemade-autoload.php.patch
+0002-Install-sabredav.php-in-usr-share-php-Sabre.patch
diff --git a/debian/rules b/debian/rules
index fe23c4f..d30d0f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,7 @@
 #!/usr/bin/make -f
+
+UPSTREAM := $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]*//')
+
 %:
 	dh $@ --with phpcomposer
 
@@ -19,5 +22,25 @@ 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 \
+		--no-info \
+		--name='keep cache directories below a specified threshold' \
+		--output=$(CURDIR)/debian/tmp/naturalselection.1 \
+		$(CURDIR)/bin/naturalselection.py
+	help2man \
+		--help-option=\  \
+		--version-string=$(UPSTREAM) \
+		--no-info \
+		--include=$(CURDIR)/debian/sabredav.1.in \
+		"echo Usage: sabredav" \
+		> $(CURDIR)/debian/tmp/sabredav.1
+	dh_installman
+
 get-orig-source:
 	uscan --verbose --force --rename
diff --git a/debian/sabredav.1.in b/debian/sabredav.1.in
new file mode 100644
index 0000000..18c5048
--- /dev/null
+++ b/debian/sabredav.1.in
@@ -0,0 +1,5 @@
+[name]
+sabredav \- SabreDAV test server
+
+[description]
+Start a PHP Development Server listening on <http://0.0.0.0:8080>.

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