[SCM] mplayer2/master: Update debian/copyright.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Mar 5 10:07:41 UTC 2012


The following commit has been merged in the master branch:
commit ba59719515ecefbeb003358d979398b1d781830c
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Mar 5 11:06:50 2012 +0100

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index b17e7d4..6469679 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: mplayer2
 Upstream-Contact: The mplayer and mplayer2 Developers <mplayer2-dev at mplayer2.org>
 Source: http://mplayer2.org
@@ -273,12 +273,12 @@ 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:
  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".
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in "/usr/share/common-licenses/GPL-2".
 
 License: GPL-3+
  This program is free software: you can redistribute it and/or modify
@@ -290,9 +290,12 @@ 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
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in "/usr/share/common-licenses/GPL-3".
 
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
@@ -304,10 +307,12 @@ License: LGPL-2.1+
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
+Comment:
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 License: LGPL-3+
  This library is free software; you can redistribute it and/or
@@ -319,9 +324,12 @@ License: LGPL-3+
  but WITHOUT ANY WARRANTY; without even the implied warranty of
  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  Lesser General Public License for more details.
+Comment:
+ You should have received a copy of the GNU Lesser General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version can be found in "/usr/share/common-licenses/LGPL-3".
 
 License: Expat
  Permission is hereby granted, free of charge, to any person

-- 
mplayer2 packaging



More information about the pkg-multimedia-commits mailing list