[pkg-java] r10164 - trunk/libpicocontainer-java/debian

[Torsten Werner]

Author: twerner
Date: 2009-08-23 09:30:15 +0000 (Sun, 23 Aug 2009)
New Revision: 10164

Modified:
   trunk/libpicocontainer-java/debian/changelog
   trunk/libpicocontainer-java/debian/control
   trunk/libpicocontainer-java/debian/rules
Log:
* Switch to default-java. (Closes: #543060)
* Add missing ${misc:Depends}.
* Change Section: java.
* Update Standards-Version: 3.8.3.

Modified: trunk/libpicocontainer-java/debian/changelog
===================================================================
--- trunk/libpicocontainer-java/debian/changelog	2009-08-23 09:10:20 UTC (rev 10163)
+++ trunk/libpicocontainer-java/debian/changelog	2009-08-23 09:30:15 UTC (rev 10164)
@@ -1,3 +1,12 @@
+libpicocontainer-java (2.8-2) unstable; urgency=low
+
+  * Switch to default-java. (Closes: #543060)
+  * Add missing ${misc:Depends}.
+  * Change Section: java.
+  * Update Standards-Version: 3.8.3.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 23 Aug 2009 11:21:58 +0200
+
 libpicocontainer-java (2.8-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libpicocontainer-java/debian/control
===================================================================
--- trunk/libpicocontainer-java/debian/control	2009-08-23 09:10:20 UTC (rev 10163)
+++ trunk/libpicocontainer-java/debian/control	2009-08-23 09:30:15 UTC (rev 10164)
@@ -1,18 +1,18 @@
 Source: libpicocontainer-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Varun Hiremath <varun at debian.org>
 Build-Depends: debhelper (>= 6), cdbs
-Build-Depends-Indep: ant, java-gcj-compat-dev, libparanamer-java, libjboss-ejb3x-java
-Standards-Version: 3.8.0
+Build-Depends-Indep: ant, default-jdk, libparanamer-java, libjboss-ejb3x-java
+Standards-Version: 3.8.3
 Homepage: http://www.picocontainer.org
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libpicocontainer-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libpicocontainer-java
 
 Package: libpicocontainer-java
 Architecture: all
-Depends:  java-gcj-compat | java1-runtime | java2-runtime
+Depends: default-jre | java2-runtime, ${misc:Depends}
 Description: Java library implementing the Dependency Injection pattern
  PicoContainer is a highly embeddable full service Inversion of Control
  (IoC) container for components honour the Dependency Injection pattern.

Modified: trunk/libpicocontainer-java/debian/rules
===================================================================
--- trunk/libpicocontainer-java/debian/rules	2009-08-23 09:10:20 UTC (rev 10163)
+++ trunk/libpicocontainer-java/debian/rules	2009-08-23 09:30:15 UTC (rev 10164)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 
-JAVA_HOME		:= /usr/lib/jvm/java-gcj
+JAVA_HOME		:= /usr/lib/jvm/default-java
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_JARS		:= paranamer jboss-ejb3x
 
@@ -12,4 +12,4 @@
 	dh_link -plibpicocontainer-java /usr/share/java/picocontainer-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/picocontainer.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename	
+	uscan --force-download --rename