[Pkg-mozext-commits] [SCM] lightweight RSS and Atom feed reader for Iceweasel/Firefox branch, master, updated. debian/1.4.12-1-3-g5abb9c1

Andrea Veri av at src.gnome.org
Thu Oct 13 12:10:09 UTC 2011


The following commit has been merged in the master branch:
commit 5abb9c15328dfb6bdfb7815731fd3d93a7e76153
Author: Andrea Veri <av at src.gnome.org>
Date:   Thu Oct 13 14:09:55 2011 +0200

    debian/copyright: refreshed and made it compliant to DEP5. Removed BSD-License bits since the sha1.js file it's no more there on upstream's sources.

diff --git a/debian/changelog b/debian/changelog
index 14f19de..c6d20e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ sage-extension (1.4.12-2) unstable; urgency=low
       iceweasel's releases.
   * debian/control:
     - added xpi:break field into Breaks.
+  * debian/copyright: 
+    - refreshed and made it compliant to DEP5. Removed
+      BSD-License bits since the sha1.js file it's no more
+      there on upstream's sources.
 
  -- Andrea Veri <and at debian.org>  Thu, 13 Oct 2011 13:19:16 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 918758f..1a884ef 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,51 +1,39 @@
-This package was debianized by Alan Woodland <awoodland at debian.org> on
-Tue Sep  5 16:55:05 BST 2006
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&revision=174
+Upstream-Name: sage
+Source: http://sage.mozdev.org
+
+Files: *
+Copyright: (c) 2005, Peter Andrews <petea at jhu.edu>.
+Contributor(s):      Erik Arvidsson <erik at eae.net>
+                     David Perry
+License: MPL 1.1/GPL 2.0/LGPL 2.1
+
+License: MPL 1.1/GPL 2.0/LGPL 2.1
+ The contents of this file are subject to the Mozilla Public License Version 
+ 1.1 (the "License"); you may not use this file except in compliance with 
+ the License. You may obtain a copy of the License at 
+ http://www.mozilla.org/MPL/
+ .
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the
+ License.
+ .
+ Alternatively, the contents of this file may be used under the terms of
+ either the GNU General Public License Version 2 or later (the "GPL"), or
+ the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ in which case the provisions of the GPL or the LGPL are applicable instead
+ of those above. If you wish to allow use of your version of this file only
+ under the terms of either the GPL or the LGPL, and not to allow others to
+ use your version of this file under the terms of the MPL, indicate your
+ decision by deleting the provisions above and replace them with the notice
+ and other provisions required by the GPL or the LGPL. If you do not delete
+ the provisions above, a recipient may use your version of this file under
+ the terms of any one of the MPL, the GPL or the LGPL.
 
-It was downloaded from:
-http://sage.mozdev.org/
-
-Copyright:
-The Initial Developer of the Original Code is
- Peter Andrews <petea at jhu.edu>.
-Portions created by the Initial Developer are Copyright (C) 2005
-the Initial Developer. All Rights Reserved.
-
-Contributor(s):
- Peter Andrews <petea at jhu.edu>
- Erik Arvidsson <erik at eae.net>David Perry"
- 
-Additionally sha1.js is distributed under the BSD License, which may be
-found in /usr/share/common-licenses/BSD
-
-License:
-
-========================================================================
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
+See the file /usr/share/common-licenses/GPL-2 for the full text of the GPL.
+See the file /usr/share/common-licenses/LGPL-2.1 for the full text of the LGPL.
 
-The contents of this file are subject to the Mozilla Public License Version 
-1.1 (the "License"); you may not use this file except in compliance with 
-the License. You may obtain a copy of the License at 
-http://www.mozilla.org/MPL/
 
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
 
-Alternatively, the contents of this file may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of this file only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of this file under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of this file under
-the terms of any one of the MPL, the GPL or the LGPL.
-========================================================================
 
-The full text of the MPL is in the same directory as this file with the
-filename MPL-1.1.txt and may be compressed.
-See the file /usr/share/common-licenses/GPL-2 for the full text of the GPL.
-See the file /usr/share/common-licenses/LGPL-2.1 for the full text of the LGPL.

-- 
lightweight RSS and Atom feed reader for Iceweasel/Firefox



More information about the Pkg-mozext-commits mailing list