[pkg-java] r12876 - trunk/groovy/debian

[Miguel Landaeta]

Author: nomadium-guest
Date: 2010-08-06 00:54:14 +0000 (Fri, 06 Aug 2010)
New Revision: 12876

Modified:
   trunk/groovy/debian/changelog
   trunk/groovy/debian/compat
   trunk/groovy/debian/control
   trunk/groovy/debian/copyright
Log:
* New upstream release.
* Add Depends on default-jdk. (Closes: 580160).
* Bump debhelper compatibility level to 7.
* Bump Standards-Version to 3.9.1.
  debian/copyright was updated to include the full text of BSD license,
  references to /usr/share/common-licenses/BSD are now deprecated.


Modified: trunk/groovy/debian/changelog
===================================================================
--- trunk/groovy/debian/changelog	2010-08-05 20:35:34 UTC (rev 12875)
+++ trunk/groovy/debian/changelog	2010-08-06 00:54:14 UTC (rev 12876)
@@ -1,3 +1,14 @@
+groovy (1.7.4-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Add Depends on default-jdk. (Closes: 580160).
+  * Bump debhelper compatibility level to 7.
+  * Bump Standards-Version to 3.9.1.
+    debian/copyright was updated to include the full text of BSD license,
+    references to /usr/share/common-licenses/BSD are now deprecated.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 05 Aug 2010 19:38:10 -0430
+
 groovy (1.7.3-1) UNRELEASED; urgency=low
 
   [ Steffen Moeller ]
@@ -12,7 +23,7 @@
 
  -- Miguel Landaeta <miguel at miguel.cc>  Thu, 05 Aug 2010 14:49:05 -0430
 
-groovy (1.7.2-1) unstable; urgency=low
+groovy (1.7.2-1) UNRELEASED; urgency=low
 
   [ Torsten Werner ]
   UNRELEASED, FTBFS: needs jansi

Modified: trunk/groovy/debian/compat
===================================================================
--- trunk/groovy/debian/compat	2010-08-05 20:35:34 UTC (rev 12875)
+++ trunk/groovy/debian/compat	2010-08-06 00:54:14 UTC (rev 12876)
@@ -1 +1 @@
-6
+7

Modified: trunk/groovy/debian/control
===================================================================
--- trunk/groovy/debian/control	2010-08-05 20:35:34 UTC (rev 12875)
+++ trunk/groovy/debian/control	2010-08-06 00:54:14 UTC (rev 12876)
@@ -9,7 +9,7 @@
  (>= 1.0.3), junit4, libmockobjects-java (>= 0.09), libregexp-java (>=
  1.2), libservlet2.5-java, libxstream-java, libjline-java, antlr,
  tofrodos, ivy, libqdox-java, libjarjar-java, libjansi-java
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Homepage: http://groovy.codehaus.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/groovy/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/groovy/
@@ -20,8 +20,7 @@
  libcommons-cli-java (>= 1.0),
  libcommons-logging-java (>= 1.0.3), junit4, libmockobjects-java (>=
  0.09), libregexp-java (>= 1.2), libservlet2.5-java, libjline-java,
- libxstream-java, ivy, libjansi-java,
- default-jre-headless | java5-runtime-headless
+ libxstream-java, ivy, libjansi-java, default-jdk
 Suggests: groovy-doc, ant (>= 1.7.1)
 Description: Agile dynamic language for the Java Virtual Machine
  Groovy is an agile dynamic language for the JVM combining lots of great

Modified: trunk/groovy/debian/copyright
===================================================================
--- trunk/groovy/debian/copyright	2010-08-05 20:35:34 UTC (rev 12875)
+++ trunk/groovy/debian/copyright	2010-08-06 00:54:14 UTC (rev 12876)
@@ -13,9 +13,25 @@
 Files: src/main/org/codehaus/groovy/jsr223/*
 Copyright: © 2006 Sun Microsystems, Inc.
 License: BSD
- On Debian systems the full text of the BSD license can be found in
- the /usr/share/common-licenses/BSD file.
+ Redistribution and use in source and binary forms, with or without modification, are 
+ permitted provided that the following conditions are met: Redistributions of source code 
+ must retain the above copyright notice, this list of conditions and the following disclaimer.
+ 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. Neither the name of the Sun Microsystems nor the names of 
+ is 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 OWNER 
+ 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.
+
 Files: debian/*
 Copyright: © 2009 Varun Hiremath <varun at debian.org>
 	   © 2009 Torsten Werner <twerner at debian.org>