[Pkg-owncloud-commits] [owncloud] 04/13: Refresh patches

David Prévot taffit at alioth.debian.org
Sun Sep 1 03:39:34 UTC 2013


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

taffit pushed a commit to branch master
in repository owncloud.

commit 258818d2dd573024eb9ecf9e1dae8cc29ae5514d
Author: David Prévot <taffit at debian.org>
Date:   Tue Aug 20 11:16:21 2013 +0200

    Refresh patches
    
    Git-Dch: Ignore
---
 debian/patches/05_no_app_store.diff       |    8 ++++----
 debian/patches/fix_displayed_version.diff |    8 ++++----
 debian/patches/fix_log_path.diff          |    4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/debian/patches/05_no_app_store.diff b/debian/patches/05_no_app_store.diff
index 3fbd001..9df2dcc 100644
--- a/debian/patches/05_no_app_store.diff
+++ b/debian/patches/05_no_app_store.diff
@@ -3,7 +3,7 @@ Description: Disable the app store
 Author: Thomas Mueller <thomas.mueller at tmit.eu>
 Forwarded: not-needed
 Reviewed-by: David Prévot <taffit at debian.org>
-Last-Update: 2013-07-10
+Last-Update: 2013-08-20
 --- a/lib/setup.php
 +++ b/lib/setup.php
 @@ -87,6 +87,8 @@
@@ -17,7 +17,7 @@ Last-Update: 2013-07-10
  				$dbpass = $options['dbpass'];
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -71,8 +71,10 @@
+@@ -74,8 +74,10 @@
  /* URL to use for the help page, server should understand OCS */
  "knowledgebaseurl" => "http://api.apps.owncloud.com/v1",
  
@@ -30,7 +30,7 @@ Last-Update: 2013-07-10
  
  /* URL of the appstore to use, server should understand OCS */
  "appstoreurl" => "http://api.apps.owncloud.com/v1",
-@@ -159,11 +161,12 @@
+@@ -162,11 +164,12 @@
   key 'path' is for the fs path and the key 'url' is for the http path to your
   applications paths. 'writable' indicate if the user can install apps in this folder.
   You must have at least 1 app folder writable or you must set the parameter : appstoreenabled to false
@@ -107,7 +107,7 @@ Last-Update: 2013-07-10
  
 --- a/lib/util.php
 +++ b/lib/util.php
-@@ -195,7 +195,7 @@
+@@ -196,7 +196,7 @@
  		}
  
  		// Check if there is a writable install folder.
diff --git a/debian/patches/fix_displayed_version.diff b/debian/patches/fix_displayed_version.diff
index 34c1b18..88c59a4 100644
--- a/debian/patches/fix_displayed_version.diff
+++ b/debian/patches/fix_displayed_version.diff
@@ -4,10 +4,10 @@ Description: Fix displayed version
  displayed version fixed to make it clear that’s a Debian package.
 Author: David Prévot <taffit at debian.org>
 Forwarded: not-needed
-Last-Update: 2013-07-14
+Last-Update: 2013-08-20
 --- a/lib/updater.php
 +++ b/lib/updater.php
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
  	public static function ShowUpdatingHint() {
  		$l = OC_L10N::get('lib');
  
@@ -18,7 +18,7 @@ Last-Update: 2013-07-14
  				$txt='<span style="color:#AA0000; font-weight:bold;">'
 --- a/settings/templates/admin.php
 +++ b/settings/templates/admin.php
-@@ -229,7 +229,7 @@
+@@ -243,7 +243,7 @@
  
  <fieldset class="personalblock">
  	<legend><strong><?php p($l->t('Version'));?></strong></legend>
@@ -40,7 +40,7 @@ Last-Update: 2013-07-14
  <?php endif; ?>
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -122,8 +122,8 @@
+@@ -125,8 +125,8 @@
  /* Check 3rdparty apps for malicious code fragments */
  "appcodechecker" => "",
  
diff --git a/debian/patches/fix_log_path.diff b/debian/patches/fix_log_path.diff
index 86108ce..046276d 100644
--- a/debian/patches/fix_log_path.diff
+++ b/debian/patches/fix_log_path.diff
@@ -3,10 +3,10 @@ Description: Improve logfile handling
 Author: David Prévot <taffit at debian.org>
 Bug-Debian: http://bugs.debian.org/715484
 Forwarded: not-needed
-Last-Update: 2013-07-14
+Last-Update: 2013-08-20
 --- a/config/config.sample.php
 +++ b/config/config.sample.php
-@@ -128,7 +128,7 @@
+@@ -131,7 +131,7 @@
  /* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
  "log_type" => "owncloud",
  

-- 
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