[pkg-java] r10932 - trunk/libjgroups2.6-java/debian

[Torsten Werner]

Author: twerner
Date: 2009-10-27 20:49:30 +0000 (Tue, 27 Oct 2009)
New Revision: 10932

Modified:
   trunk/libjgroups2.6-java/debian/changelog
   trunk/libjgroups2.6-java/debian/control
   trunk/libjgroups2.6-java/debian/rules
Log:
* Merge fixes from version 2.7.0.GA-1:
  - Improve target 'get-orig-source'.
  - Change Depends: openjdk-6-jre-headless.
  - Updated Standards-Version: 3.8.3.
  - Change Section: java.

Modified: trunk/libjgroups2.6-java/debian/changelog
===================================================================
--- trunk/libjgroups2.6-java/debian/changelog	2009-10-27 20:45:31 UTC (rev 10931)
+++ trunk/libjgroups2.6-java/debian/changelog	2009-10-27 20:49:30 UTC (rev 10932)
@@ -2,6 +2,11 @@
 
   * Reupload jgroups 2.6 as legacy package libjgroups2.6-java which is needed
     for jboss-cache2 because of API changes.
+  * Merge fixes from version 2.7.0.GA-1:
+    - Improve target 'get-orig-source'.
+    - Change Depends: openjdk-6-jre-headless.
+    - Updated Standards-Version: 3.8.3.
+    - Change Section: java.
 
  -- Torsten Werner <twerner at debian.org>  Tue, 27 Oct 2009 20:08:12 +0100
 

Modified: trunk/libjgroups2.6-java/debian/control
===================================================================
--- trunk/libjgroups2.6-java/debian/control	2009-10-27 20:45:31 UTC (rev 10931)
+++ trunk/libjgroups2.6-java/debian/control	2009-10-27 20:49:30 UTC (rev 10932)
@@ -1,5 +1,5 @@
 Source: libjgroups2.6-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>
@@ -7,14 +7,14 @@
 Build-Depends-Indep: ant, openjdk-6-jdk, glassfish-javaee, bsh, junit,
  libxalan2-java, libbcprov-java, libcommons-logging-java,
  liblog4j1.2-java, ant-optional
-Standards-Version: 3.8.0
+Standards-Version: 3.8.3
 Homepage: http://www.jgroups.org/javagroupsnew/docs/index.html
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjgroups-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjgroups-java
 
 Package: libjgroups2.6-java
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre | java1-runtime | java2-runtime
+Depends: ${shlibs:Depends}, ${misc:Depends}, openjdk-6-jre-headless | java5-runtime
 Description: Toolkit for Reliable Multicast Communication
  JGroups is a toolkit for reliable multicast communication.  (Note
  that this doesn't necessarily mean IP Multicast, JGroups can also use

Modified: trunk/libjgroups2.6-java/debian/rules
===================================================================
--- trunk/libjgroups2.6-java/debian/rules	2009-10-27 20:45:31 UTC (rev 10931)
+++ trunk/libjgroups2.6-java/debian/rules	2009-10-27 20:49:30 UTC (rev 10932)
@@ -17,4 +17,4 @@
 	dh_link /usr/share/java/jgroups-core-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/jgroups-core-2.6.jar
 
 get-orig-source:
-	-uscan --upstream-version 0
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename