[Pkg-owncloud-commits] [php-sabre-vobject] 01/02: Rename as php-sabre-vobject-3
David Prévot
taffit at moszumanska.debian.org
Mon Jun 1 22:02:17 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch 3
in repository php-sabre-vobject.
commit c1a9d0f2c46b028c8bd2103ee20812607c5abab7
Author: David Prévot <taffit at debian.org>
Date: Sun May 31 18:53:50 2015 -0400
Rename as php-sabre-vobject-3
Install everything in its own path to be co-installable with other
versions of php-sabre-vobject.
Git-Dch: Full
---
debian/clean | 2 ++
debian/control | 6 +++---
debian/gbp.conf | 5 +++++
debian/generate_vcards.1.in | 2 +-
debian/install | 6 +++---
debian/manpages | 4 ++--
debian/patches/0001-Use-homemade-autoloader.php.patch | 12 ++++++------
...se-ClassLoader-from-Symfony-instead-of-autoLoader.patch | 2 +-
debian/rules | 14 +++++++++-----
debian/tests/control | 2 +-
debian/vobject.1.in | 2 +-
11 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/debian/clean b/debian/clean
index 6d47d7c..e20e402 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,3 @@
+bin/generate_vcards3
+bin/vobject3
lib/autoload.php
diff --git a/debian/control b/debian/control
index 7520786..8ed5166 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: php-sabre-vobject
+Source: php-sabre-vobject-3
Section: php
Priority: optional
Maintainer: ownCloud for Debian maintainers <pkg-owncloud-maintainers at lists.alioth.debian.org>
@@ -12,10 +12,10 @@ Build-Depends: debhelper (>= 9),
pkg-php-tools (>= 1.7~)
Standards-Version: 3.9.6
Homepage: http://sabre.io/vobject/
-Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabre-vobject.git
+Vcs-Git: git://anonscm.debian.org/pkg-owncloud/php-sabre-vobject.git -b 3
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-owncloud/php-sabre-vobject.git
-Package: php-sabre-vobject
+Package: php-sabre-vobject-3
Architecture: all
Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
Suggests: ${phpcomposer:Debian-suggest}
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..342c4ee
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+pristine-tar = True
+upstream-branch = upstream-3
+debian-branch = 3
+debian-tag= 3/%(version)s
diff --git a/debian/generate_vcards.1.in b/debian/generate_vcards.1.in
index c64cfdc..ad1d7fd 100644
--- a/debian/generate_vcards.1.in
+++ b/debian/generate_vcards.1.in
@@ -1,2 +1,2 @@
[name]
-generate_vcards \- generate random vcards
+generate_vcards3 \- generate random vcards
diff --git a/debian/install b/debian/install
index c97639c..d46af56 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,3 @@
-bin/generate_vcards usr/bin
-bin/vobject usr/bin
-lib/* usr/share/php/Sabre/VObject
+bin/generate_vcards3 usr/bin
+bin/vobject3 usr/bin
+lib/* usr/share/php/sabre21/Sabre/VObject
diff --git a/debian/manpages b/debian/manpages
index 29dd1e2..8caa1a9 100644
--- a/debian/manpages
+++ b/debian/manpages
@@ -1,2 +1,2 @@
-debian/tmp/vobject.1
-debian/tmp/generate_vcards.1
+debian/tmp/vobject3.1
+debian/tmp/generate_vcards3.1
diff --git a/debian/patches/0001-Use-homemade-autoloader.php.patch b/debian/patches/0001-Use-homemade-autoloader.php.patch
index 36ea97c..61d419f 100644
--- a/debian/patches/0001-Use-homemade-autoloader.php.patch
+++ b/debian/patches/0001-Use-homemade-autoloader.php.patch
@@ -40,7 +40,7 @@ index a577c52..f258597 100755
$windowsZonesUrl = 'http://unicode.org/repos/cldr/trunk/common/supplemental/windowsZones.xml';
diff --git a/bin/generate_vcards b/bin/generate_vcards
-index 638f63b..54dbda0 100755
+index 638f63b..bca36db 100755
--- a/bin/generate_vcards
+++ b/bin/generate_vcards
@@ -1,4 +1,4 @@
@@ -56,7 +56,7 @@ index 638f63b..54dbda0 100755
- __DIR__ . '/../vendor/autoload.php', // In case vobject is cloned directly
- __DIR__ . '/../../../autoload.php', // In case vobject is a composer dependency.
+ __DIR__ . '/../lib/autoload.php', // In case vobject is used from the package tree
-+ __DIR__ . '/../share/php/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
++ __DIR__ . '/../share/php/sabre21/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
);
foreach($paths as $path) {
@@ -92,7 +92,7 @@ index f151819..6f262e7 100644
if ($argc < 4) {
echo "sabre/vobject ", Sabre\VObject\Version::VERSION, " RRULE benchmark\n";
diff --git a/bin/vobject b/bin/vobject
-index e52b4fb..23f2f55 100755
+index e52b4fb..43cd82f 100755
--- a/bin/vobject
+++ b/bin/vobject
@@ -1,4 +1,4 @@
@@ -108,12 +108,12 @@ index e52b4fb..23f2f55 100755
- __DIR__ . '/../vendor/autoload.php', // In case vobject is cloned directly
- __DIR__ . '/../../../autoload.php', // In case vobject is a composer dependency.
+ __DIR__ . '/../lib/autoload.php', // In case vobject is used from the package tree
-+ __DIR__ . '/../share/php/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
++ __DIR__ . '/../share/php/sabre21/Sabre/VObject/autoload.php', // In case vobject is used from the system path.
);
foreach($paths as $path) {
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index a01f8f9..bb0e694 100644
+index a01f8f9..0abcff3 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -3,8 +3,8 @@
@@ -123,7 +123,7 @@ index a01f8f9..bb0e694 100644
- __DIR__ . '/../vendor/autoload.php',
- __DIR__ . '/../../../autoload.php',
+ __DIR__ . '/../lib/autoload.php',
-+ '/usr/share/php/Sabre/VObject/autoload.php',
++ '/usr/share/php/sabre21/Sabre/VObject/autoload.php',
);
foreach($try as $path) {
diff --git a/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch b/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
index 435b556..89b242e 100644
--- a/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
+++ b/debian/patches/0002-Use-ClassLoader-from-Symfony-instead-of-autoLoader.patch
@@ -11,7 +11,7 @@ http://symfony.com/doc/current/components/class_loader/psr4_class_loader.html#us
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index bb0e694..5f35ee0 100644
+index 0abcff3..853d3f1 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -14,7 +14,13 @@ foreach($try as $path) {
diff --git a/debian/rules b/debian/rules
index 681958f..6f9fcc4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ UPSTREAM := $(shell dpkg-parsechangelog -S Version | sed 's/-[^-]*//')
override_dh_auto_build:
dh_auto_build
phpab --output lib/autoload.php lib
+ cp -a bin/generate_vcards bin/generate_vcards3
+ cp -a bin/vobject bin/vobject3
override_dh_auto_clean:
rm -rf tests/temp
@@ -28,19 +30,21 @@ override_dh_installman:
--version-string=$(UPSTREAM) \
--no-info \
--include=$(CURDIR)/debian/vobject.1.in \
- "echo -n Usage: && $(CURDIR)/bin/vobject 2>&1 \
+ "echo -n Usage: && $(CURDIR)/bin/vobject3 2>&1 \
| tail -n+3 | sed -re 's:\x1B\[[0-9;]*[mK]::g' \
-e 's/inputformat If/inputformat If/' -e 's/must/ must/' \
-e 's/] C/] C/' \
- -e 's/ vobject/\n vobject/'" \
- > $(CURDIR)/debian/tmp/vobject.1
+ -e 's/ vobject/\n vobject/' \
+ -e 's/vobject[^3]/vobject3 /'" \
+ > $(CURDIR)/debian/tmp/vobject3.1
help2man \
--help-option=\ \
--version-string=$(UPSTREAM) \
--no-info \
--include=$(CURDIR)/debian/generate_vcards.1.in \
- "echo -n Usage: && $(CURDIR)/bin/generate_vcards 2>&1 | tail -n+3" \
- > $(CURDIR)/debian/tmp/generate_vcards.1
+ "echo -n Usage: && $(CURDIR)/bin/generate_vcards3 2>&1 | tail -n+3 \
+ | sed -re 's/generate_vcards[^3]/generate_vcards3 /'" \
+ > $(CURDIR)/debian/tmp/generate_vcards3.1
dh_installman
get-orig-source:
diff --git a/debian/tests/control b/debian/tests/control
index 4b901ae..6597457 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,4 @@
-Test-Command: phpcs -v --standard=tests/phpcs/ruleset.xml /usr/share/php/Sabre/VObject
+Test-Command: phpcs -v --standard=tests/phpcs/ruleset.xml /usr/share/php/sabre21/Sabre/VObject
Depends: @, php-codesniffer
Test-Command: cd tests && phpunit
diff --git a/debian/vobject.1.in b/debian/vobject.1.in
index f1cab36..65e3212 100644
--- a/debian/vobject.1.in
+++ b/debian/vobject.1.in
@@ -1,2 +1,2 @@
[name]
-vobject \- sabre/vobject command line interface
+vobject3 \- sabre/vobject command line interface
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabre-vobject.git
More information about the Pkg-owncloud-commits
mailing list