[SCM] ffdiaporama/master: Update to debian copyright format 1.0.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Apr 23 22:38:08 UTC 2012
The following commit has been merged in the master branch:
commit b26201f44a78207985492161f4514e33b31d3285
Author: Alessio Treglia <alessio at debian.org>
Date: Tue Apr 24 00:38:04 2012 +0200
Update to debian copyright format 1.0.
diff --git a/debian/copyright b/debian/copyright
index c78d143..8dc60e9 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: ffdiaporama
Source: http://download.tuxfamily.org/ffdiaporama/Stable/
@@ -7,16 +7,17 @@ Copyright: 2011-2012 Dominique Levray <levray.dominique at bbox.fr>
License: GPL-2+
Files: src/fmt_filters/fmt_filters.*
-Copyright: 1998, 1999, 2001, 2002 Daniel M. Duley <mosfet at kde.org>
- 2000 Josef Weidendorfer <weidendo at in.tum.de>
- 1998, 1999, 2001, 2002 Daniel M. Duley <mosfet at kde.org>
- 1998, 1999 Christian Tibirna <ctibirna at total.net>
- 1998, 1999 Dirk A. Mueller <mueller at kde.org>
- 1999 Geert Jansen <g.t.jansen at stud.tue.nl>
- 2000 Josef Weidendorfer <weidendo at in.tum.de>
- 2004 Zack Rusin <zack at kde.org>
- 2005 Dmitry Baryshev <ksquirrel.iv at gmail.com>
-License: BSD (2 clause)
+Copyright:
+ 1998, 1999, 2001, 2002 Daniel M. Duley <mosfet at kde.org>
+ 2000 Josef Weidendorfer <weidendo at in.tum.de>
+ 1998, 1999, 2001, 2002 Daniel M. Duley <mosfet at kde.org>
+ 1998, 1999 Christian Tibirna <ctibirna at total.net>
+ 1998, 1999 Dirk A. Mueller <mueller at kde.org>
+ 1999 Geert Jansen <g.t.jansen at stud.tue.nl>
+ 2000 Josef Weidendorfer <weidendo at in.tum.de>
+ 2004 Zack Rusin <zack at kde.org>
+ 2005 Dmitry Baryshev <ksquirrel.iv at gmail.com>
+License: BSD-2-clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -76,9 +77,9 @@ License: GPL-2+
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:
+ On Debian systems, the complete text of the GNU General Public
+ License version 2 can be found in "/usr/share/common-licenses/GPL-2".
.
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 2 can be found in "/usr/share/common-licenses/GPL-2".
--
ffdiaporama packaging
More information about the pkg-multimedia-commits
mailing list