[pkg-java] r4050 - in trunk/argouml/debian: . patches

[avdyk at alioth.debian.org]

Author: avdyk
Date: 2007-08-24 09:15:47 +0000 (Fri, 24 Aug 2007)
New Revision: 4050

Added:
   trunk/argouml/debian/patches/03_dont_copy_testmodels.patch
Modified:
   trunk/argouml/debian/README.Debian
   trunk/argouml/debian/argouml.sh
   trunk/argouml/debian/changelog
Log:
added a patch to solve ISSUE4840 and comments about the override of JAVACMD

Modified: trunk/argouml/debian/README.Debian
===================================================================
--- trunk/argouml/debian/README.Debian	2007-08-24 09:01:36 UTC (rev 4049)
+++ trunk/argouml/debian/README.Debian	2007-08-24 09:15:47 UTC (rev 4050)
@@ -1,14 +1,16 @@
 argouml
 -------
 
+See http://argouml.tigris.org/issues/show_bug.cgi?id=ISSUE_NUMBER
+when I make a reference to ISSUE followed by a number.
+
 Building the source for Debian:
 -------------------------------
 
-I moved 'src/model' to 'src_new/model'.
-I moved 'src/i18n' to 'src_new/i18n'.
-I added a 'manuals' directory with:
+I moved 'argouml/src/model' to 'argouml/src_new/model'.
+I added a 'argouml/manuals' directory with:
   o argomanual-0.20.pdf
   o cookbook-0.20.pdf
   o quickguide-0.20.pdf
 
- -- Arnaud Vandyck <avdyk at debian.org>, Sun, 23 Jul 2006 20:11:09 +0200
+ -- Arnaud Vandyck <avdyk at debian.org>, Fri, 24 Aug 2007 11:11:37 +0200

Modified: trunk/argouml/debian/argouml.sh
===================================================================
--- trunk/argouml/debian/argouml.sh	2007-08-24 09:01:36 UTC (rev 4049)
+++ trunk/argouml/debian/argouml.sh	2007-08-24 09:15:47 UTC (rev 4050)
@@ -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/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"
+JDK_DIRS="$JAVA_HOME /usr/lib/j2sdk1.6-ibm /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
@@ -23,6 +23,7 @@
 else
   echo "No JVM found to run ArgoUML"
   echo "Please install a JVM to run ArgoUML or "
-  echo "set JAVA_HOME if it's not a JVM from a Debian Package."
+  echo "set JAVA_HOME if it's not a JVM from a Debian Package"
+  echo "or set JAVACMD with the path to the java command."
   exit 1
 fi

Modified: trunk/argouml/debian/changelog
===================================================================
--- trunk/argouml/debian/changelog	2007-08-24 09:01:36 UTC (rev 4049)
+++ trunk/argouml/debian/changelog	2007-08-24 09:15:47 UTC (rev 4050)
@@ -11,8 +11,9 @@
   * Changed a lot of path because upstream added an 'argouml' directory
   * Removed libxerces-java from (build-indep-)dependencies (closes:
     #418864).
+  * debian/patches/03_dont_copy_testmodels.patch: added to solve ISSUE4840
 
- -- Arnaud Vandyck <avdyk at debian.org>  Fri, 24 Aug 2007 11:01:17 +0200
+ -- Arnaud Vandyck <avdyk at debian.org>  Fri, 24 Aug 2007 11:12:12 +0200
 
 argouml (0.19.6-2.1) unstable; urgency=low
 

Added: trunk/argouml/debian/patches/03_dont_copy_testmodels.patch
===================================================================
--- trunk/argouml/debian/patches/03_dont_copy_testmodels.patch	                        (rev 0)
+++ trunk/argouml/debian/patches/03_dont_copy_testmodels.patch	2007-08-24 09:15:47 UTC (rev 4050)
@@ -0,0 +1,14 @@
+--- argouml/src_new/build.xml~	2007-08-24 08:18:01.000000000 +0000
++++ argouml/src_new/build.xml	2007-08-24 08:20:27.000000000 +0000
+@@ -301,9 +301,9 @@
+       tofile="${argo.build.classes}/org/argouml/registry.xml"/>
+  	
+   	<!-- copy test files -->
+-    <copy todir="${argo.tests.classes}/testmodels">
++    <!-- copy todir="${argo.tests.classes}/testmodels">
+       <fileset dir="${argo.tests.src}/testmodels" excludes="CVS/**" includes="**/**"/>
+-    </copy>
++    </copy -->
+   </target>
+ 
+   <!-- =================================================================== -->