[Pkg-owncloud-commits] [owncloud] 01/01: Refresh Adam Williamson’s patch

Wed May 6 18:39:47 UTC 2015

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

taffit pushed a commit to branch stable8
in repository owncloud.

commit 4b5f1734d4dac4d1a8bf0a149fb352b0273673a3
Author: David Prévot <taffit at debian.org>
Date:   Wed May 6 14:39:15 2015 -0400

    Refresh Adam Williamson’s patch
    
    Git-Dch: Ignore
---
 debian/copyright                                   |  2 +-
 .../0008-use-JSqueeze-instead-of-JSMin-13052.patch | 46 ++++++++++++----------
 2 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 03a277e..af2c393 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -51,7 +51,6 @@ Copyright: 2011-2015, Robin Appelman <icewind1991 at gmail.com>
            2014, Christian Weiske <cweiske at cweiske.de>
            2014, Raghu Nayyar <beingminimal at gmail.com>
            2014, Clark Tomlinson <clark at owncloud.com>
-           2014, Robin McCorkell <rmccorkell at karoshi.org.uk>
 License: AGPL-3+
 
 Files: 3rdparty/phpmailer/phpmailer/*
@@ -142,6 +141,7 @@ Files: 3rdparty/bantu/ini-get-wrapper/*
        core/js/jquery-tipsy.js
        core/js/placeholders.js
        core/vendor/*
+       lib/private/assetic/jsqueeze2filter.php
        lib/private/log/errorlog.php
 Copyright: 2012-2014, Andreas Fischer <bantu at owncloud.com>
            2011, Nils Adermann <naderman at naderman.de>
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 375ab4b..88c18f4 100644
--- a/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
+++ b/debian/patches/0008-use-JSqueeze-instead-of-JSMin-13052.patch
@@ -13,38 +13,41 @@ filter file can be dropped when our bundled copy of Assetic is
 updated to a version containing the newer JSqueezeFilter.
 
 Bug: https://github.com/owncloud/core/issues/13052
-Origin: vendor, https://github.com/AdamWill/core/commit/da866a885bbc035a12c4e98fd0eed2ec660b0d7f
+Origin: vendor, https://github.com/AdamWill/core/commit/111c4c2e17af15e5bbc3d2eab414503b049363a0
 ---
- lib/private/assetic/jsqueeze2filter.php | 93 +++++++++++++++++++++++++++++++++
+ lib/private/assetic/jsqueeze2filter.php | 97 +++++++++++++++++++++++++++++++++
  lib/private/templatelayout.php          |  4 +-
- 2 files changed, 95 insertions(+), 2 deletions(-)
+ 2 files changed, 99 insertions(+), 2 deletions(-)
  create mode 100644 lib/private/assetic/jsqueeze2filter.php
 
 diff --git a/lib/private/assetic/jsqueeze2filter.php b/lib/private/assetic/jsqueeze2filter.php
 new file mode 100644
-index 0000000..8ea5033
+index 0000000..fc17944
 --- /dev/null
 +++ b/lib/private/assetic/jsqueeze2filter.php
-@@ -0,0 +1,93 @@
+@@ -0,0 +1,97 @@
 +<?php
 +
 +/**
-+ * ownCloud
++ * Copyright (c) 2010-2014 OpenSky Project Inc
 + *
-+ * Copyright (C) 2014 Robin McCorkell <rmccorkell at karoshi.org.uk>
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-+ * License as published by the Free Software Foundation; either
-+ * version 3 of the License, or any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-+ *
-+ * You should have received a copy of the GNU Affero General Public
-+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
++ * Permission is hereby granted, free of charge, to any person obtaining a copy
++ * of this software and associated documentation files (the "Software"), to deal
++ * in the Software without restriction, including without limitation the rights
++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++ * copies of the Software, and to permit persons to whom the Software is furnished
++ * to do so, subject to the following conditions:
++
++ * The above copyright notice and this permission notice shall be included in all
++ * copies or substantial portions of the Software.
++
++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++ * THE SOFTWARE.
 + *
 + * This file is just a copy of Assetic's JSqueezeFilter following
 + * https://github.com/kriswallsmith/assetic/pull/698, with the class
@@ -72,7 +75,8 @@ index 0000000..8ea5033
 +    private $specialVarRx = false;
 +    private $defaultRx;
 +
-+    function __construct() {
++    public function __construct()
++    {
 +        // JSqueeze is namespaced since 2.x, this works with both 1.x and 2.x
 +        if (class_exists('\\Patchwork\\JSqueeze')) {
 +            $this->className = '\\Patchwork\\JSqueeze';

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

