[libcommons-logging-java] 43/66: New upstream release (1.1.3) Refreshed the patches

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository libcommons-logging-java.

commit 36453b5a7dff20bf3bde440887ae64f5b21e514e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 21 20:23:42 2013 +0000

    New upstream release (1.1.3)
    Refreshed the patches
---
 debian/changelog                           |  7 +++++++
 debian/patches/02_build_javadoc.patch      |  4 ++--
 debian/patches/04_fix_jarname.patch        | 16 ----------------
 debian/patches/05_OSGi_metadata.patch      | 24 ------------------------
 debian/patches/06_classpath_manifest.patch |  8 ++++----
 debian/patches/series                      |  2 --
 6 files changed, 13 insertions(+), 48 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 911fb38..d2841be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcommons-logging-java (1.1.3-1) experimental; urgency=low
+
+  * New upstream release.
+  * Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 21 May 2013 22:18:11 +0200
+
 libcommons-logging-java (1.1.2-2) experimental; urgency=low
 
   * Fix Bundle-SymbolicName commons-logging -> org.apache.commons.logging
diff --git a/debian/patches/02_build_javadoc.patch b/debian/patches/02_build_javadoc.patch
index 6aba53d..760f125 100644
--- a/debian/patches/02_build_javadoc.patch
+++ b/debian/patches/02_build_javadoc.patch
@@ -2,7 +2,7 @@ Description: Adds a target to generate the javadoc.
 Forwarded: not-needed
 --- a/build.xml
 +++ b/build.xml
-@@ -628,7 +628,7 @@
+@@ -613,7 +613,7 @@
    </target>
  
  
@@ -11,7 +11,7 @@ Forwarded: not-needed
     description="Clean and compile all components"/>
  
  
-@@ -788,4 +788,39 @@
+@@ -773,4 +773,39 @@
      </fail>
    </target>
  
diff --git a/debian/patches/04_fix_jarname.patch b/debian/patches/04_fix_jarname.patch
deleted file mode 100644
index 8c0e5dc..0000000
--- a/debian/patches/04_fix_jarname.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Upstream has named the JARs as commons-logging-<name>-SNAPSHOT.jar
- this time. We don't really want the snapshot, as the JAR should be the
- same as the upstream version.
-Author: Kumar Appaiah <akumar at ee.iitm.ac.in>
-Forwarded: not-needed
---- a/build.xml
-+++ b/build.xml
-@@ -94,7 +94,7 @@
-   <property name="component.title"         value="Logging Wrapper Library"/>
- 
-   <!-- The current version number of this component -->
--  <property name="component.version"       value="1.1.2-SNAPSHOT"/>
-+  <property name="component.version"       value="1.1.2"/>
- 
-   <!-- The base directory for compilation targets -->
-   <property name="build.home"              value="${basedir}/target"/>
diff --git a/debian/patches/05_OSGi_metadata.patch b/debian/patches/05_OSGi_metadata.patch
deleted file mode 100644
index bb28721..0000000
--- a/debian/patches/05_OSGi_metadata.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Adds OSGi metadata to the jar file.
-Origin: vendor
-Forwarded: not-needed
---- a/src/conf/MANIFEST.MF
-+++ b/src/conf/MANIFEST.MF
-@@ -6,3 +6,18 @@
- Implementation-Vendor-Id: org.apache
- Implementation-Vendor: Apache Software Foundation
- Implementation-Version: 1.1.2
-+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-+Bundle-SymbolicName: org.apache.commons.logging
-+Bundle-Name: Commons Logging
-+Bundle-Vendor: The Apache Software Foundation
-+Bundle-Version: 1.1.2
-+Bundle-ManifestVersion: 2
-+Bundle-Description: Commons Logging is a thin adapter allowing configu
-+ rable bridging to other,    well known logging systems.
-+Bundle-DocURL: http://commons.apache.org/logging/
-+Export-Package: org.apache.commons.logging;version="1.1.2",org.apache.
-+ commons.logging.impl;version="1.1.2"
-+Import-Package: javax.servlet;resolution:=optional;version="[2.1.0,3.0
-+ .0)",org.apache.avalon.framework.logger;resolution:=optional;version=
-+ "[4.1.3,4.1.5]",org.apache.log;resolution:=optional;version="[1.0.1,1
-+ .0.1]",org.apache.log4j;resolution:=optional;version="[1.2.15,2.0.0)"
diff --git a/debian/patches/06_classpath_manifest.patch b/debian/patches/06_classpath_manifest.patch
index 263b0d7..688afc6 100644
--- a/debian/patches/06_classpath_manifest.patch
+++ b/debian/patches/06_classpath_manifest.patch
@@ -2,8 +2,8 @@ Description: Adds the classpath entry to the manifest file
 Forwarded: not-needed
 --- a/src/conf/MANIFEST.MF
 +++ b/src/conf/MANIFEST.MF
-@@ -21,3 +21,4 @@
-  .0)",org.apache.avalon.framework.logger;resolution:=optional;version=
-  "[4.1.3,4.1.5]",org.apache.log;resolution:=optional;version="[1.0.1,1
-  .0.1]",org.apache.log4j;resolution:=optional;version="[1.2.15,2.0.0)"
+@@ -26,3 +26,4 @@
+ Include-Resource: META-INF/NOTICE.txt=NOTICE.txt,META-INF/LICENSE.txt=
+  LICENSE.txt
+ Specification-Version: 1.1.3
 +Class-Path: avalon-framework.jar excalibur-logkit.jar log4j-1.2.jar servlet-api-3.0.jar
diff --git a/debian/patches/series b/debian/patches/series
index d4138ec..9e22c9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 01_target13_BuildXml.patch
 02_build_javadoc.patch
 03_disable_securityallow_test.patch
-04_fix_jarname.patch
-05_OSGi_metadata.patch
 06_classpath_manifest.patch

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