[Pkg-owncloud-commits] [SCM] owncloud-client.git branch, master, updated. upstream/1.1.4-47-g6e788ba

[Sandro Knauß]

The following commit has been merged in the master branch:
commit cdc2e084780527924c3de50b7f04f7c26c51221e
Author: Sandro Knauß <bugs at sandroknauss.de>
Date:   Mon Feb 4 03:47:18 2013 +0100

    get rid of copyright part for admin files

diff --git a/debian/copyright b/debian/copyright
index acd373f..359f75b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -85,30 +85,3 @@ License: BSD
  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  See the License for more information.
 
-Files: admin/win/nsi/nsis_uac/*
-Copyright: 2007 Anders Kjersem
-License: zlib/libpng license
- This software is provided 'as-is', without any express or implied
- warranty. In no event will the authors be held liable for any damages
- arising from the use of this software.
- .
- Permission is granted to anyone to use this software for any purpose,
- including commercial applications, and to alter it and redistribute it freely,
- subject to the following restrictions:
- .
- 1. The origin of this software must not be misrepresented; you must not claim
- that you wrote the original software. If you use this software in a product,
- an acknowledgment in the product documentation would be appreciated but is not required.
- .
- 2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
- .
- 3. This notice may not be removed or altered from any source distribution.
-
-Files: admin/nsi/nsis_processes/*
-Copyright: 2004-2005 Hardwired
-License: 
- This software binaries and source-code are free for any kind of use, including
- commercial use. There is no restriction and no guaranty for using this software
- and/or its source-code. 
If you use the plug-in and/or its source-code, I would
- appreciate if my name is mentioned.

-- 
owncloud-client.git