[pkg-java] r7754 - in trunk/libcommons-jexl-java/debian: . patches

[onkarshinde-guest at alioth.debian.org]

Author: onkarshinde-guest
Date: 2008-12-27 09:57:29 +0000 (Sat, 27 Dec 2008)
New Revision: 7754

Modified:
   trunk/libcommons-jexl-java/debian/README.source
   trunk/libcommons-jexl-java/debian/changelog
   trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch
   trunk/libcommons-jexl-java/debian/rules
Log:
Fix 01_jar_without_tests.patch

Modified: trunk/libcommons-jexl-java/debian/README.source
===================================================================
--- trunk/libcommons-jexl-java/debian/README.source	2008-12-27 02:29:13 UTC (rev 7753)
+++ trunk/libcommons-jexl-java/debian/README.source	2008-12-27 09:57:29 UTC (rev 7754)
@@ -11,8 +11,11 @@
 
      make -f debian/rules apply-patches
 
-   Note: This should happen automatically when you run 
-   dpkg-source -x on a CDBS simple-patchsys.mk source package.
+   Note: It has been proposed that, in future, this should happen 
+   automatically when you run dpkg-source -x on a CDBS 
+   simple-patchsys.mk source package.  However, this proposal has 
+   apparently not yet been implemented, so for now you have to do 
+   it yourself like this.
 
  * To modify the source and save those modifications so that
    they will be applied when building the package, pick a

Modified: trunk/libcommons-jexl-java/debian/changelog
===================================================================
--- trunk/libcommons-jexl-java/debian/changelog	2008-12-27 02:29:13 UTC (rev 7753)
+++ trunk/libcommons-jexl-java/debian/changelog	2008-12-27 09:57:29 UTC (rev 7754)
@@ -14,7 +14,7 @@
     - Change standard version to 3.8.0.
   * debina/rules
     - Use java home corresponding to default-jdk.
-    - Add ant options to compile for target JVM 1.5.
+    - Add ant options to compile for target JVM 1.4.
     - Extract version from changelog.
     - Create symlink in the install target.
   * debian/links

Modified: trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch
===================================================================
--- trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch	2008-12-27 02:29:13 UTC (rev 7753)
+++ trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch	2008-12-27 09:57:29 UTC (rev 7754)
@@ -1,12 +1,12 @@
 diff -Nur -x '*.orig' -x '*~' libcommons-jexl-java-1.1/build.xml libcommons-jexl-java-1.1.new/build.xml
---- libcommons-jexl-java-1.1/build.xml	2006-09-09 04:45:15.000000000 +0530
-+++ libcommons-jexl-java-1.1.new/build.xml	2008-10-12 20:05:58.000000000 +0530
+--- libcommons-jexl-java-1.1/build.xml	2008-12-24 01:10:11.000000000 +0530
++++ libcommons-jexl-java-1.1.new/build.xml	2008-12-24 01:18:59.000000000 +0530
 @@ -62,7 +62,7 @@
-       </fileset>
-     </copy>
-   </target>
--  <target name="jar" description="o Create the jar" depends="compile,test">
-+  <target name="jar" description="o Create the jar" depends="compile">
-     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}" manifest="src/conf/MANIFEST.MF">
-     </jar>
-   </target>
+       </fileset>
+     </copy>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
++  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}" manifest="src/conf/MANIFEST.MF">
+     </jar>
+   </target>


Property changes on: trunk/libcommons-jexl-java/debian/patches/01_jar_without_tests.patch
___________________________________________________________________
Name: svn:eol-style
   - native

Modified: trunk/libcommons-jexl-java/debian/rules
===================================================================
--- trunk/libcommons-jexl-java/debian/rules	2008-12-27 02:29:13 UTC (rev 7753)
+++ trunk/libcommons-jexl-java/debian/rules	2008-12-27 09:57:29 UTC (rev 7754)
@@ -14,7 +14,7 @@
 DEB_JARS             := junit commons-logging
 DEB_ANT_BUILD_TARGET := jar
 #DEB_ANT_TEST_TARGET := test
-ANT_OPTS             := -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5
+ANT_OPTS             := -Dant.build.javac.source=1.4 -Dant.build.javac.target=1.4
 
 LIBRARY=commons-jexl
 VERSION=$(shell head -1 debian/changelog | cut -f2 -d\( | cut -f1 -d\) | cut -f1 -d\-)