This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch stable8
in repository owncloud.
commit 68726760e6a95022e5ef96f110b802a59431076c
Author: David Prévot <taffit at debian.org>
Date: Fri May 8 19:14:26 2015 -0400
Refresh patches
Git-Dch: Ignore
---
debian/patches/0001-Disable-the-appstore.patch | 6 +++---
debian/patches/0002-Fix-displayed-version.patch | 6 +++---
debian/patches/0003-Improve-logfile-handling.patch | 4 ++--
debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/debian/patches/0001-Disable-the-appstore.patch b/debian/patches/0001-Disable-the-appstore.patch
index 45dbcb4..1b50a8a 100644
--- a/debian/patches/0001-Disable-the-appstore.patch
+++ b/debian/patches/0001-Disable-the-appstore.patch
@@ -52,7 +52,7 @@ index 45aaf6a..c79ed0b 100644
),
diff --git a/lib/base.php b/lib/base.php
-index ec87548..97e6c3e 100644
+index a9d582d..a7264f0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -205,7 +205,7 @@ class OC {
@@ -91,7 +91,7 @@ index f10a974..e1a4be5 100644
/**
diff --git a/lib/private/util.php b/lib/private/util.php
-index 102dc8c..5f06787 100644
+index 367199f..8eee9e1 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -590,7 +590,7 @@ class OC_Util {
@@ -104,7 +104,7 @@ index 102dc8c..5f06787 100644
|| !is_writable(OC_App::getInstallPath())
|| !is_readable(OC_App::getInstallPath())
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
-index fb25917..ab829e1 100644
+index 6bbde71..c6e189e 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -29,7 +29,7 @@ script(
diff --git a/debian/patches/0002-Fix-displayed-version.patch b/debian/patches/0002-Fix-displayed-version.patch
index a1cf61a..a0bb472 100644
--- a/debian/patches/0002-Fix-displayed-version.patch
+++ b/debian/patches/0002-Fix-displayed-version.patch
@@ -31,7 +31,7 @@ index c79ed0b..252b0f1 100644
/**
* Is ownCloud connected to the Internet or running in a closed network?
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index 448276c..3b67d5b 100644
+index 0e1a8f3..af9ba0d 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -75,7 +75,7 @@ class OC_TemplateLayout extends OC_Template {
@@ -44,10 +44,10 @@ index 448276c..3b67d5b 100644
$updater = new \OC\Updater(\OC::$server->getHTTPHelper(),
\OC::$server->getConfig());
diff --git a/lib/private/util.php b/lib/private/util.php
-index 5f06787..528400c 100644
+index 8eee9e1..2596917 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
-@@ -1394,7 +1394,7 @@ class OC_Util {
+@@ -1380,7 +1380,7 @@ class OC_Util {
* @return string
*/
public static function getHumanVersion() {
diff --git a/debian/patches/0003-Improve-logfile-handling.patch b/debian/patches/0003-Improve-logfile-handling.patch
index 8d28e17..5d5e686 100644
--- a/debian/patches/0003-Improve-logfile-handling.patch
+++ b/debian/patches/0003-Improve-logfile-handling.patch
@@ -29,10 +29,10 @@ index 252b0f1..0e53e89 100644
/**
* Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
diff --git a/lib/base.php b/lib/base.php
-index 97e6c3e..6f630d2 100644
+index a7264f0..506f894 100644
--- a/lib/base.php
+++ b/lib/base.php
-@@ -744,7 +744,7 @@ class OC {
+@@ -751,7 +751,7 @@ class OC {
if ($systemConfig->getValue('installed', false) && $systemConfig->getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
//don't try to do this before we are properly setup
//use custom logfile path if defined, otherwise use default of owncloud.log in data directory
diff --git a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
index 88c18f4..43fc109 100644
--- a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
+++ b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
@@ -124,7 +124,7 @@ index 0000000..fc17944
+ }
+}
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
-index 3b67d5b..75125f0 100644
+index af9ba0d..6253911 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -37,7 +37,7 @@ use Assetic\AssetWriter;
@@ -136,7 +136,7 @@ index 3b67d5b..75125f0 100644
use OC\Assetic\SeparatorFilter; // waiting on upstream
/**
-@@ -209,7 +209,7 @@ class OC_TemplateLayout extends OC_Template {
+@@ -210,7 +210,7 @@ class OC_TemplateLayout extends OC_Template {
), $root, $file);
}
return new FileAsset($root . '/' . $file, array(
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git