[pkg-java] r13834 - in trunk/jtreg/debian: . patches

[Guillaume Mazoyer]

Author: gmazoyer-guest
Date: 2011-07-02 14:09:40 +0000 (Sat, 02 Jul 2011)
New Revision: 13834

Modified:
   trunk/jtreg/debian/changelog
   trunk/jtreg/debian/patches/launchers.patch
   trunk/jtreg/debian/rules
Log:
Fix patch for scripts variables.
Use rm -f in rules instead of ||:.

Modified: trunk/jtreg/debian/changelog
===================================================================
--- trunk/jtreg/debian/changelog	2011-07-02 14:03:52 UTC (rev 13833)
+++ trunk/jtreg/debian/changelog	2011-07-02 14:09:40 UTC (rev 13834)
@@ -1,3 +1,10 @@
+jtreg (4.1-2) unstable; urgency=low
+
+  * debian/patches/launchers.patch: Fixed typo in a variable name.
+  * debian/rules: Removed extra spaces and use rm -f instead of ||:.
+
+ -- Guillaume Mazoyer <respawneral at gmail.com>  Sat, 02 Jul 2011 07:13:54 -0500
+
 jtreg (4.1-1) unstable; urgency=low
 
   * Initial release (Closes: #629577)

Modified: trunk/jtreg/debian/patches/launchers.patch
===================================================================
--- trunk/jtreg/debian/patches/launchers.patch	2011-07-02 14:03:52 UTC (rev 13833)
+++ trunk/jtreg/debian/patches/launchers.patch	2011-07-02 14:09:40 UTC (rev 13834)
@@ -3,8 +3,8 @@
 ## Bug: bug URL
 Index: jtreg-4.1/src/share/bin/jtdiff.sh
 ===================================================================
---- jtreg-4.1.orig/src/share/bin/jtdiff.sh	2011-06-20 06:16:12.189555818 -0500
-+++ jtreg-4.1/src/share/bin/jtdiff.sh	2011-06-20 06:16:39.521555822 -0500
+--- jtreg-4.1.orig/src/share/bin/jtdiff.sh	2011-07-02 07:12:29.290992102 -0500
++++ jtreg-4.1/src/share/bin/jtdiff.sh	2011-07-02 07:13:22.678992112 -0500
 @@ -38,32 +38,25 @@
  # 
  # jtdiff also provides an Ant task for direct invocation from Ant.
@@ -49,7 +49,7 @@
 +fi
 +
 +# Directory where other JAR are
-+if [ -z "${JTHAR_HOME}" ]; then
++if [ -z "${JAR_HOME}" ]; then
 +    JAR_HOME="/usr/share/java"
 +fi
  
@@ -72,7 +72,7 @@
 +# Determine java for jtdiff, JAVA_HOME, java
 +JT_JAVA="${JAVA_HOME}/bin/java"
 +# Determine class path
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JTHAR_HOME}/junit.jar"
++JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar"
  
  # Verify java version (1.)5 or newer used to run jtdiff
 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | 
@@ -94,8 +94,8 @@
      $jtdiffOpts
 Index: jtreg-4.1/src/share/bin/jtreg.sh
 ===================================================================
---- jtreg-4.1.orig/src/share/bin/jtreg.sh	2011-06-20 06:16:12.177555818 -0500
-+++ jtreg-4.1/src/share/bin/jtreg.sh	2011-06-20 06:16:58.117555826 -0500
+--- jtreg-4.1.orig/src/share/bin/jtreg.sh	2011-07-02 07:12:29.270992102 -0500
++++ jtreg-4.1/src/share/bin/jtreg.sh	2011-07-02 07:13:49.818992118 -0500
 @@ -57,32 +57,25 @@
  # jtreg also provides Ant tasks; see the online help for details.
  # E.g.  jtreg -onlineHelp ant
@@ -140,7 +140,7 @@
 +fi
 +
 +# Directory where other JAR are
-+if [ -z "${JTHAR_HOME}" ]; then
++if [ -z "${JAR_HOME}" ]; then
 +    JAR_HOME="/usr/share/java"
 +fi
  
@@ -165,7 +165,7 @@
 +# Determine java for jtdiff, JAVA_HOME, java
 +JT_JAVA="${JAVA_HOME}/bin/java"
 +# Determine class path
-+JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JTHAR_HOME}/junit.jar"
++JT_CLASSPATH="${JTREG_HOME}/jtreg.jar:${JTHAR_HOME}/javatest.jar:${JTHAR_HOME}/jh.jar:${JAR_HOME}/junit.jar"
  
  # Verify java version (1.)5 or newer used to run jtreg
 -version=`"$JT_JAVA" -classpath "${JT_HOME}/lib/jtreg.jar" com.sun.javatest.regtest.GetSystemProperty java.version 2>&1 | 

Modified: trunk/jtreg/debian/rules
===================================================================
--- trunk/jtreg/debian/rules	2011-07-02 14:03:52 UTC (rev 13833)
+++ trunk/jtreg/debian/rules	2011-07-02 14:09:40 UTC (rev 13834)
@@ -6,15 +6,15 @@
 	ant -f make/build.xml
 	dh_auto_build
 	JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" \
-	 --help-option="-help" ./dist/jtreg/linux/bin/jtdiff  > jtdiff.1
+	 --help-option="-help" ./dist/jtreg/linux/bin/jtdiff > jtdiff.1
 	JTREG_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" \
-	 --help-option="-help" ./dist/jtreg/linux/bin/jtreg  > jtreg.1
+	 --help-option="-help" ./dist/jtreg/linux/bin/jtreg > jtreg.1
 
 override_dh_auto_clean:
-	rm -r dist  ||:
-	rm -r build ||:
-	rm jtdiff.1 ||:
-	rm jtreg.1  ||:
+	rm -rf dist
+	rm -rf build
+	rm -f jtdiff.1
+	rm -f jtreg.1
 	dh_auto_clean
 
 %: