[Pkg-owncloud-commits] [owncloud] 57/59: Refresh patches
David Prévot
taffit at moszumanska.debian.org
Fri Jul 18 16:19: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 3bd62e16f75949bee84866b581e7dab259efdf7a
Author: David Prévot <taffit at debian.org>
Date: Fri Jul 18 09:50:10 2014 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 6 +++---
debian/patches/0002-Fix-displayed-version.patch | 2 +-
debian/patches/0003-Improve-logfile-handling.patch | 2 +-
debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 390d35c..3de320b 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -23,7 +23,7 @@ Last-Update: 2014-04-22
8 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 1bfae36..2cf0ec5 100644
+index 24c1579..7d772f8 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -84,8 +84,10 @@ $CONFIG = array(
@@ -38,7 +38,7 @@ index 1bfae36..2cf0ec5 100644
+"appstoreenabled" => false,
/* URL of the appstore to use, server should understand OCS */
- "appstoreurl" => "http://api.apps.owncloud.com/v1",
+ "appstoreurl" => "https://api.owncloud.com/v1",
@@ -238,11 +240,12 @@ $CONFIG = array(
key 'path' is for the fs path and the key 'url' is for the http path to your
applications paths. 'writable' indicates whether the user can install apps in this folder.
@@ -81,7 +81,7 @@ index 7bf04f1..994b312 100644
}
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
-index 39d7e9c..ccd4f1a 100644
+index dc52fc2..542d831 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -64,7 +64,7 @@ class OC_OCSClient{
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index b1d364c..e31a2ad 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -18,7 +18,7 @@ Last-Update: 2013-10-17
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 2cf0ec5..0123c61 100644
+index 7d772f8..339ad3d 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -156,8 +156,8 @@ $CONFIG = array(
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 2aae110..705e822 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -13,7 +13,7 @@ Last-Update: 2013-10-23
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/config.sample.php b/config/config.sample.php
-index 0123c61..9e54c2e 100644
+index 339ad3d..eabc688 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -171,7 +171,7 @@ $CONFIG = array(
diff --git a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
index e01b0fb..4c57bf9 100644
--- a/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
+++ b/debian/patches/path/0006-Adapt-Crypt_Blowfish-path.patch
@@ -12,7 +12,7 @@ Last-Update: 2013-10-14
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
-index ee2c402..c0f604d 100644
+index 69ccce0..ff60572 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,7 @@
--
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