[DRE-commits] [SCM] taskjuggler.git branch, master, updated. upstream/3.1.0-16-gbf2932d

[Carl Worth]

The following commit has been merged in the master branch:
commit 753a808afb60f1f19e8fb2bc77d86645d18ca6dc
Author: Carl Worth <cworth at debian.org>
Date:   Fri Mar 2 15:55:14 2012 -0800

    copyright: Add correct license information and a pointer to upstream source
    
    Taskjuggler is GPL-2, (not GPL-2+ like gem2deb inserts as a stub).

diff --git a/debian/control b/debian/control
index ee32f58..fcb1e51 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
 # mail (>= 2.2.15), term-ansicolor (>= 1.0.7), rspec (>= 2.5.0, development)
-Description: A Project Management Software
+Description: Project management software with plain-text input language
  TaskJuggler is a modern and powerful, Free and Open Source Software project
  management tool. Its new approach to project planing and tracking is more
  flexible and superior to the commonly used Gantt chart editing tools.
diff --git a/debian/copyright b/debian/copyright
index 6c550b9..9c1df2f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,20 @@
 Format: http://dep.debian.net/deps/dep5
 Upstream-Name: taskjuggler
-Source: FIXME <http://example.com/>
+Source: http://www.taskjuggler.org/
 
 Files: *
-Copyright: <years> <put author's name and email here>
-           <years> <likewise for another author>
-License: GPL-2+ (FIXME)
+Copyright: 2006, 2007, 2008, 2009, 2010, 2011 Chris Schlaeger <chris at linux.com>
+License: GPL-2
+
+Files: debian/*
+Copyright: 2012 Carl Worth <cworth 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.
+ and/or modify it under the terms of version 2 of the GNU
+ General Public License as published by the Free Software
+ Foundation.
  .
  This program is distributed in the hope that it will be
  useful, but WITHOUT ANY WARRANTY; without even the implied
@@ -27,7 +31,3 @@ License: GPL-2+ (FIXME)
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
-Files: debian/*
-Copyright: 2012  <cworth at debian.org>
-License:
- [LICENSE TEXT]

-- 
taskjuggler.git