[pkg-java] r3840 - in trunk/libjgoodies-forms-java/debian: . patches

mkoch at alioth.debian.org mkoch at alioth.debian.org
Sun Jul 15 16:43:29 UTC 2007 

Author: mkoch
Date: 2007-07-15 16:43:29 +0000 (Sun, 15 Jul 2007)
New Revision: 3840

Modified:
   trunk/libjgoodies-forms-java/debian/
   trunk/libjgoodies-forms-java/debian/ant.properties
   trunk/libjgoodies-forms-java/debian/changelog
   trunk/libjgoodies-forms-java/debian/control
   trunk/libjgoodies-forms-java/debian/install
   trunk/libjgoodies-forms-java/debian/libjgoodies-forms-java-doc.README.Debian
   trunk/libjgoodies-forms-java/debian/links
   trunk/libjgoodies-forms-java/debian/patches/
   trunk/libjgoodies-forms-java/debian/patches/02_default_properties.patch
   trunk/libjgoodies-forms-java/debian/rules
Log:
libjgoodies-forms-java (1.1.0-1) unstable; urgency=low

  * New upstream release
  * Use java-gcj-compat instead of kaffe/sablevm.
  * Adjusted debian/libjgoodies-forms-java-doc.README.Debian
  * Updated Standard-Version to 3.7.2.
  * Added myself to Uploaders.

 -- Michael Koch <konqueror at gmx.de>  Sun, 15 Jul 2007 18:28:32 +0200




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


Modified: trunk/libjgoodies-forms-java/debian/ant.properties
===================================================================
--- trunk/libjgoodies-forms-java/debian/ant.properties	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/ant.properties	2007-07-15 16:43:29 UTC (rev 3840)
@@ -1,2 +1,2 @@
-build.compile.executable = /usr/lib/kaffe/bin/javac
+build.compile.executable = /usr/lib/jvm/java-gcj/bin/javac
 javadoc.link = file:/usr/share/doc/classpath-doc/api

