[pkg-java] r16451 - in trunk/commons-io/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-03-28 16:39:46 +0000 (Thu, 28 Mar 2013)
New Revision: 16451

Modified:
   trunk/commons-io/debian/changelog
   trunk/commons-io/debian/control
   trunk/commons-io/debian/patches/add-osgi-metadata.patch
   trunk/commons-io/debian/patches/series
Log:
New upstream release

Modified: trunk/commons-io/debian/changelog
===================================================================
--- trunk/commons-io/debian/changelog	2013-03-28 12:00:45 UTC (rev 16450)
+++ trunk/commons-io/debian/changelog	2013-03-28 16:39:46 UTC (rev 16451)
@@ -1,3 +1,12 @@
+commons-io (2.4-1) UNRELEASED; urgency=low
+
+  * Team upload
+  * New upstream release
+  * Bump Standards-Version to 3.9.4 (no changes)
+  * Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 28 Mar 2013 13:49:32 +0100
+
 commons-io (1.4-4) unstable; urgency=low
 
   * Add OSGi metadata to jar manifest

Modified: trunk/commons-io/debian/control
===================================================================
--- trunk/commons-io/debian/control	2013-03-28 12:00:45 UTC (rev 16450)
+++ trunk/commons-io/debian/control	2013-03-28 16:39:46 UTC (rev 16451)
@@ -4,10 +4,11 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varun at debian.org>,
  Kumar Appaiah <akumar at ee.iitm.ac.in>,
- Jakub Adam <jakub.adam at ktknet.cz>
+ Jakub Adam <jakub.adam at ktknet.cz>,
+ Emmanuel Bourg <ebourg at apache.org>
 Build-Depends: debhelper (>= 8), cdbs, default-jdk
 Build-Depends-Indep: maven-repo-helper, ant, junit
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 Homepage: http://commons.apache.org/io/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-io
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-io

Modified: trunk/commons-io/debian/patches/add-osgi-metadata.patch
===================================================================
--- trunk/commons-io/debian/patches/add-osgi-metadata.patch	2013-03-28 12:00:45 UTC (rev 16450)
+++ trunk/commons-io/debian/patches/add-osgi-metadata.patch	2013-03-28 16:39:46 UTC (rev 16451)
@@ -6,21 +6,18 @@
  build.xml |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
 
-diff --git a/build.xml b/build.xml
-index 6be7244..0f2ebeb 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -340,6 +340,12 @@
+@@ -242,6 +242,12 @@
          <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-         <attribute name="X-Compile-Source-JDK"     value="${maven.compile.source}"/>
-         <attribute name="X-Compile-Target-JDK"     value="${maven.compile.target}"/>
+         <attribute name="X-Compile-Source-JDK"     value="${compile.source}"/>
+         <attribute name="X-Compile-Target-JDK"     value="${compile.target}"/>
 +        <attribute name="Bundle-ManifestVersion"   value="2"/>
-+        <attribute name="Bundle-Name"              value="Apache Commons-IO"/>
-+        <attribute name="Bundle-Vendor"            value="Apache Software Foundation"/>
++        <attribute name="Bundle-Name"              value="Apache Commons IO"/>
++        <attribute name="Bundle-Vendor"            value="The Apache Software Foundation"/>
 +        <attribute name="Bundle-SymbolicName"      value="org.apache.commons.io"/>
 +        <attribute name="Bundle-Version"           value="${component.version}"/>
-+        <attribute name="Export-Package"           value="org.apache.commons.io,org.apache.commons.io.comparator,org.apache.commons.io.filefilter,org.apache.commons.io.input,org.apache.commons.io.output"/>
++        <attribute name="Export-Package"           value='org.apache.commons.io;version="1.4.9999",org.apache.commons.io.comparator;version="1.4.9999",org.apache.commons.io.filefilter;version="1.4.9999",org.apache.commons.io.input;version="1.4.9999",org.apache.commons.io.output;version="1.4.9999",org.apache.commons.io;version="${component.version}",org.apache.commons.io.comparator;version="${component.version}",org.apache.commons.io.filefilter;version="${component.version}",org.apache.commons.io.input;version="${component.version}",org.apache.commons.io.output;version="${component.version}",org.apache.commons.io.monitor;version="${component.version}"'/>
      </manifest>
  
      <jar jarfile="${build.home}/${final.name}.jar"
--- 

Modified: trunk/commons-io/debian/patches/series
===================================================================
--- trunk/commons-io/debian/patches/series	2013-03-28 12:00:45 UTC (rev 16450)
+++ trunk/commons-io/debian/patches/series	2013-03-28 16:39:46 UTC (rev 16451)
@@ -1 +1,2 @@
 add-osgi-metadata.patch
+fix-ant-build-version.patch