[Pkg-owncloud-commits] [owncloud] 50/52: Refresh patch

[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 124ef0747fd1e5ffb403b1ec3428902f128d5794
Author: David Prévot <taffit at debian.org>
Date:   Sun Dec 1 20:57:05 2013 -0400

    Refresh patch
    
    Git-Dch: Ignore
---
 debian/patches/0001-Disable-the-appstore.patch     |  2 +-
 debian/patches/0002-Fix-displayed-version.patch    |  2 +-
 .../0017-remove-unnecessary-sub-select.patch       | 31 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index a6b20b7..f8ad675 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -135,7 +135,7 @@ index b5c530a..595495d 100644
  			$dbSetup->initialize($options);
  			$dbSetup->setupDatabase($username);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index b5c5546..66a946f 100644
+index 38de07a..c0aba82 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -322,7 +322,7 @@ class OC_Util {
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index bb17ccb..c408d74 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -46,7 +46,7 @@ index 625f342..ed21f88 100644
  				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
  					$this->assign('updateAvailable', true);
 diff --git a/lib/private/util.php b/lib/private/util.php
-index 66a946f..98120d6 100644
+index c0aba82..6c24b6b 100644
 --- a/lib/private/util.php
 +++ b/lib/private/util.php
 @@ -1117,7 +1117,7 @@ class OC_Util {
diff --git a/debian/patches/0017-remove-unnecessary-sub-select.patch b/debian/patches/0017-remove-unnecessary-sub-select.patch
deleted file mode 100644
index 605d636..0000000
--- a/debian/patches/0017-remove-unnecessary-sub-select.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: daniel <git at danger-it.de>
-Date: Thu, 28 Nov 2013 20:14:46 +0100
-Subject: remove unnecessary sub-select
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-
-member_id is the primary key and therefore unique => the nested select statement is not necessary and only adds additional computational overhead on the db.
-
-That fixes the “documents-app causes upgrading OC6beta5 to RC1 to hang”
-issue.
-
-Bugs: https://github.com/owncloud/documents/issues/135
-Origin: vendor, https://github.com/owncloud/documents/commit/a9f1c04ed23774fcd0830d3f6563ad0f04dd43c5
----
- apps/documents/appinfo/update.php | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/apps/documents/appinfo/update.php b/apps/documents/appinfo/update.php
-index b89894d..18ed655 100644
---- a/apps/documents/appinfo/update.php
-+++ b/apps/documents/appinfo/update.php
-@@ -11,7 +11,7 @@
- 
- $installedVersion = \OCP\Config::getAppValue('documents', 'installed_version');
- 
--$cleanup = \OC_DB::prepare('DELETE FROM `*PREFIX*documents_member` WHERE `member_id` NOT IN(SELECT `member_id` from `*PREFIX*documents_member` WHERE `last_activity`>0)');
-+$cleanup = \OC_DB::prepare('DELETE FROM `*PREFIX*documents_member` WHERE `last_activity`=0 or `last_activity` is NULL');
- $cleanup->execute();
- 
- if (version_compare($installedVersion, '0.7', '<=')) {
diff --git a/debian/patches/series b/debian/patches/series
index f501648..04b28e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,3 @@ path/0013-Adapt-google-api-php-client-path.patch
 path/0014-Adapt-Dropbox-path.patch
 path/0015-Adapt-php-opencloud-path.patch
 path/0016-Adapt-Zend-path.patch
-0017-remove-unnecessary-sub-select.patch

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