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 463a38d6c3475e1b0e26a66c7688e9855d174c14
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Thu Jul 2 12:07:30 2009 +0000
* New version
---
debian/README.Debian | 6 +++
debian/changelog | 20 +++++++++-
debian/compat | 2 +-
debian/copyright | 2 +-
debian/dirs | 1 -
debian/libcommons-lang-java-doc.doc-base | 11 ++++++
debian/{docs => libcommons-lang-java-doc.docs} | 0
debian/libcommons-lang-java.poms | 1 +
debian/maven.rules | 2 +
debian/patches/00list | 1 -
.../01build_xml_license_location_patch.dpatch | 46 ----------------------
debian/patches/OSGi_Manifest.patch | 46 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 20 +++++++---
14 files changed, 101 insertions(+), 58 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
index 4c91c4b..eda10ba 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -5,3 +5,9 @@ dist/docs and dist/RELEASE-NOTES.txt have been removed because
the doc
is no more generated (the package is not generated by ant at the moment)
-- Arnaud Vandyck <av...@debian.org>, Sat Nov 8 18:38:30 2003
+
+debian/MANIFEST.MF has been extracted from the official commons-lang.jar and
+it may need to be updated for new releases.
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Sun, 03 May 2009 17:21:41
+0100
+
diff --git a/debian/changelog b/debian/changelog
index 87a29b1..9b1efd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,20 @@
-libcommons-lang-java (2.4-2) UNRELEASED; urgency=low
+libcommons-lang-java (2.4-2) unstable; urgency=low
+
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add the Maven POM to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Remove 01build_xml_license_location_patch.dpatch as it's not useful
+ anymore
+ * Patch src/conf/MANIFEST.MF: add the OSGi metadata generated by the Maven
+ build, use quilt
+ * Put the API documentation in a separate package
+
+ -- Ludovic Claude <ludovic.cla...@laposte.net> Sun, 03 May 2009 17:21:41
+0100
+
+libcommons-lang-java (2.4-1ubuntu1) intrepid; urgency=low
* (Build-)depend on default-jre/-jdk.
@@ -7,7 +23,7 @@ libcommons-lang-java (2.4-2) UNRELEASED; urgency=low
* Rename Jakarta Commons to Apache Commons
* debian/copyright: Switch to Apache License 2.0. Closes: #532885.
- -- Matthias Klose <d...@debian.org> Wed, 30 Jul 2008 15:58:22 +0000
+ -- Matthias Klose <d...@ubuntu.com> Wed, 30 Jul 2008 15:58:22 +0000
libcommons-lang-java (2.4-1) unstable; urgency=low
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/copyright b/debian/copyright
index 4e52aeb..65e95d4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -35,7 +35,7 @@ Upstream Authors: Daniel Rall <d...@finemaltcoding.com>,
Masato Tezuka, Jeff Varszegi, Chris Webb, Mario Winterer,
Stepan Koltsov, Holger Hoffstatte
-Copyright: � 2001-2008 The Apache Software Foundation
+Copyright: 2001-2008 The Apache Software Foundation
License: Apache 2.0
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libcommons-lang-java-doc.doc-base
b/debian/libcommons-lang-java-doc.doc-base
new file mode 100644
index 0000000..6bba164
--- /dev/null
+++ b/debian/libcommons-lang-java-doc.doc-base
@@ -0,0 +1,11 @@
+Document: libcommons-lang-java
+Title: Programmer API for Commons Lang
+Author: Apache Commons Lang developers
+Abstract: 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.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-lang-java-doc/api/index.html
+Files: /usr/share/doc/libcommons-lang-java-doc/api/*
diff --git a/debian/docs b/debian/libcommons-lang-java-doc.docs
similarity index 100%
rename from debian/docs
rename to debian/libcommons-lang-java-doc.docs
diff --git a/debian/libcommons-lang-java.poms b/debian/libcommons-lang-java.poms
new file mode 100644
index 0000000..43e746b
--- /dev/null
+++ b/debian/libcommons-lang-java.poms
@@ -0,0 +1 @@
+pom.xml --no-parent
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..8486979
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index b5da091..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1 +0,0 @@
-01build_xml_entities_fix
diff --git a/debian/patches/01build_xml_license_location_patch.dpatch
b/debian/patches/01build_xml_license_location_patch.dpatch
deleted file mode 100755
index 67a680f..0000000
--- a/debian/patches/01build_xml_license_location_patch.dpatch
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-## 01build_xml_license_location_patch.dpatch by Arnaud Vandyck
<arnaud.vand...@ulg.ac.be>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: LICENSE file is not in upper directory
-
-if [ $# -ne 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
-
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as
argument"
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad
/home/arnaud/debian/ITP/jakarta/libcommons-lang-java-1.0.1/lang/build.xml
libcommons-lang-java-1.0.1/lang/build.xml
---- /home/arnaud/debian/ITP/jakarta/libcommons-lang-java-1.0.1/lang/build.xml
2003-07-01 15:42:59.000000000 +0200
-+++ libcommons-lang-java-1.0.1/lang/build.xml 2003-07-01 15:45:48.000000000
+0200
-@@ -120,7 +120,7 @@
- <target name="dist" depends="compile,javadoc"
- description="Create binary distribution">
- <mkdir dir="${dist.home}"/>
-- <copy file="../LICENSE"
-+ <copy file="LICENSE.txt"
- todir="${dist.home}"/>
- <copy file="RELEASE-NOTES.txt"
- todir="${dist.home}"/>
-@@ -132,7 +132,7 @@
- description="Create jar">
- <mkdir dir="${dist.home}"/>
- <mkdir dir="${build.home}/classes/META-INF"/>
-- <copy file="../LICENSE"
-+ <copy file="LICENSE.txt"
- tofile="${build.home}/classes/META-INF/LICENSE.txt"/>
- <jar jarfile="${dist.home}/${final.name}.jar"
- basedir="${build.home}/classes"
diff --git a/debian/patches/OSGi_Manifest.patch
b/debian/patches/OSGi_Manifest.patch
new file mode 100644
index 0000000..af4bfc7
--- /dev/null
+++ b/debian/patches/OSGi_Manifest.patch
@@ -0,0 +1,46 @@
+--- a/src/conf/MANIFEST.MF
++++ b/src/conf/MANIFEST.MF
+@@ -10,3 +10,33 @@
+ Implementation-Vendor-Id: org.apache
+ X-Compile-Source-JDK: @compile.source@
+ X-Compile-Target-JDK: @compile.target@
++Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
++Import-Package: org.apache.commons.lang;version="@version@",
++ org.apache.commons.lang.builder;version="@version@",
++ org.apache.commons.lang.enum;version="@version@",
++ org.apache.commons.lang.enums;version="@version@",
++ org.apache.commons.lang.exception;version="@version@",
++ org.apache.commons.lang.math;version="@version@",
++ org.apache.commons.lang.mutable;version="@version@",
++ org.apache.commons.lang.text;version="@version@",
++ org.apache.commons.lang.time;version="@version@"
++Bnd-LastModified: @lastmodified@
++Export-Package: org.apache.commons.lang.math;version="@version@",
++ org.apache.commons.lang.enums;version="@version@",
++ org.apache.commons.lang.builder;version="@version@",
++ org.apache.commons.lang.exception;version="@version@",
++ org.apache.commons.lang.enum;version="@version@",
++ org.apache.commons.lang.mutable;version="@version@",
++ org.apache.commons.lang.text;version="@version@",
++ org.apache.commons.lang.time;version="@version@",
++ org.apache.commons.lang;version="@version@"
++Bundle-Version: @version@
++Bundle-Description: Commons Lang, a package of Java utility classes fo
++ r the classes that are in java.lang's hierarchy, or are considered
++ to be so standard as to justify existence in java.lang.
++Bundle-Name: Commons Lang
++Bundle-DocURL: http://commons.apache.org/lang/
++Bundle-ManifestVersion: 2
++Bundle-Vendor: The Apache Software Foundation
++Bundle-SymbolicName: org.apache.commons.lang
++Tool: Bnd-0.0.238
+--- a/build.xml
++++ b/build.xml
+@@ -48,6 +48,7 @@
+ <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}"/>
+ </target>
+ <target name="prepare" depends="init" description="Prepare build
directory">
+ <mkdir dir="${build.home}"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3b14877
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+OSGi_Manifest.patch
diff --git a/debian/rules b/debian/rules
index 3cc2517..5cfb859 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,26 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/default-java
-
-DEB_JARS := junit
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_JARS := junit
DEB_ANT_BUILD_TARGET := jar javadoc
+LAST_MODIFIED := $(shell date +%s%N | cut -c -13)
+DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED)
install/libcommons-lang-java::
- install -m 644 dist/commons-lang-${DEB_UPSTREAM_VERSION}.jar
debian/libcommons-lang-java/usr/share/java/commons-lang-${DEB_UPSTREAM_VERSION}.jar
- dh_link -p libcommons-lang-java
usr/share/java/commons-lang-${DEB_UPSTREAM_VERSION}.jar
usr/share/java/commons-lang.jar
+ mh_installpoms -p$(PACKAGE)
+ mh_installjar -p$(PACKAGE) -l pom.xml dist/commons-lang-$(VERSION).jar
clean::
-rm gjdoc_rawcomment.cache
-rm -rf docs/api/*
+ -rm -rf debian/tmp
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
+
--
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
