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

apo pushed a commit to branch master
in repository libjcommon-java.

commit 5d85e4f3964d2a8d41ba47469760af1b6937ac83
Author: Stan Ioan-Eugen <stan.ieu...@gmail.com>
Date:   Sun Apr 10 21:20:32 2011 +0000

    closes bug 620046 (maven artifact). Patch for linking JavaDoc to system doc.
---
 debian/changelog             | 13 +++++++++++++
 debian/control               |  2 +-
 debian/libjcommon-java.poms  |  1 +
 debian/patches/javaDocLink   | 10 ++++++++++
 debian/patches/series        |  1 +
 debian/poms/jcommon.pom      | 29 +++++++++++++++++++++++++++++
 debian/rules                 |  8 ++++++++
 debian/{rules => rules.orig} |  0
 8 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 220e763..9622ccf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libjcommon-java (1.0.16-3) unstable; urgency=low
+
+  * Team upload.
+  * Fix "Package does not install maven artifacts" (Closes: #620046)
+  * Enabled maven artifact deployment:
+    - debian/control: Build-Depends added maven-repo-helper
+    - debian/rules: install maven artifacts
+    - debian/poms/jcommon.pom: localised pom for maven
+  * debian/patches/javaDocLink: links the package to system doc (Debian
+    Java FAQ 4.4.4)
+
+ -- Ioan Eugen STAN <stan.ieu...@gmail.com>  Mon, 11 Apr 2011 00:15:12 +0300
+
 libjcommon-java (1.0.16-2) unstable; urgency=low
 
   UNRELEASED
diff --git a/debian/control b/debian/control
index dbd87cb..d4aeec3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers 
<pkg-java-maintain...@lists.alioth.debian.org>
 Uploaders: Christian Bayle <ba...@debian.org>, Arnaud Vandyck 
<av...@debian.org>, Michael Koch <konque...@gmx.de>, Rene Engelhard 
<r...@debian.org>
-Build-Depends: debhelper (>= 5), cdbs
+Build-Depends: debhelper (>= 5), cdbs, maven-repo-helper
 Build-Depends-Indep: default-jdk, ant, libservlet2.4-java, junit
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjcommon-java
diff --git a/debian/libjcommon-java.poms b/debian/libjcommon-java.poms
new file mode 100644
index 0000000..b24971c
--- /dev/null
+++ b/debian/libjcommon-java.poms
@@ -0,0 +1 @@
+debian/poms/jcommon.pom
diff --git a/debian/patches/javaDocLink b/debian/patches/javaDocLink
new file mode 100644
index 0000000..df0827a
--- /dev/null
+++ b/debian/patches/javaDocLink
@@ -0,0 +1,10 @@
+--- a/ant/build.xml
++++ b/ant/build.xml
+@@ -166,6 +166,7 @@
+       windowtitle="JCommon Class Library (version ${jcommon.version})"
+       overview="source/overview.html"
+       linksource="true">
++      <link href="/usr/share/doc/default-jdk-doc/api/" />
+       <classpath refid="build-xml.classpath"/>
+       <packageset dir="source" defaultexcludes="yes">
+         <include name="org/jfree"/>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a6f06fd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+javaDocLink
diff --git a/debian/poms/jcommon.pom b/debian/poms/jcommon.pom
new file mode 100644
index 0000000..e6cb111
--- /dev/null
+++ b/debian/poms/jcommon.pom
@@ -0,0 +1,29 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>jfree</groupId>
+    <artifactId>jcommon</artifactId>
+    <name>jcommon</name>
+    <version>1.0.16</version>
+    <organization>
+        <name>JFree.org</name>
+        <url>http://www.jfree.org/</url>
+    </organization>
+    <inceptionYear>2001</inceptionYear>
+    <description>
+        JCommon is a free general purpose Java class library that is used in 
several projects at www.jfree.org,
+        including JFreeChart and JFreeReport.
+    </description>
+    <url>http://www.jfree.org/jcommon/</url>
+    <scm>
+        
<connection>scm:cvs:pserver:anonym...@jfreechart.cvs.sourceforge.net:/cvsroot/jfreechart:jcommon</connection>
+        <url>http://jfreechart.cvs.sourceforge.net/jfreechart/jcommon/</url>
+    </scm>
+    <licenses>
+        <license>
+            <name>GNU Lesser General Public Licence</name>
+            <url>http://www.gnu.org/licenses/lgpl.txt</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+</project>
diff --git a/debian/rules b/debian/rules
index 372c95c..4eef2ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,6 +16,7 @@ DEB_ANT_BUILDFILE := ant/build.xml
 DEB_ANT_BUILD_TARGET := compile compile-xml javadoc
 # FIXME: how to run this?
 DEB_ANT_CHECK_TARGET := compile-junit-tests
+MAVEN_REPO := http://repository.jboss.org/maven2
 
 clean::
        rm -rf build
@@ -29,4 +30,11 @@ install/lib$(LIBRARY_PACKAGE)-java::
        ln -s $(LIBRARY_PACKAGE)-$(API_VERSION).jar 
debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE).jar
        install -m 644 -D $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar 
debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar
        ln -s $(LIBRARY_PACKAGE)-xml-$(API_VERSION).jar 
debian/lib$(LIBRARY_PACKAGE)-java/usr/share/java/$(LIBRARY_PACKAGE)-xml.jar
+       mh_installpoms -plib$(LIBRARY_PACKAGE)-java
+       mh_installjar -plib$(LIBRARY_PACKAGE)-java -l 
debian/poms/$(LIBRARY_PACKAGE).pom $(LIBRARY_PACKAGE)-$(API_VERSION).jar 
+
+get-orig-pom:
+       mkdir -p debian/poms
+       wget  -U NoSuchBrowser/1.0 -O debian/poms/$(LIBRARY_PACKAGE).pom \
+        
$(MAVEN_REPO)/jfree/$(LIBRARY_PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(LIBRARY_PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
 
diff --git a/debian/rules b/debian/rules.orig
similarity index 100%
copy from debian/rules
copy to debian/rules.orig

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

_______________________________________________
pkg-java-commits mailing list
pkg-java-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to