The following commit has been merged in the master branch:
commit 83817ed876a8343c7ad1ac7327a52d3f7f6bec37
Author: tony mancill <tmanc...@debian.org>
Date: Sun Jan 15 19:23:20 2012 -0800
update for team upload; update standards version; update path to license
file in d/copyright
diff --git a/debian/changelog b/debian/changelog
index ffbf0f1..b3dd64f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
-jruby (1.5.6-3) UNRELEASED; urgency=low
+jruby (1.5.6-3) unstable; urgency=low
+ [Miguel Landaeta]
* Team upload.
* Switch to default-jdk. (Closes: #655823).
+ [tony mancill]
+ * Bump Standards-Version to 3.9.2 (no changes).
+ * Address lintian warning in d/copyright (update path to GPL-2).
+
-- Miguel Landaeta <mig...@miguel.cc> Sat, 14 Jan 2012 14:13:54 -0430
jruby (1.5.6-2) unstable; urgency=high
diff --git a/debian/control b/debian/control
index d3d85e8..d2ed866 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (>= 6.0.7~), default-jdk,
ant-optional,
netbase, libjgrapht0.8-java, libjcodings-java, libbytelist-java, libjffi-java,
libjaffl-java, libjruby-joni-java, yydebug, nailgun, libjnr-posix-java,
libjnr-netdb-java, libyecht-java (>= 0.0.2-2~), cdbs
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Homepage: http://jruby.org
Vcs-Git: git://git.debian.org/git/pkg-java/jruby.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/jruby.git
diff --git a/debian/copyright b/debian/copyright
index f389088..7599630 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -342,8 +342,8 @@ This code is licensed under either the CDDL Version 1.0
(see below) or the GPL 2
The file rb_w32_cmdvector.h within jruby-launcher-1.0.3-java.gem is
Copyright (c) 1993, Intergraph Corporation
-You may distribute under the terms of either the GNU General Public License
(see
-/usr/share/common-licenses/GPL) or the Artistic License (see
+You may distribute under the terms of either the GNU General Public License
+(see /usr/share/common-licenses/GPL-2) or the Artistic License (see
/usr/share/common-licenses/Artistic), as specified in the perl README file.
---
--
100% pure-Java implementation of Ruby
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
