The following commit has been merged in the master branch:
commit 7a96f814e3b0cd2dda748af50a5e8fc31a7c7a76
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Nov 19 00:49:59 2012 +0000
Update and fix debian/copyright as per Copyright format 1.0
diff --git a/debian/copyright b/debian/copyright
index 288be6b..ec2fda8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,83 +1,69 @@
-This package was debianized by Rob Neild <s at bigbob.org.uk> on
-Wed, 23 Aug 2006 15:50:27 +0100.
-
-It was downloaded from http://ogmrip.sourceforge.net/
+Format: git://anonscm.debian.org/pkg-multimedia/ogmrip.git
+Upstream-Name: OGMRip
+Upstream-Contact: Olivier Rolland <billl at users.sf.net>
+Source: http://sourceforge.net/projects/ogmrip/files/
Files: *
Copyright:
- Copyright (C) 2004-2010 Olivier Rolland <billl at users.sf.net>
- Copyright (C) Thomas Oestreich - June 2001
- Copyright (C) 2002 Thomas Oestreich
- Copyright (C) 2007-2008 Francesco Romani
- Copyright (C) 1999 Rainer Johanni <Rainer at Johanni.de>
- Copyright (C) Tilmann Bitterberg - June 2003
- Copyright (C) 2002, 2003 Jan Panteltje <panteltje at yahoo.com>,
- Copyright (C) 2002-2006 Arne Driescher <driescher at users.sf.net>
+ 2004-2012 Olivier Rolland <billl at users.sf.net>
+ Thomas Oestreich - June 2001
+ 2002 Thomas Oestreich
+ 2007-2008 Francesco Romani
+ 1999 Rainer Johanni <Rainer at Johanni.de>
+ Tilmann Bitterberg - June 2003
+ 2002, 2003 Jan Panteltje <panteltje at yahoo.com>,
+ 2002-2006 Arne Driescher <driescher at users.sf.net>
License: GPL-2+
- 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 2 of the License, or
- (at your option) any later version.
-
- This program 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, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-Comment: On Debian systems, the complete text of the GNU General Public License
-can be found in `/usr/share/common-licenses/GPL-2'.
Files: avibox/platform.*
Copyright: (C) 2007-2009 - Francesco Romani <fromani -at- gmail -dot- com>
-License: zlib/libpng
+License: zlib
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
-
+ .
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
-
+ .
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
-
+ .
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
-
+ .
3. This notice may not be removed or altered from any source
distribution.
-Files:libogmdvd/*
- libogmdvd-gtk/*
- libogmjob/*
+Files:
+ libogmdvd/*
+ libogmdvd-gtk/*
+ libogmjob/*
Copyright:
- Copyright (C) 2004-2010 Olivier Rolland <billl at users.sf.net>
- Copyright (C) Philippe Rouquier 2005-2009 <bonfire-app at wanadoo.fr>
- Copyright (C) Andy Polyakov <appro at fy.chalmers.se>
- Copyright (C) 2000-2002 Michel Lespinasse <walken at zoy.org>
- Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
- Copyright (C) 2004 Gildas Bazin <gbazin at videolan.org>
+ 2004-2010 Olivier Rolland <billl at users.sf.net>
+ Philippe Rouquier 2005-2009 <bonfire-app at wanadoo.fr>
+ Andy Polyakov <appro at fy.chalmers.se>
+ 2000-2002 Michel Lespinasse <walken at zoy.org>
+ 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+ 2004 Gildas Bazin <gbazin at videolan.org>
License: LGPL-2.1+
This library 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 library 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 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
-Comment: On Debian systems, the complete text of the GNU Lesser General Public
-License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+ .
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
Files: theoraenc/theoraenc.c
License: BSD-like
@@ -88,24 +74,24 @@ License: BSD-like
* *
* THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2003 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
-
+ .
Complete license :
-
+ .
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+ .
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-
+ .
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
-
+ .
- Neither the name of the Xiph.org Foundation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
-
+ .
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -117,3 +103,24 @@ License: BSD-like
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Files: debian/*
+Copyright: 2012 Alessio Treglia <alessio at debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ 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 2 of the License, or
+ (at your option) any later version.
+ .
+ This program 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
+ can be found in `/usr/share/common-licenses/GPL-2'.
--
ogmrip packaging