[Pkg-cli-apps-commits] [gnome-do] 01/04: Bump Standards-Version to 3.9.5, updating debian/copyright for machine-readable v1.0

Christopher Halse Rogers raof-guest at moszumanska.debian.org
Tue Jan 28 06:42:51 UTC 2014


This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository gnome-do.

commit 78182af21e087575cd0c8bc4a4831b52023f4d84
Author: Christopher James Halse Rogers <raof at ubuntu.com>
Date:   Mon Jan 27 21:02:04 2014 +1100

    Bump Standards-Version to 3.9.5, updating debian/copyright for machine-readable v1.0
---
 debian/control   |   2 +-
 debian/copyright | 208 +++++++++++++++++++++++++++++++------------------------
 2 files changed, 118 insertions(+), 92 deletions(-)

diff --git a/debian/control b/debian/control
index e6ac362..34634d3 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libgtk2.0-dev,
                librsvg2-2.0-cil-dev,
                libwnck1.0-cil-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.5
 Homepage: http://do.davebsd.com/
 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/gnome-do.git
 Vcs-Browser: http://git.debian.org/?p=pkg-cli-apps/packages/gnome-do.git
diff --git a/debian/copyright b/debian/copyright
index de9743e..8e300fe 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,25 +1,23 @@
-Format-Specification: 
-  http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: https://launchpad.net/do/+download
-Name: GNOME Do
-Maintainer: David Siegel <djsiegel at gmail.com>,
-	    Jason Smith <JasSmith at gmail.com>
+Upstream-Name: GNOME Do
+Upstream-Contact: Christopher James Halse Rogers <raof at ubuntu.com>
 
 Files: *
-Copyright: © 2007-2009 Alex Launi <alex.launi at gmail.com>,
-	   © 2007-2009 Andrea Cimitan,
-	   © 2007-2009 Christopher Halse Rogers <raof at ubuntu.com>,
-	   © 2007-2009 DR Colkitt,
-	   © 2007-2009 David Siegel <djsiegel at gmail.com>,
-	   © 2007-2009 James Walker,
-	   © 2007-2009 Jason Smith <djsiegel at gmail.com>,
-	   © 2007-2009 Jonathon Anderson,
-	   © 2007-2009 Miguel de Icaza,
-	   © 2007-2009 Rick Harding,
-	   © 2007-2009 Thomsen Anders,
-	   © 2007-2009 Volker Braun,
-	   © 2007-2009 Dusan Maliarik,
-	   © 2007-2009 Travis Watkins
+Copyright: © 2007-2014 Alex Launi <alex.launi at gmail.com>,
+	   © 2007-2014 Andrea Cimitan,
+	   © 2007-2014 Christopher Halse Rogers <raof at ubuntu.com>,
+	   © 2007-2014 DR Colkitt,
+	   © 2007-2014 David Siegel <djsiegel at gmail.com>,
+	   © 2007-2014 James Walker,
+	   © 2007-2014 Jason Smith <djsiegel at gmail.com>,
+	   © 2007-2014 Jonathon Anderson,
+	   © 2007-2014 Miguel de Icaza,
+	   © 2007-2014 Rick Harding,
+	   © 2007-2014 Thomsen Anders,
+	   © 2007-2014 Volker Braun,
+	   © 2007-2014 Dusan Maliarik,
+	   © 2007-2014 Travis Watkins
 License: GPL-3+
 
 Files: DefaultObjects.cs, TextFrame.cs, MiniWindowFrame.cs
@@ -27,50 +25,78 @@ Copyright: © 2008 Jason Smith <JasSmith at gmail.com>
 License: GPL-3+
 
 Files: debian/*
-Copyright: © 2008 Christopher James Halse Rogers <raof at ubuntu.com>
+Copyright: © 2008-2014 Christopher James Halse Rogers <raof at ubuntu.com>
 License: GPL-3+
 
 Files: po/*.po
-Copyright: © 2008 Rosetta Contributors and Canonical Ltd 2008
-License: GPL-3+
+Copyright: © 2008-2014 Rosetta Contributors and Canonical Ltd
+License: BSD-3-clause
+ All rights reserved.
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1) Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2) 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.
+ .
+ 3) Neither the name of the Do project 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
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ AND ON ANY THEORY OF 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.
 
 Licence: GPL-3+
-    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 3 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'.
+ 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 3 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'.
 
 Files: Do/src/XKeybinder.cs
 Copyright: © 2004-2007 Alex Graveley <alex at beatniksoftware.com>
 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 St, Fifth Floor, Boston, MA
-    02110-1301, USA.
-
-    On Debian systems, the complete text of the GNU Lesser General Public 
-    License can be found in `/usr/share/common-licenses/LGPL'.
+ 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 St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public 
+ License can be found in `/usr/share/common-licenses/LGPL'.
 
 Files: libdo/keybinder.{c,h}
 Copyright: © 2004-2007 Alex Graveley <alex at beatniksoftware.com>
@@ -86,46 +112,46 @@ Copyright: © 2002 Red Hat, Inc,
 License: LGPL-2+
 
 License: LGPL-2+
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 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
-    Library General Public License for more details.
- 
-    You should have received a copy of the GNU Library General Public
-    License along with this library; if not, write to the Free
-    Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-    02110-1301, USA.
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ 02110-1301, USA.
 
 Files: Do/src/ConsoleCrayon.cs
 Copyright: © 2008 Novell, Inc.
-License: MIT
+License: Expat
 
 Files: m4/shamrock/*
 Copyright: © 2005-2007 Novell, Inc.
-License: MIT
-
-License: MIT
-    Permission is hereby granted, free of charge, to any person
-    obtaining a copy of this software and associated documentation
-    files (the "Software"), to deal in the Software without
-    restriction, including without limitation the rights to use, copy,
-    modify, merge, publish, distribute, sublicense, and/or sell copies
-    of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-    DEALINGS IN THE SOFTWARE.
+License: Expat
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use, copy,
+ modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/gnome-do.git



More information about the Pkg-cli-apps-commits mailing list