[Python-apps-commits] r8040 - in packages/trac-diavisview/trunk/debian (changelog copyright)

[debacle at users.alioth.debian.org]

    Date: Saturday, January 7, 2012 @ 15:04:00
  Author: debacle
Revision: 8040

Version for upload.

Modified:
  packages/trac-diavisview/trunk/debian/changelog
  packages/trac-diavisview/trunk/debian/copyright

Modified: packages/trac-diavisview/trunk/debian/changelog
===================================================================
--- packages/trac-diavisview/trunk/debian/changelog	2012-01-06 23:31:56 UTC (rev 8039)
+++ packages/trac-diavisview/trunk/debian/changelog	2012-01-07 15:04:00 UTC (rev 8040)
@@ -1,8 +1,5 @@
-trac-diavisview (0.1+r8100-1) UNRELEASE; urgency=low
+trac-diavisview (0.1+r11124-1) unstable; urgency=low
 
-  TODO: Clarify license: GPL or BSD or both?
-  TODO: Compatibility with Trac 0.12.
-
   * First Debian package (Closes: #504472).
 
  -- W. Martin Borgert <debacle at debian.org>  Sun, 01 Jan 2012 15:48:06 +0000

Modified: packages/trac-diavisview/trunk/debian/copyright
===================================================================
--- packages/trac-diavisview/trunk/debian/copyright	2012-01-06 23:31:56 UTC (rev 8039)
+++ packages/trac-diavisview/trunk/debian/copyright	2012-01-07 15:04:00 UTC (rev 8040)
@@ -16,19 +16,29 @@
 
 License:
 
-    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.
+    Copyright (c) The Regents of the University of California.
+    All rights reserved.
 
-    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.
+    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 University nor the names of its contributors
+       may be used to endorse or promote products derived from this software
+       without specific prior written permission.
 
-    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 St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the General Public License can be
-found in `/usr/share/common-licenses/GPL'.
+    THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.