[Pkg-owncloud-commits] [php-sabre-vobject] 85/106: Update packaging

Fri Aug 22 15:11:07 UTC 2014

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

taffit pushed a commit to branch master
in repository php-sabre-vobject.

commit 97054dace27daa288adca07ce68cf13b8c6db2bd
Author: David Prévot <taffit at debian.org>
Date:   Fri Aug 8 22:16:42 2014 -0400

    Update packaging
---
 debian/control                                      | 12 ++++++------
 debian/copyright                                    |  6 +++---
 debian/install                                      |  2 +-
 ...assLoader-from-Symfony-instead-of-autoload.patch | 13 ++++++++-----
 ...bject-Workaround-the-lack-of-PSR-4-support.patch | 17 +++++++++++++++++
 .../DEP-8/Use-installed-class-for-DEP-8-tests.patch | 21 ---------------------
 debian/patches/series                               |  1 +
 debian/tests/control                                |  2 +-
 debian/tests/phpunit                                |  6 +-----
 9 files changed, 38 insertions(+), 42 deletions(-)

diff --git a/debian/control b/debian/control
index 788cb91..ec73086 100644
--- a/debian/control
+++ b/debian/control
@@ -18,13 +18,13 @@ Package: php-sabre-vobject
 Architecture: all
 Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
 Suggests: ${phpcomposer:Debian-suggest}
-Replaces: php-sabredav (<< 1.7)
-Breaks: php-sabredav (<< 1.7)
+Replaces: ${phpcomposer:Debian-replace}
+Breaks: ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace}
+Provides: ${phpcomposer:Debian-provide}
 Description: library to parse and manipulate iCalendar and vCard objects
- The SabreTooth VObject library allows one to easily parse and
- manipulate iCalendar and vCard objects using PHP. The goal of the
- VObject library is to create a very complete library, with an easy to
- use API.
+ ${phpcomposer:description}.
+ The goal of the VObject library is to create a very complete library,
+ with an easy to use API.
  .
  This project is a spin-off from SabreDAV, where it has been used for
  several years.
diff --git a/debian/copyright b/debian/copyright
index 8e4228e..a57d17f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,13 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: sabre-vobject
+Upstream-Name: sabre/vobject
 Source: https://github.com/fruux/sabre-vobject
 Upstream-Contact: Evert Pot <evert at rooftopsolutions.nl>
 
 Files: *
 Copyright: 2007-2014, fruux GmbH (https://fruux.com/)
-License: BSD-3-clause-Sabre
+License: BSD-3-clause
 
-License: BSD-3-clause-Sabre
+License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
  .
diff --git a/debian/install b/debian/install
index d5112df..4dbcccf 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1 @@
-lib/*	/usr/share/php/
+lib/*	usr/share/php/Sabre/VObject
diff --git a/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch b/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
index 78e0f4f..6dd7111 100644
--- a/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
+++ b/debian/patches/0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
@@ -4,17 +4,19 @@ Subject: Use ClassLoader from Symfony instead of autoload
 
 Work around the lack of proper autoload.php from composer by using the
 ClassLoader element from Symfony.
+
 http://symfony.com/doc/current/components/class_loader/class_loader.html
+
 Forwarded: not-needed
 ---
- tests/bootstrap.php | 19 ++++++++-----------
- 1 file changed, 8 insertions(+), 11 deletions(-)
+ tests/bootstrap.php | 20 +++++++++-----------
+ 1 file changed, 9 insertions(+), 11 deletions(-)
 
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index e89e9a2..9d20e1c 100644
+index e89e9a2..46ff855 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -2,17 +2,14 @@
+@@ -2,17 +2,15 @@
  
  date_default_timezone_set('UTC');
  
@@ -35,7 +37,8 @@ index e89e9a2..9d20e1c 100644
 +$loader->setUseIncludePath(true);
 +$loader->register();
 +$loader->addPrefixes(array(
-+	'Sabre' => __DIR__.'/../lib',
++// ClassLoader does not yet support PSR-4
++//	'Sabre' => __DIR__.'/../lib',
 +));
  
  if (!defined('SABRE_TEMPDIR')) {
diff --git a/debian/patches/0002-Subject-Workaround-the-lack-of-PSR-4-support.patch b/debian/patches/0002-Subject-Workaround-the-lack-of-PSR-4-support.patch
new file mode 100644
index 0000000..96b8fa7
--- /dev/null
+++ b/debian/patches/0002-Subject-Workaround-the-lack-of-PSR-4-support.patch
@@ -0,0 +1,17 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
+Date: Fri, 8 Aug 2014 22:07:08 -0400
+Subject: Subject: Workaround the lack of PSR-4 support
+
+---
+ tests/Sabre/VObject | 1 +
+ 1 file changed, 1 insertion(+)
+ create mode 120000 tests/Sabre/VObject
+
+diff --git a/tests/Sabre/VObject b/tests/Sabre/VObject
+new file mode 120000
+index 0000000..58677dd
+--- /dev/null
++++ b/tests/Sabre/VObject
+@@ -0,0 +1 @@
++../../lib
+\ No newline at end of file
diff --git a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch b/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
deleted file mode 100644
index 4e2c0cc..0000000
--- a/debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit at debian.org>
-Date: Wed, 19 Mar 2014 11:08:51 -0400
-Subject: Use installed class for DEP-8 tests
-
-Gbp: Topic DEP-8
----
- tests/bootstrap.php | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index 9d20e1c..f372a56 100644
---- a/tests/bootstrap.php
-+++ b/tests/bootstrap.php
-@@ -8,7 +8,6 @@ $loader = new ClassLoader();
- $loader->setUseIncludePath(true);
- $loader->register();
- $loader->addPrefixes(array(
--	'Sabre' => __DIR__.'/../lib',
- ));
- 
- if (!defined('SABRE_TEMPDIR')) {
diff --git a/debian/patches/series b/debian/patches/series
index e4166b6..3358cd9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Use-ClassLoader-from-Symfony-instead-of-autoload.patch
+0002-Subject-Workaround-the-lack-of-PSR-4-support.patch
diff --git a/debian/tests/control b/debian/tests/control
index 514e745..8798618 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,4 +3,4 @@ Depends: @, php-codesniffer
 
 Tests: phpunit
 Restrictions: rw-build-tree
-Depends: @, patch, php-symfony-classloader, phpunit
+Depends: @, php-symfony-classloader, phpunit, quilt
diff --git a/debian/tests/phpunit b/debian/tests/phpunit
index 7584ea9..fcaf159 100755
--- a/debian/tests/phpunit
+++ b/debian/tests/phpunit
@@ -1,8 +1,4 @@
 #! /bin/sh
-patch -p1 < debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
+quilt pop -f
 cd tests
 phpunit
-exit=$?
-cd ..
-patch -Rp1 < debian/patches/DEP-8/Use-installed-class-for-DEP-8-tests.patch
-exit $exit

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

