This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libcommons-lang-java.
commit 848de5c12c45d0dee359f3ba991097a4abb2fa32
Author: Miguel Landaeta <nomad...@debian.org>
Date: Tue Aug 2 20:02:40 2011 +0000
* Fix jar manifest generation.
* Fix minor lintian warning about duplicate-short-description.
---
debian/changelog | 3 ++-
debian/control | 2 +-
debian/patches/OSGi_Manifest.patch | 15 ++++++++++-----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 793f899..e16808c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,9 @@ libcommons-lang-java (2.6-1) UNRELEASED; urgency=low
* Add mh_clean call in clean target.
* Remove unnecessary dependency on JRE.
* Link -doc javadocs with default-jdk-doc and add a Suggests dep on that.
+ * Fix minor lintian warning about duplicate-short-description.
- -- Miguel Landaeta <mig...@miguel.cc> Tue, 02 Aug 2011 12:23:57 -0430
+ -- Miguel Landaeta <mig...@miguel.cc> Tue, 02 Aug 2011 15:17:59 -0430
libcommons-lang-java (2.4-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ff22f14..347c78e 100644
--- a/debian/control
+++ b/debian/control
@@ -38,7 +38,7 @@ Section: doc
Architecture: all
Depends: ${misc:Depends}
Suggests: default-jdk-doc
-Description: Extension of the java.lang package
+Description: Documentation for an extension of the java.lang package
The Lang Component contains a set of Java classes that provide helper
methods for standard Java classes, especially those found in the
java.lang package in the Sun JDK. The following classes are included:
diff --git a/debian/patches/OSGi_Manifest.patch
b/debian/patches/OSGi_Manifest.patch
index ac0f6db..bf57f79 100644
--- a/debian/patches/OSGi_Manifest.patch
+++ b/debian/patches/OSGi_Manifest.patch
@@ -14,15 +14,20 @@ Last-Update: 2011-08-02
<!-- ========== Construct compile classpath
=============================== -->
<path id="compile.classpath">
-@@ -52,6 +52,7 @@
+@@ -52,8 +52,12 @@
<filter token="version" value="${component.version}"/>
<filter token="compile.source" value="${compile.source}"/>
<filter token="compile.target" value="${compile.target}"/>
+ <filter token="lastmodified" value="${lastmodified}"/>
<mkdir dir="${build.home}"/>
<available property="jdk.1.5.present"
classname="java.lang.StringBuilder"/>
++ <copy todir="${build.home}/conf" filtering="on">
++ <fileset dir="${conf.home}" includes="*.MF"/>
++ </copy>
</target>
-@@ -159,18 +160,7 @@
+
+ <!-- ========== Compile Targets =========================================
-->
+@@ -159,18 +163,7 @@
<mkdir dir="${build.home}/classes/META-INF"/>
<copy file="LICENSE.txt"
tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
<copy file="NOTICE.txt"
tofile="${build.home}/classes/META-INF/NOTICE.txt"/>
@@ -38,7 +43,7 @@ Last-Update: 2011-08-02
- <attribute name="X-Compile-Source-JDK"
value="${compile.source}"/>
- <attribute name="X-Compile-Target-JDK"
value="${compile.target}"/>
- </manifest>
-+ <jar jarfile="${build.home}/${final.name}.jar"
manifest="${build.home}/../src/conf/MANIFEST.MF">
++ <jar jarfile="${build.home}/${final.name}.jar"
manifest="${build.home}/conf/MANIFEST.MF">
<fileset dir="${build.home}/classes">
<include name="**/*.class"/>
<include name="**/LICENSE.txt"/>
@@ -48,10 +53,10 @@ Last-Update: 2011-08-02
+Manifest-Version: 1.0
+Package: org.apache.commons.lang
+Extension-Name: commons-lang
-+Specification-Version: @component.version@
++Specification-Version: @version@
+Specification-Vendor: The Apache Software Foundation
+Specification-Title: Commons Lang
-+Implementation-Version: @component.version@
++Implementation-Version: @version@
+Implementation-Vendor: The Apache Software Foundation
+Implementation-Title: Commons Lang
+Implementation-Vendor-Id: org.apache
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libcommons-lang-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
