[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#690037: marked as done (unblock: icinga-web/1.7.1+dfsg1-5)



Your message dated Tue, 09 Oct 2012 13:41:29 +0200
with message-id <50740D69.1020506@dogguy.org>
and subject line Re: Bug#690037: unblock: icinga-web/1.7.1+dfsg1-5
has caused the Debian Bug report #690037,
regarding unblock: icinga-web/1.7.1+dfsg1-5
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
690037: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=690037
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package icinga-web

A non-free file has been located in the source tarball (#678350)
the new upload includes a DFSG cleaned tarball without this
(not required) files. The upstream project also removed them
from their project.

The following changes have been made for the package:
* removed non-free files:
  contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php
  contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php
  lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php
  lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php

* updated gbp.conf and watch files to fit the changes

* updated changelog with the necessary information

Please see the attached debdiff and contact me if you have any questions!

The upload and changes have been signed by Alexander Wirt.

Best Regards
Markus Frosch

unblock icinga-web/1.7.1+dfsg1-5

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru icinga-web-1.7.1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php icinga-web-1.7.1+dfsg1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php
--- icinga-web-1.7.1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php	2012-06-18 20:27:35.000000000 +0200
+++ icinga-web-1.7.1+dfsg1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMin.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,291 +0,0 @@
-<?php
-/**
- * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
- *
- * This is pretty much a direct port of jsmin.c to PHP with just a few
- * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and
- * outputs to stdout, this library accepts a string as input and returns another
- * string as output.
- *
- * PHP 5 or higher is required.
- *
- * Permission is hereby granted to use this version of the library under the
- * same terms as jsmin.c, which has the following license:
- *
- * --
- * Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
- *
- * 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 shall be used for Good, not Evil.
- *
- * 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.
- * --
- *
- * @package JSMin
- * @author Ryan Grove <ryan@wonko.com>
- * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
- * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
- * @license http://opensource.org/licenses/mit-license.php MIT License
- * @version 1.1.1 (2008-03-02)
- * @link http://code.google.com/p/jsmin-php/
- */
-
-class JSMin {
-  const ORD_LF    = 10;
-  const ORD_SPACE = 32;
-
-  protected $a           = '';
-  protected $b           = '';
-  protected $input       = '';
-  protected $inputIndex  = 0;
-  protected $inputLength = 0;
-  protected $lookAhead   = null;
-  protected $output      = '';
-
-  // -- Public Static Methods --------------------------------------------------
-
-  public static function minify($js) {
-    $jsmin = new JSMin($js);
-    return $jsmin->min();
-  }
-
-  // -- Public Instance Methods ------------------------------------------------
-
-  public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
-  }
-
-  // -- Protected Instance Methods ---------------------------------------------
-
-  protected function action($d) {
-    switch($d) {
-      case 1:
-        $this->output .= $this->a;
-
-      case 2:
-        $this->a = $this->b;
-
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
-
-            if ($this->a === $this->b) {
-              break;
-            }
-
-            if (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated string literal.');
-            }
-
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            }
-          }
-        }
-
-      case 3:
-        $this->b = $this->next();
-
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
-
-          $this->output .= $this->a . $this->b;
-
-          for (;;) {
-            $this->a = $this->get();
-
-            if ($this->a === '/') {
-              break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
-                  'literal.');
-            }
-
-            $this->output .= $this->a;
-          }
-
-          $this->b = $this->next();
-        }
-    }
-  }
-
-  protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
-
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
-      } else {
-        $c = null;
-      }
-    }
-
-    if ($c === "\r") {
-      return "\n";
-    }
-
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
-      return $c;
-    }
-
-    return ' ';
-  }
-
-  protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
-  }
-
-  protected function min() {
-    $this->a = "\n";
-    $this->action(3);
-
-    while ($this->a !== null) {
-      switch ($this->a) {
-        case ' ':
-          if ($this->isAlphaNum($this->b)) {
-            $this->action(1);
-          } else {
-            $this->action(2);
-          }
-          break;
-
-        case "\n":
-          switch ($this->b) {
-            case '{':
-            case '[':
-            case '(':
-            case '+':
-            case '-':
-              $this->action(1);
-              break;
-
-            case ' ':
-              $this->action(3);
-              break;
-
-            default:
-              if ($this->isAlphaNum($this->b)) {
-                $this->action(1);
-              }
-              else {
-                $this->action(2);
-              }
-          }
-          break;
-
-        default:
-          switch ($this->b) {
-            case ' ':
-              if ($this->isAlphaNum($this->a)) {
-                $this->action(1);
-                break;
-              }
-
-              $this->action(3);
-              break;
-
-            case "\n":
-              switch ($this->a) {
-                case '}':
-                case ']':
-                case ')':
-                case '+':
-                case '-':
-                case '"':
-                case "'":
-                  $this->action(1);
-                  break;
-
-                default:
-                  if ($this->isAlphaNum($this->a)) {
-                    $this->action(1);
-                  }
-                  else {
-                    $this->action(3);
-                  }
-              }
-              break;
-
-            default:
-              $this->action(1);
-              break;
-          }
-      }
-    }
-
-    return $this->output;
-  }
-
-  protected function next() {
-    $c = $this->get();
-
-    if ($c === '/') {
-      switch($this->peek()) {
-        case '/':
-          for (;;) {
-            $c = $this->get();
-
-            if (ord($c) <= self::ORD_LF) {
-              return $c;
-            }
-          }
-
-        case '*':
-          $this->get();
-
-          for (;;) {
-            switch($this->get()) {
-              case '*':
-                if ($this->peek() === '/') {
-                  $this->get();
-                  return ' ';
-                }
-                break;
-
-              case null:
-                throw new JSMinException('Unterminated comment.');
-            }
-          }
-
-        default:
-          return $c;
-      }
-    }
-
-    return $c;
-  }
-
-  protected function peek() {
-    $this->lookAhead = $this->get();
-    return $this->lookAhead;
-  }
-}
-
-// -- Exceptions ---------------------------------------------------------------
-class JSMinException extends Exception {}
-?>
diff -Nru icinga-web-1.7.1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php icinga-web-1.7.1+dfsg1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php
--- icinga-web-1.7.1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php	2012-06-18 20:27:35.000000000 +0200
+++ icinga-web-1.7.1+dfsg1/contrib/businessprocess-icinga-cronk/phing/tasks/ext/jsmin/JsMinTask.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,128 +0,0 @@
-<?php
-/*
- *  $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/jsmin/JsMin.php';
-
-/**
- * Task to minify javascript files.
- *
- * Requires JSMin which can be found at http://code.google.com/p/jsmin-php/ but
- * is bundled with Phing so no additional install of JsMin is required.
- *
- * @author Frank Kleine <mikey@stubbles.net>
- * @version $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
- * @package phing.tasks.ext
- * @since 2.3.0
- */
-class JsMinTask extends Task
-{
-    /**
-     * the source files
-     *
-     * @var  FileSet
-     */
-    protected $filesets    = array();
-    /**
-     * Whether the build should fail, if
-     * errors occured
-     *
-     * @var boolean
-     */
-    protected $failonerror = false;
-    /**
-     * directory to put minified javascript files into
-     *
-     * @var  string
-     */
-    protected $targetDir;
-
-    /**
-     *  Nested creator, adds a set of files (nested fileset attribute).
-     */
-    public function createFileSet()
-    {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num - 1];
-    }
-
-    /**
-     * Whether the build should fail, if an error occured.
-     *
-     * @param boolean $value
-     */
-    public function setFailonerror($value)
-    {
-        $this->failonerror = $value;
-    }
-
-    /**
-     * sets the directory where minified javascript files should be put inot
-     *
-     * @param  string  $targetDir
-     */
-    public function setTargetDir($targetDir)
-    {
-        $this->targetDir = $targetDir;
-    }
-
-    /**
-     * The init method: Do init steps.
-     */
-    public function init()
-    {
-        return true;
-    }
-
-    /**
-     * The main entry point method.
-     */
-    public function main()
-    {
-        foreach ($this->filesets as $fs) {
-            try {
-                $files    = $fs->getDirectoryScanner($this->project)->getIncludedFiles();
-                $fullPath = realpath($fs->getDir($this->project));
-                foreach ($files as $file) {
-                    $this->log('Minifying file ' . $file);
-                    try {
-                        $target = $this->targetDir . '/' . str_replace($fullPath, '', str_replace('.js', '-min.js', $file));
-                        if (file_exists(dirname($target)) === false) {
-                            mkdir(dirname($target), 0700, true);
-                        }
-                        
-                        file_put_contents($target, JSMin::minify(file_get_contents($fullPath . '/' . $file)));
-                    } catch (JSMinException $jsme) {
-                        $this->log("Could not minify file $file: " . $jsme->getMessage(), Project::MSG_ERR);
-                    }
-                }
-            } catch (BuildException $be) {
-                // directory doesn't exist or is not readable
-                if ($this->failonerror) {
-                    throw $be;
-                } else {
-                    $this->log($be->getMessage(), $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-                }
-            }
-        }
-    }
-}
-?>
diff -Nru icinga-web-1.7.1/debian/changelog icinga-web-1.7.1+dfsg1/debian/changelog
--- icinga-web-1.7.1/debian/changelog	2012-08-02 18:18:38.000000000 +0200
+++ icinga-web-1.7.1+dfsg1/debian/changelog	2012-10-09 10:53:05.000000000 +0200
@@ -1,3 +1,13 @@
+icinga-web (1.7.1+dfsg1-5) unstable; urgency=high
+
+  * [4cc829d] DFSG cleaned upstream 1.7.1+dfsg1
+              Removed JSmin from upstream tarball
+              due to non-free license  Closes: #689764
+  * [795fde4] added gbp.conf for wheezy branch
+  * [bca5fb8] updated watch file for dfsg tarballs
+
+ -- Markus Frosch <markus@lazyfrosch.de>  Mon, 08 Oct 2012 14:52:10 +0200
+
 icinga-web (1.7.1-4) unstable; urgency=low
 
   * [3b184da] fixed postrm to avoid breaking on
