[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-rc-51-g5c5d5dd

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 5c5d5ddd9f102ab2741aee39c9836f39469b18c8
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 15 16:55:17 2012 +0200

    Updated debian/rules for upstream changes; added a depend on libphp-phpmailer

diff --git a/debian/TODO b/debian/TODO
index 8627872..f5bdd68 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -15,5 +15,4 @@
 AFTER OC4 UPDATE:
 * fix patches
 * Debian has jquery 1.7.1 - OC ships 1.7.2, will it work?
-* lintian reported some new license files
 * lintian is complaining about some php-libs
diff --git a/debian/changelog b/debian/changelog
index bccabcf..78b0f41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ owncloud (4.0.0~rc-1) UNRELEASED; urgency=low
   * New upstream release 4.0.0-rc as of May 14th.
 
   [ Paul van Tilburg ]
-  * debian/copyright: updated for new upstream release.
+  * debian/control: added a depend on libphp-phpmailer.
+  * debian/copyright, debian/rules: updated for new upstream release.
 
  -- Thomas Mueller <thomas.mueller at tmit.eu>  Tue, 15 May 2012 00:42:12 +0200
 
diff --git a/debian/control b/debian/control
index 7265400..55b9bfa 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,7 @@ Depends:  ${misc:Depends}, dbconfig-common, debconf | debconf-2.0, ucf,
  apache2 | httpd,
  php5, php-pear, php-xml-parser, php-crypt-blowfish, php-sabredav,
  php-mdb2, php-mdb2-schema, php-mdb2-driver-mysql,
+ libphp-phpmailer,
  mysql-client | virtual-mysql-client,
  libjs-jquery-ui, libjs-jquery-jplayer, libjs-jquery
 Suggests: mysql-server
diff --git a/debian/rules b/debian/rules
index 9bbbc1e..1ff3878 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,21 +13,28 @@ override_dh_install:
 	install -m 0640 debian/config/apache/htaccess debian/owncloud/etc/owncloud/htaccess
 
 	# Remove PHP PEAR stuff; packages within Debian exist
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Archive/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Console/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Crypt_Blowfish/ # php-crypt-blowfish
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/PEAR/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/MDB2/ # php-mdb2-schema (not yet)
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/OS/ # php-pear
+	rm -r debian/owncloud/usr/share/owncloud/3rdparty/PEAR/ # php-pear
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Sabre # php-sabre (not yet)
 	rm -r debian/owncloud/usr/share/owncloud/3rdparty/XML/ # php-xml-parser / php-xml-rpc
 	rm debian/owncloud/usr/share/owncloud/3rdparty/MDB2.php # php-mdb2
-	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR.php # php-pear
+	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR*.php # php-pear
+	rm debian/owncloud/usr/share/owncloud/3rdparty/Sabre.includes.php # php-sabre (not yet)
 	rm debian/owncloud/usr/share/owncloud/3rdparty/System.php # php-pear
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/Sabre.includes.php # php-sabre (not yet)
+	rm debian/owncloud/usr/share/owncloud/3rdparty/class.phpmailer.php # libphp-phpmailer
+	rm debian/owncloud/usr/share/owncloud/3rdparty/class.smtp.php # libphp-phpmailer
 	rm -r debian/owncloud/usr/share/owncloud/lib/MDB2 # php-mdb2
 
 	# Remove redundant license files as it is already captured in debian/copyright.
+	rm debian/owncloud/usr/share/owncloud/3rdparty/PEAR-LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/js/chosen/LICENSE.md
 	rm debian/owncloud/usr/share/owncloud/3rdparty/fullcalendar/*-LICENSE.txt
+	rm debian/owncloud/usr/share/owncloud/3rdparty/php-cloudfiles/COPYING
+	rm debian/owncloud/usr/share/owncloud/3rdparty/simpletest/LICENSE
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/*-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/3rdparty/when/MIT-LICENSE.txt
 	rm debian/owncloud/usr/share/owncloud/apps/calendar/img/Icon\ License
@@ -37,7 +44,7 @@ override_dh_install:
 	rm debian/owncloud/usr/share/owncloud/3rdparty/getid3/license*.txt
 	rm debian/owncloud/usr/share/owncloud/settings/img/log\ Icon\ License
 
-	# remove other stuff
+	# Remove other stuff
 	rm debian/owncloud/usr/share/owncloud/3rdparty/timepicker/releases.txt
 	
 	# Remove an unused script and minified JavaScript files.
@@ -83,5 +90,7 @@ override_dh_fixperms:
 	find debian/owncloud/usr/share/owncloud/apps -type f -exec chmod -x {} \;
 	chmod -x debian/owncloud/usr/share/owncloud/core/css/jquery-ui*.css
 	chmod -x debian/owncloud/usr/share/owncloud/core/js/jquery.infieldlabel*.js
+	chmod -x debian/owncloud/usr/share/owncloud/lib/archive/tar.php
+	chmod -x debian/owncloud/usr/share/owncloud/lib/archive/zip.php
 	chmod -x debian/owncloud/usr/share/owncloud/settings/img/log.svg
 	chmod -x debian/owncloud/usr/share/owncloud/settings/personal.php

-- 
owncloud.git