[pkg-java] r8212 - trunk/ivy/debian

[Varun Hiremath]

Author: varun
Date: 2009-05-01 00:23:48 +0000 (Fri, 01 May 2009)
New Revision: 8212

Modified:
   trunk/ivy/debian/build.xml
   trunk/ivy/debian/changelog
   trunk/ivy/debian/copyright
   trunk/ivy/debian/orig-tar.sh
   trunk/ivy/debian/watch
Log:
* New upstream release
* Fix watch file
* Include .xsd and .ent files in ivy.jar (Closes: #526326)
* Copy settings files for backward compatibility with ivyconf naming	
* Copy antlib for backward compatibility with fr.jayasoft.ivy package

Modified: trunk/ivy/debian/build.xml
===================================================================
--- trunk/ivy/debian/build.xml	2009-04-29 18:08:53 UTC (rev 8211)
+++ trunk/ivy/debian/build.xml	2009-05-01 00:23:48 UTC (rev 8212)
@@ -4,12 +4,17 @@
   <property file="./build.properties" />
   <patternset id="compiler.resources">
     <include name="**/?*.properties" />
+    <include name="**/?*.patterns" />
+    <include name="**/?*.json" />
     <include name="**/?*.xml" />
     <include name="**/?*.png" />
+    <include name="**/?*.pom" />
     <include name="**/?*.jpeg" />
     <include name="**/?*.jpg" />
     <include name="**/?*.html" />
     <include name="**/?*.xsl" />
+    <include name="**/?*.xsd" />
+    <include name="**/?*.ent" />
     <include name="**/?*.css" />
     <include name="**/?*.ico" />
   </patternset>
@@ -28,6 +33,24 @@
         <patternset refid="compiler.resources" />
       </fileset>
     </copy>
+
+    <!-- copy antlib for backward compatibility with fr.jayasoft.ivy package -->
+    <copy file="${class.dir}/org/apache/ivy/ant/antlib.xml" 
+          todir="${class.dir}/fr/jayasoft/ivy/ant" />
+
+    <!-- copy settings files for backward compatibility with ivyconf naming -->
+    <copy file="${class.dir}/org/apache/ivy/core/settings/ivysettings-local.xml"
+          tofile="${class.dir}/org/apache/ivy/core/settings/ivyconf-local.xml" />
+    <copy file="${class.dir}/org/apache/ivy/core/settings/ivysettings-default-chain.xml"
+          tofile="${class.dir}/org/apache/ivy/core/settings/ivyconf-default-chain.xml" />
+    <copy file="${class.dir}/org/apache/ivy/core/settings/ivysettings-main-chain.xml"
+          tofile="${class.dir}/org/apache/ivy/core/settings/ivyconf-main-chain.xml" />
+    <copy file="${class.dir}/org/apache/ivy/core/settings/ivysettings-public.xml"
+          tofile="${class.dir}/org/apache/ivy/core/settings/ivyconf-public.xml" />
+    <copy file="${class.dir}/org/apache/ivy/core/settings/ivysettings-shared.xml"
+          tofile="${class.dir}/org/apache/ivy/core/settings/ivyconf-shared.xml" />
+    <copy file="${class.dir}/org/apache/ivy/core/settings/ivysettings.xml"
+          tofile="${class.dir}/org/apache/ivy/core/settings/ivyconf.xml" />
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">

Modified: trunk/ivy/debian/changelog
===================================================================
--- trunk/ivy/debian/changelog	2009-04-29 18:08:53 UTC (rev 8211)
+++ trunk/ivy/debian/changelog	2009-05-01 00:23:48 UTC (rev 8212)
@@ -1,3 +1,13 @@
+ivy (2.1.0~rc1-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix watch file
+  * Include .xsd and .ent files in ivy.jar (Closes: #526326)
+  * Copy settings files for backward compatibility with ivyconf naming	
+  * Copy antlib for backward compatibility with fr.jayasoft.ivy package
+
+ -- Varun Hiremath <varun at debian.org>  Thu, 30 Apr 2009 20:15:32 -0400
+
 ivy (2.0.0-2) unstable; urgency=low
 
   * Include xml files in ivy.jar (Closes: #524878)

Modified: trunk/ivy/debian/copyright
===================================================================
--- trunk/ivy/debian/copyright	2009-04-29 18:08:53 UTC (rev 8211)
+++ trunk/ivy/debian/copyright	2009-05-01 00:23:48 UTC (rev 8212)
@@ -5,12 +5,12 @@
 
 Upstream Authors: The Apache Software Foundation.
 
-Copyright: (C) 2009 The Apache Software Foundation.
+Copyright: © 2009 The Apache Software Foundation.
 
-License:  Apache 2.0
+License: Apache 2.0
 
   On Debian GNU/Linux system you can find the complete text of the
   Apache-2.0 license in `/usr/share/common-licenses/Apache-2.0'
 
-The Debian packaging is (C) 2009, Varun Hiremath <varun at debian.org> and
+The Debian packaging is © 2009, Varun Hiremath <varun at debian.org> and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

Modified: trunk/ivy/debian/orig-tar.sh
===================================================================
--- trunk/ivy/debian/orig-tar.sh	2009-04-29 18:08:53 UTC (rev 8211)
+++ trunk/ivy/debian/orig-tar.sh	2009-05-01 00:23:48 UTC (rev 8212)
@@ -5,7 +5,7 @@
 
 # clean up the upstream tarball
 tar -z -x -f $3
-mv apache-ivy-$2 $DIR
+mv apache-ivy* $DIR
 tar -c -z -f $3 --exclude '*/test*' --exclude '*/doc*' $DIR
 rm -rf $DIR
 

Modified: trunk/ivy/debian/watch
===================================================================
--- trunk/ivy/debian/watch	2009-04-29 18:08:53 UTC (rev 8211)
+++ trunk/ivy/debian/watch	2009-05-01 00:23:48 UTC (rev 8212)
@@ -1,2 +1,3 @@
 version=3
-http://www.apache.org/dist/ant/ivy/([\d\.]+)/apache-ivy-([\d\.]+)-src.tar.gz debian debian/orig-tar.sh
+opts="uversionmangle=s/-rc/~rc/" \
+http://www.apache.org/dist/ant/ivy/([\d].*)/apache-ivy-([\d].*)-src.tar.gz debian debian/orig-tar.sh