[pkg-java] r5554 - in trunk/libjibx-java/debian: . patches

[mkoch at alioth.debian.org]

Author: mkoch
Date: 2008-01-25 22:26:04 +0000 (Fri, 25 Jan 2008)
New Revision: 5554

Modified:
   trunk/libjibx-java/debian/
   trunk/libjibx-java/debian/changelog
   trunk/libjibx-java/debian/control
   trunk/libjibx-java/debian/patches/
   trunk/libjibx-java/debian/rules
Log:
libjibx-java (1.0.1-2) unstable; urgency=low

  [ Michael Bienia ]
  * debian/control:
    + Build-Depend on sun-java6-jdk instead of ibm-j2sdk1.6 | sun-j2sdk1.4.
    + Depend on sun-java6-jre instead of sun-j2re1.4.
    + Recommend iceweasel instead of mozilla.
  * debian/rules:
    + Set JAVA_HOME_DIRS to the correct value for sun-java6-jdk.

  [ Michael Koch ]
  * Fixed clean target to make it possible to build the package two times in a
    row.
  * Moved debhelper and cdbs to Build-Depends.
  * Updated Standards-Version to 3.7.3.
  * Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Fri, 25 Jan 2008 23:30:33 +0100




Property changes on: trunk/libjibx-java/debian
___________________________________________________________________
Name: svn:ignore
   + files
libjibx-java
libjibx-java-doc
stamp-*
*.debhelper


Modified: trunk/libjibx-java/debian/changelog
===================================================================
--- trunk/libjibx-java/debian/changelog	2008-01-24 21:40:56 UTC (rev 5553)
+++ trunk/libjibx-java/debian/changelog	2008-01-25 22:26:04 UTC (rev 5554)
@@ -1,3 +1,22 @@
+libjibx-java (1.0.1-2) unstable; urgency=low
+
+  [ Michael Bienia ]
+  * debian/control:
+    + Build-Depend on sun-java6-jdk instead of ibm-j2sdk1.6 | sun-j2sdk1.4.
+    + Depend on sun-java6-jre instead of sun-j2re1.4.
+    + Recommend iceweasel instead of mozilla.
+  * debian/rules:
+    + Set JAVA_HOME_DIRS to the correct value for sun-java6-jdk.
+
+  [ Michael Koch ]
+  * Fixed clean target to make it possible to build the package two times in a
+    row.
+  * Moved debhelper and cdbs to Build-Depends.
+  * Updated Standards-Version to 3.7.3.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 25 Jan 2008 23:30:33 +0100
+
 libjibx-java (1.0.1-1) unstable; urgency=low
 
   * Initial Release (closes: Bug#354374).

Modified: trunk/libjibx-java/debian/control
===================================================================
--- trunk/libjibx-java/debian/control	2008-01-24 21:40:56 UTC (rev 5553)
+++ trunk/libjibx-java/debian/control	2008-01-25 22:26:04 UTC (rev 5554)
@@ -2,13 +2,14 @@
 Section: contrib/libs
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>
-Build-Depends-Indep: debhelper (>= 4.1.0), cdbs (>= 0.4.8), gjdoc, ibm-j2sdk1.6 | sun-j2sdk1.4, ant, antlr, libbcel-java, libxpp3-java
-Standards-Version: 3.6.2.0
+Uploaders: Eric Lavarde <deb at zorglub.s.bawue.de>, Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 4.1.0), cdbs (>= 0.4.8)
+Build-Depends-Indep: gjdoc, sun-java6-jdk, ant, antlr, libbcel-java, libxpp3-java
+Standards-Version: 3.7.3
 
 Package: libjibx-java
 Architecture: all
-Depends: sun-j2re1.4 | java2-runtime, libbcel-java, libxpp3-java
+Depends: sun-java6-jre | java2-runtime, libbcel-java, libxpp3-java
 Suggests: java-virtual-machine, libjibx-java-doc
 Description: Framework for binding XML data to Java objects
  JiBX lets you work with data from XML documents using your own class
@@ -21,7 +22,7 @@
 Package: libjibx-java-doc
 Section: contrib/doc
 Architecture: all
-Recommends: mozilla | www-browser
+Recommends: iceweasel | www-browser
 Suggests: libjibx-java
 Description: Documentation for libjibx-java
  This package contains documentation, javadocs (or should I say gjdocs) and


Property changes on: trunk/libjibx-java/debian/patches
___________________________________________________________________
Name: svn:ignore
   + *.log


Modified: trunk/libjibx-java/debian/rules
===================================================================
--- trunk/libjibx-java/debian/rules	2008-01-24 21:40:56 UTC (rev 5553)
+++ trunk/libjibx-java/debian/rules	2008-01-25 22:26:04 UTC (rev 5554)
@@ -1,12 +1,11 @@
 #!/usr/bin/make -f
-# debian/rules for Commons Fileupload (uses CDBS)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_COMPRESS_EXCLUDE := .class
-JAVA_HOME_DIRS       := /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.6-ibm
+JAVA_HOME_DIRS       := /usr/lib/jvm/java-6-sun
 ANT_HOME             := /usr/share/ant
 DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar
 DEB_ANT_BUILD_TARGET := setrelease current devdoc
@@ -16,5 +15,5 @@
 LIBRARY=jibx
 VERSION=1.0.1
 
-#clean:: 
-#	-rm -fr lib 
+clean:: 
+	-rm -fr build/classes build/docs/dev/resources/inherit.gif lib/*