[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. debian/4.0.3debian-1-20-g1afb991

[Thomas Mueller]

The following commit has been merged in the master branch:
commit f808ce95874e841eaf4d13b07c82df397e17e4ce
Author: Thomas Mueller <thomas.mueller at tmit.eu>
Date:   Tue Jul 31 22:30:29 2012 +0200

    fixes #683397

diff --git a/debian/changelog b/debian/changelog
index b03be4d..a52c0a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
 owncloud (4.0.5debian-2) UNRELEASED; urgency=low
 
-  * debian/repack.sh: sourceless minified JavaScript files 
-    core/js/jquery-1.7.2.min.js and core/js/jquery-ui-1.8.16.custom.min.js.
-    (closes: #683395)
-  * debian/copyright: full text of CC-BY-3.0 inserted
+  * debian/repack.sh:
+    - Removed sourceless minified JavaScript files core/js/jquery-1.7.2.min.js
+      and core/js/jquery-ui-1.8.16.custom.min.js (closes: #683395)
+    - Removed 3rdparty/Console/Getopt.php and 3rdparty/Crypt_Blowfish
+      (closes: #683397)
+  * debian/copyright: 
+    - Inserted full text of CC-BY-3.0 (closes: #683396)
+    - Removed PHP-3 license (closes: #683397)
 
  -- Thomas Mueller <thomas.mueller at tmit.eu>  Tue, 31 Jul 2012 17:34:48 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 7107aaa..8aeeafb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -23,14 +23,6 @@ Files: 3rdparty/Archive/Tar.php
 Copyright: 1997-2010, Vincent Blavet <vincent at phpconcept.net>
 License: BSD-2-clause
 
-Files: 3rdparty/Console/Getopt.php
-Copyright: 1997-2003, The PHP Group
-License: PHP-3
-
-Files: 3rdparty/Crypt_Blowfish/*
-Copyright: 2005, Matthew Fonda <mfonda at php.net>
-License: PHP-3
-
 Files: 3rdparty/MDB2/*
        3rdparty/MDB2.php
 Copyright: 1998-2008, Manuel Lemos
@@ -1457,51 +1449,3 @@ License: MPL-1.1
  for the specific language governing rights and limitations under the
  License.
 
-License: PHP-3
- Redistribution and use in source and binary forms, with or without
- modification, is permitted provided that the following conditions are met:
- .
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
- .
-   2. Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
- .
-   3. The name "PHP" must not be used to endorse or promote products
-      derived from this software without prior written permission.  For
-      written permission, please contact group at php.net.
- .
-   4. Products derived from this software may not be called "PHP", nor
-      may "PHP" appear in their name, without prior written permission from
-      group at php.net.  You may indicate that your software works in
-      conjunction with PHP by saying "Foo for PHP" instead of calling it
-      "PHP Foo" or "phpfoo"
- .
-   5. The PHP Group may publish revised and/or new versions of the
-      license from time to time.  Each version will be given a
-      distinguishing version number.  Once covered code has been published
-      under a particular version of the license, you may always continue to
-      use it under the terms of that version.  You may also choose to use
-      such covered code under the terms of any subsequent version of the
-      license published by the PHP Group.  No one other than the PHP Group
-      has the right to modify the terms applicable to covered code created
-      under this License.
- .
-   6. Redistributions of any form whatsoever must retain the following
-      acknowledgment:
-      "This product includes PHP, freely available from
-      <http://www.php.net/>".
- .
- THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND
- ANY EXPRESSED 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 PHP
- DEVELOPMENT TEAM OR ITS 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.
diff --git a/debian/repack.sh b/debian/repack.sh
index 62169c7..d8618bf 100755
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -31,6 +31,8 @@ fi
 rm -vfr $UP_BASE/3rdparty/timepicker/css/include
 rm -vfr $UP_BASE/core/js/jquery-1.7.2.min.js
 rm -vfr $UP_BASE/core/js/jquery-ui-1.8.16.custom.min.js
+rm -vfr $UP_BASE/3rdparty/Console/Getopt.php
+rm -vfr $UP_BASE/3rdparty/Crypt_Blowfish
 ## End
 
 mv "$UP_BASE" "$DIR/$REPACK_DIR"

-- 
owncloud.git