[pkg-java] r10750 - trunk/jcifs/debian

[Michael Koch]

Author: mkoch
Date: 2009-10-02 21:34:09 +0000 (Fri, 02 Oct 2009)
New Revision: 10750

Modified:
   trunk/jcifs/debian/changelog
   trunk/jcifs/debian/compat
   trunk/jcifs/debian/control
   trunk/jcifs/debian/rules
Log:
jcifs (1.3.12-1) unstable; urgency=low

  * New upstream release.
  * Build-Depends on default-jdk.
  * Build-Depends on debhelper (>= 7).
  * Build-Depends on libservlet2.5-java instead of libservlet2.3-java.
  * Add missing Depends: ${misc:Depends}.
  * Moved package to section 'java'.
  * Added myself to Uploaders.
  * Updated Standards-Version to 3.8.3.

 -- Michael Koch <konqueror at gmx.de>  Fri, 02 Oct 2009 23:11:05 +0200



Modified: trunk/jcifs/debian/changelog
===================================================================
--- trunk/jcifs/debian/changelog	2009-10-02 21:15:41 UTC (rev 10749)
+++ trunk/jcifs/debian/changelog	2009-10-02 21:34:09 UTC (rev 10750)
@@ -1,3 +1,16 @@
+jcifs (1.3.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Depends on default-jdk.
+  * Build-Depends on debhelper (>= 7).
+  * Build-Depends on libservlet2.5-java instead of libservlet2.3-java.
+  * Add missing Depends: ${misc:Depends}.
+  * Moved package to section 'java'.
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 02 Oct 2009 23:11:05 +0200
+
 jcifs (1.2.22-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/jcifs/debian/compat
===================================================================
--- trunk/jcifs/debian/compat	2009-10-02 21:15:41 UTC (rev 10749)
+++ trunk/jcifs/debian/compat	2009-10-02 21:34:09 UTC (rev 10750)
@@ -1 +1 @@
-4
+7

Modified: trunk/jcifs/debian/control
===================================================================
--- trunk/jcifs/debian/control	2009-10-02 21:15:41 UTC (rev 10749)
+++ trunk/jcifs/debian/control	2009-10-02 21:34:09 UTC (rev 10750)
@@ -1,20 +1,19 @@
 Source: jcifs
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varun at debian.org>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: libservlet2.3-java, ant, java-gcj-compat-dev
-Standards-Version: 3.8.0
+Uploaders: Kumar Appaiah <akumar at ee.iitm.ac.in>, Varun Hiremath <varun at debian.org>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
+Build-Depends-Indep: libservlet2.5-java
+Standards-Version: 3.8.3
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jcifs
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jcifs
 Homepage: http://jcifs.samba.org
 
 Package: libjcifs-java
-Section: libs
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime
-Suggests: java-virtual-machine, libjcifs-java-doc
+Depends: default-jre | java1-runtime | java2-runtime, ${misc:Depends}
+Suggests: libjcifs-java-doc
 Description: java library for the CIFS/SMB networking protocol
  JCIFS is an Open Source client library that implements the CIFS/SMB
  networking protocol in 100% Java. CIFS is the standard file sharing
@@ -23,6 +22,7 @@
 Package: libjcifs-java-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Suggests: libjcifs-java
 Description: Documentation for libjcifs-java (CIFS/SMB library for java)
  JCIFS is an Open Source client library that implements the CIFS/SMB

Modified: trunk/jcifs/debian/rules
===================================================================
--- trunk/jcifs/debian/rules	2009-10-02 21:15:41 UTC (rev 10749)
+++ trunk/jcifs/debian/rules	2009-10-02 21:34:09 UTC (rev 10750)
@@ -5,10 +5,9 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME := /usr/lib/jvm/java-gcj
-ANT_HOME := /usr/share/ant
+JAVA_HOME := /usr/lib/jvm/default-java
 
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar servlet-2.3.jar
+DEB_JARS := servlet-api-2.5
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_CLEAN_TARGET := clean
 DEB_COMPRESS_EXCLUDE := *.c *.java