r55377 - in /trunk/libvideo-info-perl/debian: changelog copyright
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sat Apr 3 12:20:16 UTC 2010
Author: gregoa
Date: Sat Apr 3 12:20:01 2010
New Revision: 55377
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55377
Log:
debian/copyright: update formatting.
Modified:
trunk/libvideo-info-perl/debian/changelog
trunk/libvideo-info-perl/debian/copyright
Modified: trunk/libvideo-info-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-info-perl/debian/changelog?rev=55377&op=diff
==============================================================================
--- trunk/libvideo-info-perl/debian/changelog (original)
+++ trunk/libvideo-info-perl/debian/changelog Sat Apr 3 12:20:01 2010
@@ -18,6 +18,7 @@
* Minimize debian/rules.
* Add /me to Uploaders.
* Set Standards-Version to 3.8.4 (no changes).
+ * debian/copyright: update formatting.
-- Ryan Niebur <ryanryan52 at gmail.com> Tue, 01 Sep 2009 21:19:59 -0700
Modified: trunk/libvideo-info-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libvideo-info-perl/debian/copyright?rev=55377&op=diff
==============================================================================
--- trunk/libvideo-info-perl/debian/copyright (original)
+++ trunk/libvideo-info-perl/debian/copyright Sat Apr 3 12:20:01 2010
@@ -1,9 +1,8 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Benjamin R. Ginter <bginter at asicommunications.com>,
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Benjamin R. Ginter <bginter at asicommunications.com>,
Allen Day <allenday at ucla.edu>
-Upstream-Source: http://search.cpan.org/dist/Video-Info/
-Upstream-Name: Video-Info
+Source: http://search.cpan.org/dist/Video-Info/
+Name: Video-Info
X-Comment: libvideo-info-perl is non-free because the Aladdin Free Public
License prohibits distribution of software for a fee, and prohibits the
@@ -20,21 +19,22 @@
Files: debian/*
Copyright: 2009, Jonathan Yu <jon at aven.luminescent.ca>
+ 2009, Ryan Niebur <ryanryan52 at gmail.com>
2010, gregor herrmann <gregoa at debian.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
License: AFPL
Aladdin Free Public License
(Version 8, November 18, 1999)
-
+ .
Copyright (C) 1994, 1995, 1997, 1998, 1999 Aladdin Enterprises,
Menlo Park, California, U.S.A. All rights reserved.
-
+ .
NOTE: This License is not the same as any of the GNU Licenses published by
the Free Software Foundation. Its terms are substantially different from
those of the GNU Licenses. If you are familiar with the GNU Licenses,
please read this license with extra care.
-
+ .
Aladdin Enterprises hereby grants to anyone the permission to apply this
License to their own work, as long as the entire License (including the
above notices and this paragraph) is copied with no changes, additions, or
@@ -44,13 +44,13 @@
the License is being applied to a work created in a country other than the
United States, replacing the first paragraph of Section 6 with an
appropriate reference to the laws of the appropriate country.
-
+ .
0. Subject Matter
-
+ .
A "work based on the Program" means either the Program or any derivative
work of the Program, as defined in the United States Copyright Act of
1976, such as a translation or a modification.
-
+ .
BY MODIFYING OR DISTRIBUTING THE PROGRAM (OR ANY WORK BASED ON THE
PROGRAM), YOU INDICATE YOUR ACCEPTANCE OF THIS LICENSE TO DO SO, AND ALL
ITS TERMS AND CONDITIONS FOR COPYING, DISTRIBUTING OR MODIFYING THE
@@ -58,21 +58,21 @@
PERMISSION TO MODIFY OR DISTRIBUTE THE PROGRAM OR ITS DERIVATIVE WORKS.
THESE ACTIONS ARE PROHIBITED BY LAW. IF YOU DO NOT ACCEPT THESE TERMS AND
CONDITIONS, DO NOT MODIFY OR DISTRIBUTE THE PROGRAM.
-
+ .
1. Licenses Licensor hereby grants you the following rights, provided that
you comply with all of the restrictions set forth in this License and
provided, further, that you distribute an unmodified copy of this License
with the Program:
-
+ .
(a) You may copy and distribute literal (i.e., verbatim) copies of
the Program's source code as you receive it throughout the world,
in any medium.
-
+ .
(b) You may modify the Program, create works based on the Program
and distribute copies of such throughout the world, in any medium.
-
+ .
2. Restrictions This license is subject to the following restrictions:
-
+ .
(a) Distribution of the Program or any work based on the Program
by a commercial organization to any third party is prohibited if
any payment is made in connection with such distribution, whether
@@ -86,7 +86,7 @@
program known as "Video::OpenQuicktime". The "Program", below,
refers to such program. The Program is a copyrighted work whose
copyright is held by Allen Day <allenday at ucla.edu> (the "Licensor").
-
+ .
(i) Posting the Program on a public access information
storage and retrieval service for which a fee is received
for retrieving information (such as an on-line service),
@@ -99,7 +99,7 @@
that is operated by a company and that is only available
to customers of that company. (This is not an exhaustive
enumeration.)
-
+ .
(ii) Distributing the Program on removable
computer-readable media, provided that the files
containing the Program are reproduced entirely and
@@ -113,7 +113,7 @@
distribution that does not fall under this section is a
CD-ROM included in a book or magazine. (This is not an
exhaustive enumeration.)
-
+ .
(b) Activities other than copying, distribution and modification
of the Program are not subject to this License and they are
outside its scope. Functional use (running) of the Program is not
@@ -121,12 +121,12 @@
is subject to this license only if its contents constitute a work
based on the Program (independent of having been made by running
the Program).
-
+ .
(c) You must meet all of the following conditions with respect to
any work that you distribute or publish that in whole or in part
contains or is derived from the Program or any part thereof ("the
Work"):
-
+ .
(i) If you have modified the Program, you must cause the
Work to carry prominent notices stating that you have
modified the Program's files and the date of any change.
@@ -134,11 +134,11 @@
include a prominent notice that you have modified the
file, including your name, your e-mail address (if any),
and the date and purpose of the change;
-
+ .
(ii) You must cause the Work to be licensed as a whole and
at no charge to all third parties under the terms of this
License;
-
+ .
(iii) If the Work normally reads commands interactively
when run, you must cause it, at each time the Work
commences operation, to print or display an announcement
@@ -155,7 +155,7 @@
the Program itself is interactive but does not normally
print such an announcement, the Work is not required to
print an announcement.);
-
+ .
(iv) You must accompany the Work with the complete
corresponding machine-readable source code, delivered on a
medium customarily used for software interchange. The
@@ -171,25 +171,25 @@
the operating system on which the executable runs, you
must also distribute the source code of that component if
you have it and are allowed to do so;
-
+ .
(v) If you distribute any written or printed material at
all with the Work, such material must include either a
written copy of this License, or a prominent written
indication that the Work is covered by this License and
written instructions for printing and/or displaying the
copy of the License on the distribution medium;
-
+ .
(vi) You may not impose any further restrictions on the
recipient's exercise of the rights granted herein.
-
+ .
If distribution of executable or object code is made by offering the
equivalent ability to copy from a designated place, then offering
equivalent ability to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source code along with the object code.
-
+ .
3. Reservation of Rights
-
+ .
No rights are granted to the Program except as expressly set forth herein.
You may not copy, modify, sublicense, or distribute the Program except as
expressly provided under this License. Any attempt otherwise to copy,
@@ -198,18 +198,18 @@
who have received copies, or rights, from you under this License will not
have their licenses terminated so long as such parties remain in full
compliance.
-
+ .
4. Other Restrictions
-
+ .
If the distribution and/or use of the Program is restricted in certain
countries for any reason, Licensor may add an explicit geographical
distribution limitation excluding those countries, so that distribution is
permitted only in or among countries not thus excluded. In such case, this
License incorporates the limitation as if written in the body of this
License.
-
+ .
5. Limitations
-
+ .
THE PROGRAM IS PROVIDED TO YOU "AS IS," WITHOUT WARRANTY. THERE IS NO
WARRANTY FOR THE PROGRAM, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
@@ -217,7 +217,7 @@
RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD
THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY
SERVICING, REPAIR OR CORRECTION.
-
+ .
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
LICENSOR, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE
PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
@@ -227,21 +227,21 @@
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
-
+ .
6. General
-
+ .
This License is governed by the laws of the United States, excluding
choice of law rules.
-
+ .
If any part of this License is found to be in conflict with the law, that
part shall be interpreted in its broadest meaning consistent with the law,
and no other parts of the License shall be affected.
-
+ .
For United States Government users, the Program is provided with
RESTRICTED RIGHTS. If you are a unit or agency of the United States
Government or are acquiring the Program for any such unit or agency, the
following apply:
-
+ .
If the unit or agency is the Department of Defense ("DOD"), the
Program and its documentation are classified as "commercial
computer software" and "commercial computer software
@@ -256,15 +256,17 @@
License.
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
More information about the Pkg-perl-cvs-commits
mailing list