[Pkg-owncloud-commits] [php-sabredav] 01/02: Rename as php-sabre-dav-2.1
David Prévot
taffit at moszumanska.debian.org
Mon Jun 1 22:02:24 UTC 2015
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 c3862753f3f82034478a60bd307e2288cefc4364
Author: David Prévot <taffit at debian.org>
Date: Sun May 24 14:46:37 2015 -0400
Rename as php-sabre-dav-2.1
Install everything in its own path to be co-installable with other
versions of php-sabre-dav.
Git-Dch: Full
---
debian/autoload.php.tpl | 4 +--
debian/autoload.tests.php.tpl | 2 +-
debian/clean | 2 ++
debian/control | 10 +++----
debian/gbp.conf | 1 +
debian/install | 8 +++---
debian/manpages | 4 +--
.../patches/0001-Use-homemade-autoload.php.patch | 32 +++++++++++-----------
...redav.php-in-usr-share-php-sabre21-Sabre.patch} | 6 ++--
...me-naturalselection-as-naturalselection21.patch | 22 +++++++++++++++
debian/patches/series | 3 +-
debian/pkg-php-tools-overrides | 1 +
debian/rules | 12 ++++----
debian/sabredav.1.in | 2 +-
debian/tests/control | 2 +-
debian/watch | 2 +-
16 files changed, 71 insertions(+), 42 deletions(-)
diff --git a/debian/autoload.php.tpl b/debian/autoload.php.tpl
index bf8ad41..ddc94de 100644
--- a/debian/autoload.php.tpl
+++ b/debian/autoload.php.tpl
@@ -1,8 +1,8 @@
<?php
-require_once 'Sabre/VObject/autoload.php';
+require_once 'sabre21/Sabre/VObject/autoload.php';
// require_once 'Sabre/Event/autoload.php'; (already required by HTTP)
-require_once 'Sabre/HTTP/autoload.php';
+require_once 'sabre21/Sabre/HTTP/autoload.php';
// @codingStandardsIgnoreFile
// @codeCoverageIgnoreStart
diff --git a/debian/autoload.tests.php.tpl b/debian/autoload.tests.php.tpl
index 9d7ebb9..361c135 100644
--- a/debian/autoload.tests.php.tpl
+++ b/debian/autoload.tests.php.tpl
@@ -1,6 +1,6 @@
<?php
-require_once 'Sabre/autoload.php';
+require_once 'sabre21/Sabre/autoload.php';
// @codingStandardsIgnoreFile
// @codeCoverageIgnoreStart
diff --git a/debian/clean b/debian/clean
index 4bdeaf5..268cddc 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,2 +1,4 @@
+bin/naturalselection21
+bin/sabredav21
lib/autoload.php
tests/.sabredav
diff --git a/debian/control b/debian/control
index ae0c7ba..b970321 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: php-sabredav
+Source: php-sabre-dav-2.1
Section: php
Priority: optional
Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
@@ -8,8 +8,8 @@ Build-Depends: debhelper (>= 8.0.0),
php-codesniffer,
php-sabre-event,
php-sabre-http (<< 4),
- php-sabre-http (>= 3.0.4-2~),
- php-sabre-vobject (>= 3.4.1),
+ php-sabre-http (>= 3.0.5-2~),
+ php-sabre-vobject-3,
php5-curl,
php5-sqlite,
phpab,
@@ -21,9 +21,9 @@ Homepage: http://sabre.io/dav/
Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabredav.git -b 2.1
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabredav.git
-Package: php-sabre-dav
+Package: php-sabre-dav-2.1
Architecture: all
-Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
+Depends: php-sabre-http (>= 3.0.5-2~), ${misc:Depends}, ${phpcomposer:Debian-require}
Recommends: python
Suggests: ${phpcomposer:Debian-suggest}
Replaces: ${phpcomposer:Debian-replace}
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 57013e5..0082a49 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,3 +2,4 @@
pristine-tar = True
upstream-branch = upstream-2.1
debian-branch = 2.1
+debian-tag= 2.1/%(version)s
diff --git a/debian/install b/debian/install
index 42ca720..009c7ca 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
-bin/naturalselection usr/bin
-bin/sabredav usr/bin
-bin/sabredav.php usr/share/php/Sabre
-lib/* usr/share/php/Sabre
+bin/naturalselection21 usr/bin
+bin/sabredav21 usr/bin
+bin/sabredav.php usr/share/php/sabre21/Sabre
+lib/* usr/share/php/sabre21/Sabre
diff --git a/debian/manpages b/debian/manpages
index 9878088..169903a 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1,2 @@
-debian/tmp/naturalselection.1
-debian/tmp/sabredav.1
+debian/tmp/naturalselection21.1
+debian/tmp/sabredav21.1
diff --git a/debian/patches/0001-Use-homemade-autoload.php.patch b/debian/patches/0001-Use-homemade-autoload.php.patch
index 2aeaf1c..5337f57 100644
--- a/debian/patches/0001-Use-homemade-autoload.php.patch
+++ b/debian/patches/0001-Use-homemade-autoload.php.patch
@@ -38,7 +38,7 @@ index 0e7d7fc..171f34d 100644
}
diff --git a/bin/migrateto17.php b/bin/migrateto17.php
-index 66a9ee5..00f0d08 100755
+index 66a9ee5..67a75e6 100755
--- a/bin/migrateto17.php
+++ b/bin/migrateto17.php
@@ -1,4 +1,4 @@
@@ -54,12 +54,12 @@ index 66a9ee5..00f0d08 100755
- __DIR__ . '/../vendor/autoload.php',
- __DIR__ . '/../../../autoload.php',
+ __DIR__ . '/../lib/autoload.php',
-+ __DIR__ . '/../share/php/Sabre/autoload.php',
++ __DIR__ . '/../share/php/sabre21/Sabre/autoload.php',
);
foreach($paths as $path) {
diff --git a/bin/migrateto20.php b/bin/migrateto20.php
-index aa003e8..079968c 100755
+index aa003e8..ace0b72 100755
--- a/bin/migrateto20.php
+++ b/bin/migrateto20.php
@@ -1,4 +1,4 @@
@@ -75,12 +75,12 @@ index aa003e8..079968c 100755
- __DIR__ . '/../vendor/autoload.php',
- __DIR__ . '/../../../autoload.php',
+ __DIR__ . '/../lib/autoload.php',
-+ __DIR__ . '/../share/php/Sabre/autoload.php',
++ __DIR__ . '/../share/php/sabre21/Sabre/autoload.php',
];
foreach($paths as $path) {
diff --git a/bin/migrateto21.php b/bin/migrateto21.php
-index c0cef52..c83ad3c 100755
+index c0cef52..7167360 100755
--- a/bin/migrateto21.php
+++ b/bin/migrateto21.php
@@ -1,4 +1,4 @@
@@ -96,7 +96,7 @@ index c0cef52..c83ad3c 100755
- __DIR__ . '/../vendor/autoload.php',
- __DIR__ . '/../../../autoload.php',
+ __DIR__ . '/../lib/autoload.php',
-+ __DIR__ . '/../share/php/Sabre/autoload.php',
++ __DIR__ . '/../share/php/sabre21/Sabre/autoload.php',
];
foreach($paths as $path) {
@@ -126,7 +126,7 @@ index 34a674f..def97fd 100755
foreach($paths as $path) {
diff --git a/examples/addressbookserver.php b/examples/addressbookserver.php
-index 4ae78f7..ae0e6ca 100644
+index 4ae78f7..32cc271 100644
--- a/examples/addressbookserver.php
+++ b/examples/addressbookserver.php
@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
@@ -134,12 +134,12 @@ index 4ae78f7..ae0e6ca 100644
// Autoloader
-require_once 'vendor/autoload.php';
-+require_once 'Sabre/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
// Backends
$authBackend = new Sabre\DAV\Auth\Backend\PDO($pdo);
diff --git a/examples/calendarserver.php b/examples/calendarserver.php
-index de08a10..d83e08b 100644
+index de08a10..2a369ad 100644
--- a/examples/calendarserver.php
+++ b/examples/calendarserver.php
@@ -26,7 +26,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
@@ -147,12 +147,12 @@ index de08a10..d83e08b 100644
// Files we need
-require_once 'vendor/autoload.php';
-+require_once 'Sabre/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
// Backends
$authBackend = new Sabre\DAV\Auth\Backend\PDO($pdo);
diff --git a/examples/fileserver.php b/examples/fileserver.php
-index 952b550..e975bbe 100644
+index 952b550..9f9282c 100644
--- a/examples/fileserver.php
+++ b/examples/fileserver.php
@@ -20,7 +20,7 @@ $tmpDir = 'tmpdata';
@@ -160,12 +160,12 @@ index 952b550..e975bbe 100644
// Files we need
-require_once 'vendor/autoload.php';
-+require_once 'Sabre/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
// Create the root node
$root = new \Sabre\DAV\FS\Directory($publicDir);
diff --git a/examples/groupwareserver.php b/examples/groupwareserver.php
-index 668b92b..d80bddc 100644
+index 668b92b..e5f2d04 100644
--- a/examples/groupwareserver.php
+++ b/examples/groupwareserver.php
@@ -48,7 +48,7 @@ function exception_error_handler($errno, $errstr, $errfile, $errline ) {
@@ -173,12 +173,12 @@ index 668b92b..d80bddc 100644
// Autoloader
-require_once 'vendor/autoload.php';
-+require_once 'Sabre/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
/**
* The backends. Yes we do really need all of them.
diff --git a/examples/simplefsserver.php b/examples/simplefsserver.php
-index cf64730..f0bf08e 100644
+index cf64730..f1c8d84 100644
--- a/examples/simplefsserver.php
+++ b/examples/simplefsserver.php
@@ -1,9 +1,5 @@
@@ -196,7 +196,7 @@ index cf64730..f0bf08e 100644
// Files we need
-require_once 'vendor/autoload.php';
-+require_once 'Sabre/autoload.php';
++require_once 'sabre21/Sabre/autoload.php';
class MyCollection extends Sabre\DAV\Collection {
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-sabre21-Sabre.patch
similarity index 67%
rename from debian/patches/0004-Install-sabredav.php-in-usr-share-php-Sabre.patch
rename to debian/patches/0004-Install-sabredav.php-in-usr-share-php-sabre21-Sabre.patch
index f054e11..ee49750 100644
--- a/debian/patches/0004-Install-sabredav.php-in-usr-share-php-Sabre.patch
+++ b/debian/patches/0004-Install-sabredav.php-in-usr-share-php-sabre21-Sabre.patch
@@ -1,6 +1,6 @@
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
+Subject: Install sabredav.php in /usr/share/php/sabre21/Sabre
Forwarded: not-needed
---
@@ -8,10 +8,10 @@ Forwarded: not-needed
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/bin/sabredav b/bin/sabredav
-index 032371b..25509d7 100755
+index 032371b..956d19b 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
++php -S 0.0.0.0:8080 `dirname $0`/../share/php/sabre21/Sabre/sabredav.php
diff --git a/debian/patches/0007-Rename-naturalselection-as-naturalselection21.patch b/debian/patches/0007-Rename-naturalselection-as-naturalselection21.patch
new file mode 100644
index 0000000..9df3e54
--- /dev/null
+++ b/debian/patches/0007-Rename-naturalselection-as-naturalselection21.patch
@@ -0,0 +1,22 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Mon, 1 Jun 2015 17:26:29 -0400
+Subject: Rename naturalselection as naturalselection21
+
+Forwarded: not-needed
+---
+ bin/naturalselection | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bin/naturalselection b/bin/naturalselection
+index eaa55a4..7926900 100755
+--- a/bin/naturalselection
++++ b/bin/naturalselection
+@@ -72,7 +72,7 @@ def run(cacheDir, threshold, sleep=5, simulate=False, min_erase = 0):
+
+ def main():
+ parser = OptionParser(
+- version="naturalselection v0.3",
++ version="naturalselection21 v0.3",
+ description="Cache directory manager. Deletes cache entries based on accesstime and free space thresholds.\n" +
+ "This utility is distributed alongside SabreDAV.",
+ usage="usage: %prog [options] cacheDirectory",
diff --git a/debian/patches/series b/debian/patches/series
index 52bb065..9738c94 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,7 @@
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
+0004-Install-sabredav.php-in-usr-share-php-sabre21-Sabre.patch
0005-tfix-threshold.patch
0006-tfix-selection.patch
+0007-Rename-naturalselection-as-naturalselection21.patch
diff --git a/debian/pkg-php-tools-overrides b/debian/pkg-php-tools-overrides
new file mode 100644
index 0000000..ab6925e
--- /dev/null
+++ b/debian/pkg-php-tools-overrides
@@ -0,0 +1 @@
+sabre vobject php-sabre-vobject-3
diff --git a/debian/rules b/debian/rules
index 997ca78..963b2f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,8 @@ override_dh_auto_build:
--basedir vendor \
--template debian/autoload.php.tpl \
lib tests/Sabre
+ cp -a bin/sabredav bin/sabredav21
+ cp -a bin/naturalselection bin/naturalselection21
override_dh_auto_clean:
rm -rf tests/temp vendor
@@ -31,22 +33,22 @@ endif
override_dh_fixperms:
dh_fixperms
- chmod -x $(CURDIR)/debian/php-sabre-dav/usr/share/php/Sabre/sabredav.php
+ chmod -x $(CURDIR)/debian/php-sabre-dav-2.1/usr/share/php/sabre21/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
+ --output=$(CURDIR)/debian/tmp/naturalselection21.1 \
+ $(CURDIR)/bin/naturalselection21
help2man \
--help-option=\ \
--version-string=$(UPSTREAM) \
--no-info \
--include=$(CURDIR)/debian/sabredav.1.in \
- "echo Usage: sabredav" \
- > $(CURDIR)/debian/tmp/sabredav.1
+ "echo Usage: sabredav21" \
+ > $(CURDIR)/debian/tmp/sabredav21.1
dh_installman
get-orig-source:
diff --git a/debian/sabredav.1.in b/debian/sabredav.1.in
index 18c5048..2216375 100644
--- a/debian/sabredav.1.in
+++ b/debian/sabredav.1.in
@@ -1,5 +1,5 @@
[name]
-sabredav \- SabreDAV test server
+sabredav21 \- SabreDAV test server
[description]
Start a PHP Development Server listening on <http://0.0.0.0:8080>.
diff --git a/debian/tests/control b/debian/tests/control
index 8d58c9c..b20eed2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
-Test-Command: phpcs -p --standard=tests/phpcs/ruleset.xml /usr/share/php/Sabre/*DAV*
+Test-Command: phpcs -p --standard=tests/phpcs/ruleset.xml /usr/share/php/sabre21/Sabre/*DAV*
Depends: @, php-codesniffer
Test-Command: mkdir --parents vendor && phpab --output vendor/autoload.php --basedir vendor --template debian/autoload.tests.php.tpl tests/Sabre && phpunit --configuration tests/phpunit.xml
diff --git a/debian/watch b/debian/watch
index 231ffc0..2f48779 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
-options=uversionmangle=s/([^\d.]+)/~$1/i;s/^/2.2.0~really/ \
+options=uversionmangle=s/([^\d.]+)/~$1/i \
https://github.com/fruux/sabre-dav/releases \
/fruux/sabre-dav/archive/(2\.1\.\d.*).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git
More information about the Pkg-owncloud-commits
mailing list