[commons-io] 30/47: New upstream release

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository commons-io.

commit c4cd78361a1907cf30d1bd7e57c0acf2b7f95fd1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Mar 28 16:39:46 2013 +0000

    New upstream release
---
 debian/changelog                       |  9 +++++++++
 debian/control                         |  5 +++--
 debian/patches/add-osgi-metadata.patch | 15 ++++++---------
 debian/patches/series                  |  1 +
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ce9114..acb4f33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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
diff --git a/debian/control b/debian/control
index 57d5eaa..b69e6fe 100644
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,11 @@ Priority: optional
 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
diff --git a/debian/patches/add-osgi-metadata.patch b/debian/patches/add-osgi-metadata.patch
index b7b5ad8..4901fd3 100644
--- a/debian/patches/add-osgi-metadata.patch
+++ b/debian/patches/add-osgi-metadata.patch
@@ -6,21 +6,18 @@ Subject: add-osgi-metadata
  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.c [...]
      </manifest>
  
      <jar jarfile="${build.home}/${final.name}.jar"
--- 
diff --git a/debian/patches/series b/debian/patches/series
index aa38e5d..2aa663d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add-osgi-metadata.patch
+fix-ant-build-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-io.git