[Pkg-owncloud-commits] [owncloud] 83/90: Simplify phpass install

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 498bef023ec957ed83db2dbba0f3bf6a680edd32
Author: David Prévot <taffit at debian.org>
Date:   Thu Oct 30 14:16:51 2014 -0400

    Simplify phpass install
    
    Git-Dch: Ignore
---
 debian/install | 2 +-
 debian/rules   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/install b/debian/install
index 024e682..639f05c 100644
--- a/debian/install
+++ b/debian/install
@@ -12,7 +12,7 @@ themes		var/lib/owncloud
 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/phpass/PasswordHash.php			usr/share/owncloud/3rdparty/phpass
 3rdparty/zxcvbn/js/zxcvbn.js				usr/share/owncloud/3rdparty/zxcvbn/js
 debian/autoload.php					usr/share/owncloud/3rdparty
 debian/viewer.css					usr/share/owncloud/apps/files_pdfviewer/3rdparty/pdfjs
diff --git a/debian/rules b/debian/rules
index 32bcf6d..7c74b8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_install:
 		-Xignorelist -Ximage-optimization.sh -Ximg/skin \
 		-Xjquery.inview.txt -Xjquery.json -X.js.template \
 		-Xl10n.pl -XLICENSE -XLicense.txt \
-		-Xpackage.json -Xphpass/c -Xphpass/test.php \
+		-Xpackage.json \
 		-XREADME. -Xrelease.sh \
 		-Xspec.txt \
 		-Xtemplateeditor/l10n -Xtests \

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