[Pkg-owncloud-commits] [SCM] php-sabredav.git branch, master, updated. upstream/1.6.2-2-g97a4043

Sat May 19 20:44:53 UTC 2012

The following commit has been merged in the master branch:
commit 97a40434ea70dfd2ace9e9844fa17a758d63ec8b
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Sat May 19 22:44:45 2012 +0200

    overall cleanup

diff --git a/debian/TODO b/debian/TODO
new file mode 100644
index 0000000..7951b91
--- /dev/null
+++ b/debian/TODO
@@ -0,0 +1,9 @@
+SabreDAV packaging TODO list
+============================
+
+Low priority/later
+------------------
+
+* Tests cannot be executed, because t requires a mysql database instance
+* Tests depend on PHPUnit_Framework_TestCase, which is not available in Debian
+
diff --git a/debian/changelog b/debian/changelog
index 885f095..de38819 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-php-sabredav (1.6.2-1) unstable; urgency=low
+php-sabredav (1.6.2-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #670876)
 
diff --git a/debian/control b/debian/control
index 5090d99..008128b 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,16 @@ Section: php
 Priority: optional
 Maintainer: Thomas Mueller <thomas.mueller at tmit.eu>
 Uploaders: Paul van Tilburg <paulvt at debian.org>
+DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.0.0)
 Standards-Version: 3.9.3
 Homepage: http://http://code.google.com/p/sabredav/
-#Vcs-Git: git://git.debian.org/collab-maint/sabredav.git
-#Vcs-Browser: http://git.debian.org/?p=collab-maint/sabredav.git;a=summary
+Vcs-Git: git://git.debian.org/pkg-owncloud/php-sabredav.git
+Vcs-Browser: http://git.debian.org/?p=pkg-owncloud/php-sabredav.git;a=summary
 
 Package: php-sabredav
 Architecture: all
-Depends: ${misc:Depends}
+Depends: php5 | php5-cli, ${misc:Depends}
 Description: SabreDAV allows you to easily add WebDAV support to a PHP application
  SabreDAV is meant to cover the entire standard, and attempts to allow 
  integration using an easy to understand API.
diff --git a/debian/copyright b/debian/copyright
index 43603b3..fcf0920 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,25 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sabredav
 Source: http://code.google.com/p/sabredav/
+Upstream-Contact: SabreDAV mailinglist <sabredav-discuss at googlegroups.com>
 
 Files: *
-Copyright: 2007-2011 Rooftop Solutions
-License: Modified BSD License
+Copyright: 2007-2012 Rooftop Solutions
+           2007-2009 FileMobile inc.
+License: BSD-3-clause-SabreDAV
  Redistribution and use in source and binary forms, with or without modification,
  are permitted provided that the following conditions are met:
  .
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
+ * Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
  .
-  2. Redistributions in binary form must reproduce the above copyright notice,
-     this list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
  .
-  3. Neither the name of the SabreDAV nor the names of its contributors
-     may be used to endorse or promote products derived from this software
-     without specific prior written permission.
+ * Neither the name of the SabreDAV nor the names of its contributors
+   may be used to endorse or promote products derived from this software
+   without specific prior written permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
  IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
@@ -34,24 +36,20 @@ License: Modified BSD License
 Files: debian/*
 Copyright: 2012 Thomas Mueller <thomas.mueller at tmit.eu>
 License: GPL-2+
- This program is free software; you can redistribute it
- and/or modify it under the terms of the GNU General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later
- version.
+ This program is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the Free
+ Software Foundation; either version 2 of the License, or (at your option)
+ any later version.
  .
- This program is distributed in the hope that it will be
- useful, but WITHOUT ANY WARRANTY; without even the implied
- warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- PURPOSE.  See the GNU General Public License for more
- details.
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ for more details.
  .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA  02110-1301 USA
+ You should have received a copy of the GNU General Public License along
+ with this package; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  .
- On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
- `/usr/share/common-licenses/GPL-2'.
+ On Debian systems, the full text of the GNU General Public License
+ version 2 can be found in the file `/usr/share/common-licenses/GPL-2'.
 
diff --git a/debian/php-sabredav.dirs b/debian/php-sabredav.dirs
deleted file mode 100644
index 675a234..0000000
--- a/debian/php-sabredav.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/share/php
-
diff --git a/debian/php-sabredav.examples b/debian/php-sabredav.examples
new file mode 100644
index 0000000..e39721e
--- /dev/null
+++ b/debian/php-sabredav.examples
@@ -0,0 +1 @@
+examples/*
diff --git a/debian/php-sabredav.install b/debian/php-sabredav.install
new file mode 100644
index 0000000..4f15715
--- /dev/null
+++ b/debian/php-sabredav.install
@@ -0,0 +1 @@
+lib/* /usr/share/php/
diff --git a/debian/rules b/debian/rules
index 275d924..f940127 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,6 @@
 %:
 	dh $@
 
-override_dh_install:
-	cp -r lib/* debian/php-sabredav/usr/share/php/
-
 get-orig-source:
 	uscan --force --verbose --rename
 

-- 
php-sabredav.git