diff -Nru icinga-web-1.7.1/debian/gbp.conf icinga-web-1.7.1+dfsg1/debian/gbp.conf
--- icinga-web-1.7.1/debian/gbp.conf	1970-01-01 01:00:00.000000000 +0100
+++ icinga-web-1.7.1+dfsg1/debian/gbp.conf	2012-10-09 10:53:05.000000000 +0200
@@ -0,0 +1,3 @@
+[DEFAULT]
+debian-branch = wheezy
+upstream-branch = upstream_1.7.1_dfsg
diff -Nru icinga-web-1.7.1/debian/watch icinga-web-1.7.1+dfsg1/debian/watch
--- icinga-web-1.7.1/debian/watch	2012-06-14 08:08:00.000000000 +0200
+++ icinga-web-1.7.1+dfsg1/debian/watch	2012-10-09 10:53:05.000000000 +0200
@@ -1,2 +1,3 @@
 version=3
+opts=dversionmangle=s/\+dfsg\d*// \
 http://sf.net/icinga/icinga-web-([0-9-.]+)\.tar\.gz
diff -Nru icinga-web-1.7.1/lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php icinga-web-1.7.1+dfsg1/lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php
--- icinga-web-1.7.1/lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php	2012-06-18 20:27:35.000000000 +0200
+++ icinga-web-1.7.1+dfsg1/lib/phing/classes/phing/tasks/ext/jsmin/JsMin.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,293 +0,0 @@
-<?php
-/**
- * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
- *
- * This is pretty much a direct port of jsmin.c to PHP with just a few
- * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and
- * outputs to stdout, this library accepts a string as input and returns another
- * string as output.
- *
- * PHP 5 or higher is required.
- *
- * Permission is hereby granted to use this version of the library under the
- * same terms as jsmin.c, which has the following license:
- *
- * --
- * Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
- *
- * 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 shall be used for Good, not Evil.
- *
- * 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.
- * --
- *
- * @package JSMin
- * @author Ryan Grove <ryan@wonko.com>
- * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
- * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
- * @license http://opensource.org/licenses/mit-license.php MIT License
- * @version 1.1.1 (2008-03-02)
- * @link http://code.google.com/p/jsmin-php/
- */
-
-class JSMin {
-  const ORD_LF    = 10;
-  const ORD_SPACE = 32;
-
-  protected $a           = '';
-  protected $b           = '';
-  protected $input       = '';
-  protected $inputIndex  = 0;
-  protected $inputLength = 0;
-  protected $lookAhead   = null;
-  protected $output      = '';
-
-  // -- Public Static Methods --------------------------------------------------
-
-  public static function minify($js) {
-    $jsmin = new JSMin($js);
-    return $jsmin->min();
-  }
-
-  // -- Public Instance Methods ------------------------------------------------
-
-  public function __construct($input) {
-    $this->input       = str_replace("\r\n", "\n", $input);
-    $this->inputLength = strlen($this->input);
-  }
-
-  // -- Protected Instance Methods ---------------------------------------------
-
-  protected function action($d) {
-    switch($d) {
-      case 1:
-        $this->output .= $this->a;
-
-      case 2:
-        $this->a = $this->b;
-
-        if ($this->a === "'" || $this->a === '"') {
-          for (;;) {
-            $this->output .= $this->a;
-            $this->a       = $this->get();
-
-            if ($this->a === $this->b) {
-              break;
-            }
-
-            if (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated string literal.');
-            }
-
-            if ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            }
-          }
-        }
-
-      case 3:
-        $this->b = $this->next();
-
-        if ($this->b === '/' && (
-            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
-            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
-            $this->a === '&' || $this->a === '|' || $this->a === '?')) {
-
-          $this->output .= $this->a . $this->b;
-
-          for (;;) {
-            $this->a = $this->get();
-
-            if ($this->a === '/') {
-              break;
-            } elseif ($this->a === '\\') {
-              $this->output .= $this->a;
-              $this->a       = $this->get();
-            } elseif (ord($this->a) <= self::ORD_LF) {
-              throw new JSMinException('Unterminated regular expression '.
-                  'literal.');
-            }
-
-            $this->output .= $this->a;
-          }
-
-          $this->b = $this->next();
-        }
-    }
-  }
-
-  protected function get() {
-    $c = $this->lookAhead;
-    $this->lookAhead = null;
-
-    if ($c === null) {
-      if ($this->inputIndex < $this->inputLength) {
-        $c = $this->input[$this->inputIndex];
-        $this->inputIndex += 1;
-      } else {
-        $c = null;
-      }
-    }
-
-    if ($c === "\r") {
-      return "\n";
-    }
-
-    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
-      return $c;
-    }
-
-    return ' ';
-  }
-
-  protected function isAlphaNum($c) {
-    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
-  }
-
-  protected function min() {
-    $this->a = "\n";
-    $this->action(3);
-
-    while ($this->a !== null) {
-      switch ($this->a) {
-        case ' ':
-          if ($this->isAlphaNum($this->b)) {
-            $this->action(1);
-          } else {
-            $this->action(2);
-          }
-          break;
-
-        case "\n":
-          switch ($this->b) {
-            case '{':
-            case '[':
-            case '(':
-            case '+':
-            case '-':
-              $this->action(1);
-              break;
-
-            case ' ':
-              $this->action(3);
-              break;
-
-            default:
-              if ($this->isAlphaNum($this->b)) {
-                $this->action(1);
-              }
-              else {
-                $this->action(2);
-              }
-          }
-          break;
-
-        default:
-          switch ($this->b) {
-            case ' ':
-              if ($this->isAlphaNum($this->a)) {
-                $this->action(1);
-                break;
-              }
-
-              $this->action(3);
-              break;
-
-            case "\n":
-              switch ($this->a) {
-                case '}':
-                case ']':
-                case ')':
-                case '+':
-                case '-':
-                case '"':
-                case "'":
-                  $this->action(1);
-                  break;
-
-                default:
-                  if ($this->isAlphaNum($this->a)) {
-                    $this->action(1);
-                  }
-                  else {
-                    $this->action(3);
-                  }
-              }
-              break;
-
-            default:
-              $this->action(1);
-              break;
-          }
-      }
-    }
-
-    return $this->output;
-  }
-
-  protected function next() {
-    $c = $this->get();
-
-    if ($c === '/') {
-      switch($this->peek()) {
-        case '/':
-          for (;;) {
-            $c = $this->get();
-
-            if (ord($c) <= self::ORD_LF) {
-              return $c;
-            }
-          }
-
-        case '*':
-          $this->get();
-
-          for (;;) {
-            switch($this->get()) {
-              case '*':
-                if ($this->peek() === '/') {
-                  $this->get();
-                  return ' ';
-                }
-                break;
-
-              case null:
-                throw new JSMinException('Unterminated comment.');
-            }
-          }
-
-        default:
-          return $c;
-      }
-    }
-
-    return $c;
-  }
-
-  protected function peek() {
-    $this->lookAhead = $this->get();
-    return $this->lookAhead;
-  }
-}
-
-/**
- * @package JSMin
- */
-class JSMinException extends Exception {}
-?>
diff -Nru icinga-web-1.7.1/lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php icinga-web-1.7.1+dfsg1/lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php
--- icinga-web-1.7.1/lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php	2012-06-18 20:27:35.000000000 +0200
+++ icinga-web-1.7.1+dfsg1/lib/phing/classes/phing/tasks/ext/jsmin/JsMinTask.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,128 +0,0 @@
-<?php
-/*
- *  $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals
- * and is licensed under the LGPL. For more information please see
- * <http://phing.info>.
- */
-
-require_once 'phing/Task.php';
-require_once 'phing/tasks/ext/jsmin/JsMin.php';
-
-/**
- * Task to minify javascript files.
- *
- * Requires JSMin which can be found at http://code.google.com/p/jsmin-php/ but
- * is bundled with Phing so no additional install of JsMin is required.
- *
- * @author Frank Kleine <mikey@stubbles.net>
- * @version $Id: JsMinTask.php 526 2009-08-11 12:11:17Z mrook $
- * @package phing.tasks.ext
- * @since 2.3.0
- */
-class JsMinTask extends Task
-{
-    /**
-     * the source files
-     *
-     * @var  FileSet
-     */
-    protected $filesets    = array();
-    /**
-     * Whether the build should fail, if
-     * errors occured
-     *
-     * @var boolean
-     */
-    protected $failonerror = false;
-    /**
-     * directory to put minified javascript files into
-     *
-     * @var  string
-     */
-    protected $targetDir;
-
-    /**
-     *  Nested creator, adds a set of files (nested fileset attribute).
-     */
-    public function createFileSet()
-    {
-        $num = array_push($this->filesets, new FileSet());
-        return $this->filesets[$num - 1];
-    }
-
-    /**
-     * Whether the build should fail, if an error occured.
-     *
-     * @param boolean $value
-     */
-    public function setFailonerror($value)
-    {
-        $this->failonerror = $value;
-    }
-
-    /**
-     * sets the directory where minified javascript files should be put inot
-     *
-     * @param  string  $targetDir
-     */
-    public function setTargetDir($targetDir)
-    {
-        $this->targetDir = $targetDir;
-    }
-
-    /**
-     * The init method: Do init steps.
-     */
-    public function init()
-    {
-        return true;
-    }
-
-    /**
-     * The main entry point method.
-     */
-    public function main()
-    {
-        foreach ($this->filesets as $fs) {
-            try {
-                $files    = $fs->getDirectoryScanner($this->project)->getIncludedFiles();
-                $fullPath = realpath($fs->getDir($this->project));
-                foreach ($files as $file) {
-                    $this->log('Minifying file ' . $file);
-                    try {
-                        $target = $this->targetDir . '/' . str_replace($fullPath, '', str_replace('.js', '-min.js', $file));
-                        if (file_exists(dirname($target)) === false) {
-                            mkdir(dirname($target), 0700, true);
-                        }
-                        
-                        file_put_contents($target, JSMin::minify(file_get_contents($fullPath . '/' . $file)));
-                    } catch (JSMinException $jsme) {
-                        $this->log("Could not minify file $file: " . $jsme->getMessage(), Project::MSG_ERR);
-                    }
-                }
-            } catch (BuildException $be) {
-                // directory doesn't exist or is not readable
-                if ($this->failonerror) {
-                    throw $be;
-                } else {
-                    $this->log($be->getMessage(), $this->quiet ? Project::MSG_VERBOSE : Project::MSG_WARN);
-                }
-            }
-        }
-    }
-}
-?>

--- End Message ---
--- Begin Message ---
On 09/10/2012 13:33, Markus Frosch wrote:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please unblock package icinga-web
> 
> A non-free file has been located in the source tarball (#678350)
> the new upload includes a DFSG cleaned tarball without this
> (not required) files. The upstream project also removed them
> from their project.
> 

Unblocked.

Regards,

-- 
Mehdi Dogguy مهدي الدڤي

--- End Message ---

Reply to: