[Pkg-owncloud-commits] [SCM] owncloud.git branch, no_var_install, updated. debian/4.0.1debian-2-21-g0f559ae

[Paul van Tilburg]

The following commit has been merged in the no_var_install branch:
commit e75f026dbe87cf87984857db025c17df93019d9f
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Wed Jun 13 22:00:02 2012 +0200

    Install htaccess via debian/owncloud.install; don't remove stuff not intalled anymore

diff --git a/debian/owncloud.install b/debian/owncloud.install
index a196de4..4758719 100644
--- a/debian/owncloud.install
+++ b/debian/owncloud.install
@@ -22,5 +22,7 @@ themes/* /var/lib/owncloud/themes
 # Files.
 db_structure.xml /usr/share/owncloud
 *.php /usr/share/owncloud
+
 # Debian-specific stuff.
 debian/config/apache/owncloud.conf /etc/apache2/conf.d
+debian/config/apache/htaccess /etc/owncloud
diff --git a/debian/rules b/debian/rules
index 4530c81..bc2858d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,29 +9,8 @@
 
 override_dh_install:
 	dh_install
-	# Install config files
-	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/MDB2/ # php-mdb2, php-mdb2-schema
-	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
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/XML/ # php-xml-parser / php-xml-rpc
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/getid3 # php-getid3
-	rm -r debian/owncloud/usr/share/owncloud/3rdparty/simpletest # not used
-	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/Sabre.includes.php # php-sabre
-	rm debian/owncloud/usr/share/owncloud/3rdparty/System.php # php-pear
-	rm debian/owncloud/usr/share/owncloud/3rdparty/class.phpmailer.php # libphp-phpmailer
-	rm debian/owncloud/usr/share/owncloud/3rdparty/class.smtp.php # libphp-phpmailer
 
 	# 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

-- 
owncloud.git