Modified: trunk/libjgoodies-forms-java/debian/changelog
===================================================================
--- trunk/libjgoodies-forms-java/debian/changelog	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/changelog	2007-07-15 16:43:29 UTC (rev 3840)
@@ -1,3 +1,13 @@
+libjgoodies-forms-java (1.1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Use java-gcj-compat instead of kaffe/sablevm.
+  * Adjusted debian/libjgoodies-forms-java-doc.README.Debian
+  * Updated Standard-Version to 3.7.2.
+  * Added myself to Uploaders.
+
+ -- Michael Koch <konqueror at gmx.de>  Sun, 15 Jul 2007 18:28:32 +0200
+
 libjgoodies-forms-java (1.0.5-5) unstable; urgency=low
 
   * Fix lintian/linda warnings: build-depends-without-arch-dep,

Modified: trunk/libjgoodies-forms-java/debian/control
===================================================================
--- trunk/libjgoodies-forms-java/debian/control	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/control	2007-07-15 16:43:29 UTC (rev 3840)
@@ -2,13 +2,14 @@
 Section: 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, kaffe, ant, antlr, classpath-doc
-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: java-gcj-compat-dev, ant, antlr, classpath-doc
+Standards-Version: 3.7.2
 
 Package: libjgoodies-forms-java
 Architecture: all
-Depends: kaffe | sablevm | java1-runtime | java2-runtime
+Depends: java-gcj-compat | java1-runtime | java2-runtime
 Suggests: java-virtual-machine, libjgoodies-forms-java-doc
 Provides: libforms-java
 Replaces: libforms-java

Modified: trunk/libjgoodies-forms-java/debian/install
===================================================================
--- trunk/libjgoodies-forms-java/debian/install	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/install	2007-07-15 16:43:29 UTC (rev 3840)
@@ -1 +1 @@
-build/forms-1.0.5.jar usr/share/java
+build/forms-1.1.0.jar usr/share/java

Modified: trunk/libjgoodies-forms-java/debian/libjgoodies-forms-java-doc.README.Debian
===================================================================
--- trunk/libjgoodies-forms-java/debian/libjgoodies-forms-java-doc.README.Debian	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/libjgoodies-forms-java-doc.README.Debian	2007-07-15 16:43:29 UTC (rev 3840)
@@ -7,7 +7,7 @@
 In order to check the tutorial code, go to the directory
 /usr/share/doc/libforms-java-doc/tutorial, and use a command similar to the
 following one (depending on which virtual machine, you'd like to use):
-$ JAVA_HOME=/usr/lib/fjsdk PATH=/usr/lib/fjsdk/bin:$PATH \
+$ JAVA_HOME=/usr/lib/jvm/java-gcj PATH=/usr/lib/jvm/java-gcj/bin:$PATH \
 	java -cp .:/usr/share/java/forms.jar \
 	com/jgoodies/forms/tutorial/QuickStartExample
 (the example assumes you're using the free-java-sdk package, replacing

Modified: trunk/libjgoodies-forms-java/debian/links
===================================================================
--- trunk/libjgoodies-forms-java/debian/links	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/links	2007-07-15 16:43:29 UTC (rev 3840)
@@ -1 +1 @@
-usr/share/java/forms-1.0.5.jar usr/share/java/forms.jar
+usr/share/java/forms-1.1.0.jar usr/share/java/forms.jar


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


Modified: trunk/libjgoodies-forms-java/debian/patches/02_default_properties.patch
===================================================================
--- trunk/libjgoodies-forms-java/debian/patches/02_default_properties.patch	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/patches/02_default_properties.patch	2007-07-15 16:43:29 UTC (rev 3840)
@@ -1,11 +1,11 @@
---- default.properties	2004-10-10 13:11:48.000000000 +0200
-+++ default.properties	2005-08-01 21:46:36.000000000 +0200
-@@ -56,7 +56,7 @@
+--- default.properties.orig	2007-07-15 18:35:04.000000000 +0200
++++ default.properties	2007-07-15 18:36:00.000000000 +0200
+@@ -58,7 +58,7 @@
  build.javadocs.dir = ${build.docs.dir}/api
  build.reports.dir  = ${build.dir}/test-reports
  
--build.main.jar     = ${build.dir}/${name}.jar
-+build.main.jar     = ${build.dir}/${name}-${impl.version}.jar
+-build.core.jar     = ${build.dir}/${name}.jar
++build.core.jar     = ${build.dir}/${name}-${impl.version}.jar
  
- 
- # Dist Properties -----------------------------------------------
+ build.maven.dir    = ${build.dir}/maven
+ build.maven.pom.template = ${top.dir}/conf/maven-pom-template.xml

Modified: trunk/libjgoodies-forms-java/debian/rules
===================================================================
--- trunk/libjgoodies-forms-java/debian/rules	2007-07-15 15:43:52 UTC (rev 3839)
+++ trunk/libjgoodies-forms-java/debian/rules	2007-07-15 16:43:29 UTC (rev 3840)
@@ -6,14 +6,13 @@
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_COMPRESS_EXCLUDE := .class
-JAVA_HOME_DIRS       := /usr/lib/kaffe /usr/lib/fjsdk
+JAVA_HOME            := /usr/lib/jvm/java-gcj
 ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar xerces gnu-classpath-tools-gjdoc com-sun-javadoc com-sun-tools-doclets-Taglet antlr $(JAVA_HOME)/jre/lib/rt.jar
-DEB_ANT_COMPILER     := jikes
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar xerces gnu-classpath-tools-gjdoc com-sun-javadoc com-sun-tools-doclets-Taglet antlr
 DEB_ANT_BUILD_TARGET := compile jar javadoc
 
 LIBRARY=forms
-VERSION=1.0.5
+VERSION=1.1.0
 
 #clean:: 
 #	-rm -fr lib

More information about the pkg-java-commits mailing list