[SCM] laditools/master.experimental: Update debian/copyright.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Mar 7 07:49:19 UTC 2012


The following commit has been merged in the master.experimental branch:
commit 67350968a38b8340d0c12abac5b1d01c37ba1264
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Mar 7 08:49:34 2012 +0100

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 4f390cb..ac45143 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,24 +1,23 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: LADITools
 Upstream-Contact:
- Marc-Olivier Barre <marco at marcochapeau.org>
+ Alessio Treglia <quadrispro at ubuntu.com>
  Nedko Arnaudov <nedko at arnaudov.name>
 Source: http://repo.or.cz/w/laditools.git
 Copyright:
+ 2011-2012 Alessio Treglia <quadrispro at ubuntu.com>
  2007-2010 Marc-Olivier Barre <marco at marcochapeau.org>
  2007-2009 Nedko Arnaudov <nedko at arnaudov.name>
+License: GPL-3+
 
 Files: *
 Copyright:
+ 2011-2012 Alessio Treglia <quadrispro at ubuntu.com>
  2007-2010 Marc-Olivier Barre <marco at marcochapeau.org>
  2007-2009 Nedko Arnaudov <nedko at arnaudov.name>
  2008 Krzysztof Foltman <wdev at foltman.com>
 License: GPL-3+
 
-Files: lib/laditools/TreeViewTooltips.py
-Copyright: 2006 Daniel J. Popowich
-License: Expat
-
 Files: debian/*
 Copyright: 2011-2012 Alessio Treglia <alessio at debian.org>
 License: GPL-3+
@@ -33,29 +32,9 @@ License: GPL-3+
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  GNU General Public License for more details.
-Comment: You should have received a copy of the GNU General Public License
+Comment:
+ You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public
  License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-
-License: Expat
- 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.

-- 
laditools packaging



More information about the pkg-multimedia-commits mailing list