[SCM] sord/master: Update to DEP-5 latest revision, various improvements.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Fri Apr 15 13:32:56 UTC 2011


The following commit has been merged in the master branch:
commit 514af53cd5ff83963d74f20b62e9a6b83b27c2ae
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 15 15:32:40 2011 +0200

    Update to DEP-5 latest revision, various improvements.

diff --git a/debian/copyright b/debian/copyright
index a140183..db11ee8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,8 +1,9 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
 Upstream-Name: Sord
 Upstream-Contact: David Robillard <d at drobilla.net>
 Source: http://svn.drobilla.net/sord/trunk/
 Copyright: 2011 David Robillard <http://drobilla.net>
+License: BSD-2-clause
 
 Files: *
 Copyright: 2011 David Robillard <http://drobilla.net>
@@ -12,27 +13,14 @@ Files: waf
 Copyright: 2005-2010 Thomas Nagy
 License: BSD-3-clause
 
+Files: sord/sordmm.hpp
+Copyright: 2010-2011 David Robillard <d at drobilla.net>
+License: LGPL-3+
+
 Files: debian/*
 Copyright: 2011 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, 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 version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
 License: BSD-2-clause
  Copyright 2011 David Robillard <http://drobilla.net>
  .
@@ -83,3 +71,35 @@ License: BSD-3-clause
  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.
+
+License: LGPL-3+
+ Sord 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 3 of the License, or
+ (at your option) any later version.
+ .
+ Sord 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 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/>.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
+
+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.
+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".

-- 
sord packaging



More information about the pkg-multimedia-commits mailing list