[SCM] libmkv/master: Improve debian/copyright and Homepage field in debian/control.

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Thu Feb 2 13:19:06 UTC 2012


The following commit has been merged in the master branch:
commit 38a1492f4bfd3022730f4c374bf7dfeef638c2bb
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Thu Feb 2 13:58:37 2012 +0100

    Improve debian/copyright and Homepage field in debian/control.

diff --git a/debian/control b/debian/control
index df9da22..d556c6a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 9)
 Vcs-Git: git://git.debian.org/git/pkg-multimedia/libmkv.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libmkv.git;a=summary
-Homepage: http://download.m0k.org/handbrake/contrib/
+Homepage: https://github.com/saintdev/libmkv
 
 Package: libmkv0
 Architecture: any
diff --git a/debian/copyright b/debian/copyright
index bd18eb0..3a9bc37 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,53 @@
-This package was debianized by Christian Marillat <marillat at debian.org> on
-Wed, 10 Dec 2008 12:45:51 +0100.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: libmkv
+Upstream-Contact: saintdev at gmail.com
+Source: https://github.com/saintdev/libmkv/tags
+
+Files: *
+Copyright: © 2005, x264 project
+           © 2007, libmkv
+License: GPL-2+
+
+Files: src/md5.c
+Copyright: © 2006-2007, Christophe Devine
+License: LGPL-2.1
+
+Files: debian/*
+Copyright: © 2008-2011, Christian Marillat
+           © 2012, Fabian Greffrath
+License: GPL-2+
+
+License: GPL-2+
+ This package 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 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ 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.
+ .
+ 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".
+
+License: LGPL-2.1+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ 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.
+ .
+ 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 Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
 
-It was downloaded from http://download.m0k.org/handbrake/contrib/
-
-Upstream Authors:
-
-    Most of this code was taken from Mike Mastnev's matroska muxer included
-    in x264.
-
-    Glue provided by saintdev at gmail.com
-
-Copyright:
-
-    Copyright © 2008 Mike Matsnev
-
-License: GPL
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with the GNU C Library; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301 USA.
-
-The Debian packaging is copyright 2008, Christian Marillat <marillat at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'.

-- 
libmkv packaging



More information about the pkg-multimedia-commits mailing list