[Pkg-owncloud-commits] [SCM] owncloud.git branch, master, updated. upstream/4.0.0-110-g91f6117

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 4b3586e3bf7e1b14f83ecb5f3fb9b6e2939d6777
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Tue May 22 23:56:34 2012 +0200

    Problametic files are cleaned; update debian/copyright and debian/README.source

diff --git a/debian/README.source b/debian/README.source
index 433f481..bb3aae0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -6,8 +6,12 @@ is ready to run, it contains both source and compiled/compressed parts.
 Additionally does the source contain third party libraries which have
 various licenses. 
 
-The debian/rules build instructions will ensure that only the necessary
-parts of the source are installed as follows:
+First of all, upstream source is cleaned by removing
+3rdparty/timepicker/css/include which contains minified JavaScript files
+without source.  Cleaned source has "debian" as suffix.
+
+Additionally, the debian/rules build instructions will ensure that only the
+necessary parts of the source are installed as follows:
 
 * third party PHP code that is available via other Debian packages is removed,
 * superfluous licenses are removed (as they are documented in debian/copyright),
diff --git a/debian/TODO b/debian/TODO
index df3f459..9cf7133 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -4,8 +4,6 @@ ownCloud packaging TODO list
 * Remove the MDB2 SQLite driver installed by owncloud-sqlite and depend
   on php-mdb2-driver-sqlite (still to be packaged).
 * Handle purging well (removing config, conformation for removing data).
-* Get source for 3rdparty/timepicker/css/include/js/*.js, see also FIXMEs
-  in debian/copyright.
 * Write patch to prevent installation of 3rd-party apps via the internet, 
   because this is risky. Bad code can be injected.
 
diff --git a/debian/copyright b/debian/copyright
index fb6ba5d..9a0c235 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -128,39 +128,6 @@ Copyright: 2010-2011, Francois Gelinas
 License: Expat or GPL-2
 Comment: Expat license referred to as MIT license.
 
-Files: 3rdparty/timepicker/css/include/*.js (FIXME: missing source)
-Copyright: 2011, John Resig
-License: Expat or GPL-2
-Comment: Expat license referred to as MIT license.
-
-Files: 3rdparty/timepicker/css/include/jquery.ui*.js (FIXME: missing source, contains Sizzle.js)
-Copyright: 2011, Paul Bakaus (ui.jquery.com)
-                 Brandon Aaron
-                 David Bolter
-                 Rich Caloggero
-                 Chi Cheng (cloudream at gmail.com)
-                 Colin Clark (http://colin.atrc.utoronto.ca/)
-                 Michelle D'Souza
-                 Aaron Eisenberger (aaronchi at gmail.com)
-                 Ariel Flesler
-                 Bohdan Ganicky
-                 Scott González
-                 Marc Grabanski (m at marcgrabanski.com)
-                 Klaus Hartl (stilbuero.de)
-                 Scott Jehl
-                 Cody Lindley
-                 Eduardo Lundgren (eduardolundgren at gmail.com)
-                 Todd Parker
-                 John Resig
-                 Patty Toland
-                 Ca-Phun Ung (yelotofu.com)
-                 Keith Wood (kbwood at virginbroadband.com.au)
-                 Maggie Costello Wachs
-                 Richard D. Worth (rdworth.org)
-                 Jörn Zaefferer (bassistance.de)
-License: Expat or GPL-2
-Comment: Expat license referred to as MIT license.
-
 Files: 3rdparty/when/*
 Copyright: 2010, Tomhas Planer <tplaner at gmail.com>
 License: Expat

-- 
owncloud.git