[Pkg-owncloud-commits] [owncloud] 271/273: Update packaging
David Prévot
taffit at moszumanska.debian.org
Fri Jul 4 03:13:31 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit e13c856f4edf044fed3b1f56042142252a3194f0
Author: David Prévot <taffit at debian.org>
Date: Thu Jul 3 22:39:02 2014 -0400
Update packaging
Depend on zendframework again (lucene search is back).
Git-Dch: Full
---
debian/autoload.php | 7 +++++--
debian/control | 1 +
debian/copyright | 29 +++++++++++++++++------------
debian/install | 15 ++++++++-------
debian/rules | 5 ++++-
5 files changed, 35 insertions(+), 22 deletions(-)
diff --git a/debian/autoload.php b/debian/autoload.php
index eac2573..fcf6cff 100644
--- a/debian/autoload.php
+++ b/debian/autoload.php
@@ -9,8 +9,11 @@ use Symfony\Component\ClassLoader\ClassLoader;
$loader = new ClassLoader();
$loader->setUseIncludePath(true);
$loader->register();
-require_once 'libphp-phpmailer/class.phpmailer.php';
+$loader->addPrefixes(array(
+ 'Realestate\\MssqlBundle' => __DIR__.'/isoft/mssql-bundle',
+));
-// Load the additional file as registered in composer
+// Load additional files as registered in composer
+require_once 'libphp-phpmailer/class.phpmailer.php';
require_once 'Assetic/functions.php';
require_once 'Crypt/Random.php';
diff --git a/debian/control b/debian/control
index 6adfb44..4500206 100644
--- a/debian/control
+++ b/debian/control
@@ -48,6 +48,7 @@ Depends: apache2 | httpd,
php5-gd,
php5-json,
php5-mysql | php5-pgsql | php5-sqlite,
+ zendframework,
${misc:Depends}
Recommends: exim4 | mail-transport-agent,
libav-tools,
diff --git a/debian/copyright b/debian/copyright
index db686f2..a912d01 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -81,6 +81,7 @@ Copyright: 2010, 2012-2014, Frank Karlitschek <frank at owncloud.org>
2014, Andreas Fischer <bantu at owncloud.com>
2014, Stephen Colebrook <scolebrook at mac.com>
2014, Raghu Nayyar <beingminimal at gmail.com>
+ 2014, Jörn Friedrich Dreyer <jfd at owncloud.com>
License: AGPL-3+
Files: 3rdparty/Archive/Tar.php
@@ -101,18 +102,21 @@ Files: 3rdparty/fontawesome/*
Copyright: 2013, Dave Gandy <dave at davegandy.com>
License: CC-BY-3
-Files: 3rdparty/mcnetic/*
-Copyright: 2013-2014, Nicolai Ehemann <en at enlightened.de>
-License: GPL-3+
-
-Files: 3rdparty/phpmailer/*
-Copyright: 2010, 2012-2014, Marcus Bointon
+Files: 3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/*
+ 3rdparty/phpmailer/*
+Copyright: 2011-2013, Scott Morken <scott.morken at pcmail.maricopa.edu>
+ 2011-2013, Ken Golovin <ken at webplanet.co.nz>
+ 2010, 2012-2014, Marcus Bointon
2010-2012, Jim Jagielski
2004-2009, Andy Prevost
2009-2010, Michael Rushton
2002-2004, Duke University
License: LGPL-2.1+
+Files: 3rdparty/mcnetic/*
+Copyright: 2013-2014, Nicolai Ehemann <en at enlightened.de>
+License: GPL-3+
+
Files: 3rdparty/phpmailer/phpmailer/examples/*
Copyright: 2010, 2012-2014, Marcus Bointon
License: LGPL-3+
@@ -149,7 +153,6 @@ Files: 3rdparty/sabre/dav/bin/googlecode_upload.py
3rdparty/rackspace/php-opencloud/*
apps/files_external/3rdparty/aws-sdk-php/*
apps/files_external/3rdparty/google-api-php-client/*
- apps/files_external/3rdparty/php-opencloud/*
apps/files_pdfviewer/3rdparty/pdfjs/*
apps/files_pdfviewer/templates/pdf.php
apps/files_texteditor/css/DroidSansMono/*
@@ -175,6 +178,7 @@ Files: 3rdparty/Jcrop/*
3rdparty/doctrine/*
3rdparty/fontawesome/css/*
3rdparty/guzzle/*
+ 3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/RealestateMssqlBundle.php
3rdparty/js/chosen/*
3rdparty/js/strengthify/*
3rdparty/kriswallsmith/*
@@ -196,10 +200,6 @@ Files: 3rdparty/Jcrop/*
apps/files_external/3rdparty/aws-sdk-php/Monolog/*
apps/files_external/3rdparty/aws-sdk-php/Symfony/*
apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
- apps/files_external/3rdparty/php-opencloud/lib/Autoload.php
- apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/AbstractLogger.php
- apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LogLevel.php
- apps/files_external/3rdparty/php-opencloud/lib/OpenCloud/Common/Log/LoggerInterface.php
apps/files_pdfviewer/3rdparty/pdfjs/l10n.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-r.js
apps/files_texteditor/js/vendor/ace/src-noconflict/mode-rdoc.js
@@ -438,11 +438,16 @@ License: AGPL-3+
Files: apps/files_videoviewer/js/*
apps/files_videoviewer/mediaelement/*
-Copyright: 2010-2013, John Dyer (http://j.hn)
+ apps/files_videoviewer/src/*
+Copyright: 2010-2014, John Dyer (http://j.hn)
2011, Dustin Diaz
2011, Jacob Thornton
License: Expat and GPL-2
+Files: apps/search_lucene/3rdparty/Zend/*
+Copyright: 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+License: BSD-3-clause-Zend
+
Files: core/js/tests/lib/sinon-1.7.3.js
Copyright: 2010-2013, Christian Johansen <christian at cjohansen.no>
License: BSD-3-clause-Christian_Johansen
diff --git a/debian/install b/debian/install
index d4a4358..a9e72f3 100644
--- a/debian/install
+++ b/debian/install
@@ -9,13 +9,14 @@ settings usr/share/owncloud
themes var/lib/owncloud
# Third party
-3rdparty/css/strengthify/strengthify.css usr/share/owncloud/3rdparty/css/strengthify
-3rdparty/js/md5/md5.js usr/share/owncloud/3rdparty/js/md5
-3rdparty/js/strengthify/jquery.strengthify.js usr/share/owncloud/3rdparty/js/strengthify
-3rdparty/mcnetic/phpzipstreamer/ZipStreamer.php usr/share/owncloud/3rdparty/mcnetic/phpzipstreamer
-3rdparty/phpass usr/share/owncloud/3rdparty
-3rdparty/zxcvbn/js/zxcvbn.js usr/share/owncloud/3rdparty/zxcvbn/js
-debian/autoload.php usr/share/owncloud/3rdparty
+3rdparty/css/strengthify/strengthify.css usr/share/owncloud/3rdparty/css/strengthify
+3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle usr/share/owncloud/3rdparty/isoft/mssql-bundle/Realestate
+3rdparty/js/md5/md5.js usr/share/owncloud/3rdparty/js/md5
+3rdparty/js/strengthify/jquery.strengthify.js usr/share/owncloud/3rdparty/js/strengthify
+3rdparty/mcnetic/phpzipstreamer/ZipStreamer.php usr/share/owncloud/3rdparty/mcnetic/phpzipstreamer
+3rdparty/phpass usr/share/owncloud/3rdparty
+3rdparty/zxcvbn/js/zxcvbn.js usr/share/owncloud/3rdparty/zxcvbn/js
+debian/autoload.php usr/share/owncloud/3rdparty
# Files
db_structure.xml usr/share/owncloud
diff --git a/debian/rules b/debian/rules
index 44ff703..05acb8c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,8 @@ override_dh_install:
rm debian/owncloud/usr/share/owncloud/core/js/jquery.inview.txt
# Remove other useless documentation
+ rm debian/owncloud/usr/share/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/composer.json
+ rm debian/owncloud/usr/share/owncloud/3rdparty/isoft/mssql-bundle/Realestate/MssqlBundle/Readme.md
rm debian/owncloud/usr/share/owncloud/apps/*/README.md
rm debian/owncloud/usr/share/owncloud/apps/contacts/Changelog
rm debian/owncloud/usr/share/owncloud/apps/contacts/composer.json
@@ -41,6 +43,7 @@ override_dh_install:
rm -r debian/owncloud/usr/share/owncloud/apps/*/tests
rm debian/owncloud/usr/share/owncloud/apps/contacts/.jshintrc
rm -r debian/owncloud/usr/share/owncloud/apps/documents/src
+ rm -r debian/owncloud/usr/share/owncloud/apps/files_videoviewer/src
rm debian/owncloud/usr/share/owncloud/core/img/image-optimization.sh
rm debian/owncloud/usr/share/owncloud/core/l10n/ignorelist
rm debian/owncloud/usr/share/owncloud/core/l10n/xgettextfiles
@@ -107,7 +110,7 @@ override_dh_install:
rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/Dropbox
rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/aws-sdk-php
rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/google-api-php-client
- rm -r debian/owncloud/usr/share/owncloud/apps/files_external/3rdparty/php-opencloud
+ rm -r debian/owncloud/usr/share/owncloud/apps/search_lucene/3rdparty/Zend
# Fix displayed version
sed -i "s/@VERSION@/$(VERSION) (Debian)/" \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list