[pkg-java] r10347 - in trunk/libcommons-jxpath-java/debian: . patches

[Niels Thykier]

Author: nthykier-guest
Date: 2009-09-13 16:02:17 +0000 (Sun, 13 Sep 2009)
New Revision: 10347

Removed:
   trunk/libcommons-jxpath-java/debian/install
   trunk/libcommons-jxpath-java/debian/links
Modified:
   trunk/libcommons-jxpath-java/debian/changelog
   trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch
   trunk/libcommons-jxpath-java/debian/rules
Log:
Work around upstream forgetting to bump versions.

Modified: trunk/libcommons-jxpath-java/debian/changelog
===================================================================
--- trunk/libcommons-jxpath-java/debian/changelog	2009-09-13 15:59:17 UTC (rev 10346)
+++ trunk/libcommons-jxpath-java/debian/changelog	2009-09-13 16:02:17 UTC (rev 10347)
@@ -17,6 +17,9 @@
     - Updated the encoding of debian/copyright to UTF-8.
     - Added Vcs-fields to debian/control.
     - Added Homepage field in debian/control.
+  * Work around upstream forgetting to bump the version number.
+    - Updated patch 01_build_xml.patch to also correct the version
+    number in docs.
 
  -- Niels Thykier <niels at thykier.net>  Sat, 12 Sep 2009 10:36:15 +0200
 

Deleted: trunk/libcommons-jxpath-java/debian/install
===================================================================
--- trunk/libcommons-jxpath-java/debian/install	2009-09-13 15:59:17 UTC (rev 10346)
+++ trunk/libcommons-jxpath-java/debian/install	2009-09-13 16:02:17 UTC (rev 10347)
@@ -1 +0,0 @@
-target/commons-jxpath-1.2.jar usr/share/java/

Deleted: trunk/libcommons-jxpath-java/debian/links
===================================================================
--- trunk/libcommons-jxpath-java/debian/links	2009-09-13 15:59:17 UTC (rev 10346)
+++ trunk/libcommons-jxpath-java/debian/links	2009-09-13 16:02:17 UTC (rev 10347)
@@ -1 +0,0 @@
-usr/share/java/commons-jxpath-1.2.jar usr/share/java/commons-jxpath.jar

Modified: trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch	2009-09-13 15:59:17 UTC (rev 10346)
+++ trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch	2009-09-13 16:02:17 UTC (rev 10347)
@@ -1,5 +1,5 @@
---- build.xml.orig	2009-09-11 23:13:56.969009343 +0200
-+++ build.xml	2009-09-11 23:15:44.485055841 +0200
+--- a/build.xml	2009-09-13 12:20:12.177029733 +0200
++++ b/build.xml	2009-09-13 12:20:44.817007573 +0200
 @@ -33,7 +33,7 @@
    <target name="compile" description="o Compile the code" depends="get-deps">
      <mkdir dir="${classesdir}">
@@ -18,9 +18,12 @@
      <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
      </jar>
    </target>
-@@ -146,7 +146,7 @@
+@@ -144,9 +144,9 @@
+     </tstamp>
+     <property name="copyright" value="Copyright &amp;copy;  The Apache Software Foundation. All Rights Reserved.">
      </property>
-     <property name="title" value="JXPath 1.2 API">
+-    <property name="title" value="JXPath 1.2 API">
++    <property name="title" value="JXPath 1.3 API">
      </property>
 -    <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*">
 +    <javadoc destdir="${javadocdir}" author="true" version="true" sourcepath="src/java" packagenames="*">

Modified: trunk/libcommons-jxpath-java/debian/rules
===================================================================
--- trunk/libcommons-jxpath-java/debian/rules	2009-09-13 15:59:17 UTC (rev 10346)
+++ trunk/libcommons-jxpath-java/debian/rules	2009-09-13 16:02:17 UTC (rev 10347)
@@ -15,4 +15,10 @@
 DEB_ANT_CLEAN_TARGET := clean
 
 LIBRARY=commons-jxpath
-VERSION=1.3
+
+binary-install/libcommons-jxpath-java::
+	# With the 1.3 release upstream forgot to bump the version number.
+	# So we are doing a little magic to get it right regardless.
+	test `ls -1 target/commons-jxpath-*.jar | wc -l` = 1 || ( echo "Too many matches" ; exit 1)
+	cp target/commons-jxpath-*.jar debian/libcommons-jxpath-java/usr/share/java/commons-jxpath-$(DEB_UPSTREAM_VERSION).jar
+	dh_link usr/share/java/commons-jxpath-$(DEB_UPSTREAM_VERSION).jar usr/share/java/commons-jxpath.jar