[pkg-java] r4049 - trunk/argouml/debian

[avdyk at alioth.debian.org]

Author: avdyk
Date: 2007-08-24 09:01:36 +0000 (Fri, 24 Aug 2007)
New Revision: 4049

Modified:
   trunk/argouml/debian/argouml.sh
   trunk/argouml/debian/changelog
   trunk/argouml/debian/control
   trunk/argouml/debian/rules
Log:
working on new upstream

Modified: trunk/argouml/debian/argouml.sh
===================================================================
--- trunk/argouml/debian/argouml.sh	2007-08-23 20:50:40 UTC (rev 4048)
+++ trunk/argouml/debian/argouml.sh	2007-08-24 09:01:36 UTC (rev 4049)
@@ -3,7 +3,7 @@
 
 # The first existing directory is used for JAVA_HOME (if JAVA_HOME is not
 # defined in $DEFAULT)
-JDK_DIRS="$JAVA_HOME /usr/lib/j2re1.5-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/j2re1.4-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3 /usr/lib/j2sdk1.3"
+JDK_DIRS="$JAVA_HOME /usr/lib/jvm/java-1.5.0-sun /usr/lib/j2re1.5-sun /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/j2re1.4-sun /usr/lib/j2sdk1.5-ibm /usr/lib/j2sdk1.4-ibm /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4 /usr/lib/j2se/1.3 /usr/lib/j2sdk1.3"
 
 # Look for the right JVM to use
 for jdir in $JDK_DIRS; do

Modified: trunk/argouml/debian/changelog
===================================================================
--- trunk/argouml/debian/changelog	2007-08-23 20:50:40 UTC (rev 4048)
+++ trunk/argouml/debian/changelog	2007-08-24 09:01:36 UTC (rev 4049)
@@ -1,4 +1,4 @@
-argouml (0.21.22beta3-1) unstable; urgency=low
+argouml (0.24-1) unstable; urgency=low
 
   * New upstream release (closes: #342200, #217878).
   * Added Sun's 1.4 and 1.5 jdk and jre to the search path (closes:
@@ -9,8 +9,10 @@
   * Updated to standards-version 3.7.2: debhelper and cdbs are now in
     Build-Depends.
   * Changed a lot of path because upstream added an 'argouml' directory
+  * Removed libxerces-java from (build-indep-)dependencies (closes:
+    #418864).
 
- -- Arnaud Vandyck <avdyk at debian.org>  Thu,  3 Aug 2006 16:23:22 +0200
+ -- Arnaud Vandyck <avdyk at debian.org>  Fri, 24 Aug 2007 11:01:17 +0200
 
 argouml (0.19.6-2.1) unstable; urgency=low
 

Modified: trunk/argouml/debian/control
===================================================================
--- trunk/argouml/debian/control	2007-08-23 20:50:40 UTC (rev 4048)
+++ trunk/argouml/debian/control	2007-08-24 09:01:36 UTC (rev 4049)
@@ -4,12 +4,12 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Arnaud Vandyck <avdyk at debian.org>
 Build-Depends: cdbs (>= 0.4.5.3), debhelper (>> 4.0.0)
-Build-Depends-Indep: java-gcj-compat-dev | java2-compiler, libxerces-java, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, jikes, ant (>=1.5), ant-optional, libjdepend-java, junit, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), libgnujmi-java, libswidgets-java
+Build-Depends-Indep: java-gcj-compat-dev | java2-compiler, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, jikes, ant (>=1.5), ant-optional, libjdepend-java, junit, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), libgnujmi-java, libswidgets-java
 Standards-Version: 3.7.2
 
 Package: argouml
 Architecture: all
-Depends: j2re1.4-sun | java2-runtime, libxerces-java, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), libgnujmi-java, libswidgets-java
+Depends: j2re1.4-sun | java2-runtime, antlr, liblog4j1.2-java, libgef-java (>= 0.10.2), libnsuml-java, libocl-argo-java, libi18n-java (>= 0.1.3), libtoolbar-java (>= 0.4), libgnujmi-java, libswidgets-java
 Suggests: argouml-doc
 Description: modelling tool to help you do your design using UML
  ArgoUML provides the following features:

Modified: trunk/argouml/debian/rules
===================================================================
--- trunk/argouml/debian/rules	2007-08-23 20:50:40 UTC (rev 4048)
+++ trunk/argouml/debian/rules	2007-08-24 09:01:36 UTC (rev 4049)
@@ -5,10 +5,9 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
-JAVA_HOME_DIRS := /usr/lib/j2sdk1.5-ibm /usr/lib/jvm/java-gcj
+JAVA_HOME_DIRS := /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-gcj
 DEB_JARS := ant-optional log4j-1.2 gef ocl-argo antlrall \
 						jdepend junit i18n toolbar jmi swidgets
-#						xml-apis nsuml xercesImpl
 
 DEB_BUILDDIR := argouml/src_new
 #DEB_ANT_BUILDFILE := argouml/src_new/build.xml