Author: ludovicc-guest Date: 2009-08-02 14:33:11 +0000 (Sun, 02 Aug 2009) New Revision: 9462
Added: trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.install trunk/jakarta-log4j/debian/liblog4j1.2-java.poms trunk/jakarta-log4j/debian/maven.rules Removed: trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.docs Modified: trunk/jakarta-log4j/debian/changelog trunk/jakarta-log4j/debian/control trunk/jakarta-log4j/debian/copyright trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base trunk/jakarta-log4j/debian/rules Log: * Add the Maven POM to the package * Add a Build-Depends dependency on maven-repo-helper * Move API documentation to /usr/share/doc/liblog4j1.2-java/api Modified: trunk/jakarta-log4j/debian/changelog =================================================================== --- trunk/jakarta-log4j/debian/changelog 2009-08-02 14:23:36 UTC (rev 9461) +++ trunk/jakarta-log4j/debian/changelog 2009-08-02 14:33:11 UTC (rev 9462) @@ -1,3 +1,11 @@ +jakarta-log4j (1.2.15-6) experimental; urgency=low + + * Add the Maven POM to the package + * Add a Build-Depends dependency on maven-repo-helper + * Move API documentation to /usr/share/doc/liblog4j1.2-java/api + + -- Ludovic Claude <[email protected]> Sun, 02 Aug 2009 15:14:55 +0100 + jakarta-log4j (1.2.15-5) unstable; urgency=low * Add myself to Uploaders. Modified: trunk/jakarta-log4j/debian/control =================================================================== --- trunk/jakarta-log4j/debian/control 2009-08-02 14:23:36 UTC (rev 9461) +++ trunk/jakarta-log4j/debian/control 2009-08-02 14:33:11 UTC (rev 9462) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Kalle Kivimaa <[email protected]>, Michael Koch <[email protected]>, Varun Hiremath <[email protected]>, Kumar Appaiah <[email protected]>, Torsten Werner <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libgnujaf-java, libgnumail-java +Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, libgnujaf-java, libgnumail-java, maven-repo-helper, openjdk-6-doc Standards-Version: 3.8.2 Homepage: http://jakarta.apache.org/log4j Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jakarta-log4j @@ -65,7 +65,7 @@ Package: liblog4j1.2-java-doc Architecture: all Section: doc -Depends: ${misc:Depends} +Depends: ${misc:Depends}, openjdk-6-doc | classpath-doc Description: Documentation for liblog4j1.2-java The javadoc API documentation for the logging library from the Apache Jakarta project. The documentation is Modified: trunk/jakarta-log4j/debian/copyright =================================================================== --- trunk/jakarta-log4j/debian/copyright 2009-08-02 14:23:36 UTC (rev 9461) +++ trunk/jakarta-log4j/debian/copyright 2009-08-02 14:33:11 UTC (rev 9462) @@ -2,7 +2,7 @@ Sat Apr 12 2003 18:32:20 -0400. It was downloaded from: - http://jakarta.apache.org/log4j/docs/download.html + http://logging.apache.org/log4j/1.2/download.html Upstream Authors: Copyright (C) 1999-2007, The Apache Software Foundation @@ -18,7 +18,7 @@ For more details about the upstream authors, see: http://jakarta.apache.org/log4j/docs/contributors.html -Copyright: +License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. Modified: trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base =================================================================== --- trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base 2009-08-02 14:23:36 UTC (rev 9461) +++ trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.doc-base 2009-08-02 14:33:11 UTC (rev 9462) @@ -6,5 +6,5 @@ Section: Programming Format: HTML -Index: /usr/share/doc/liblog4j1.2-java-doc/docs/api/index.html -Files: /usr/share/doc/liblog4j1.2-java-doc/docs/api/*.html +Index: /usr/share/doc/liblog4j1.2-java/docs/api/index.html +Files: /usr/share/doc/liblog4j1.2-java/docs/api/*.html Deleted: trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.docs =================================================================== --- trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.docs 2009-08-02 14:23:36 UTC (rev 9461) +++ trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.docs 2009-08-02 14:33:11 UTC (rev 9462) @@ -1 +0,0 @@ -docs Added: trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.install =================================================================== --- trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.install (rev 0) +++ trunk/jakarta-log4j/debian/liblog4j1.2-java-doc.install 2009-08-02 14:33:11 UTC (rev 9462) @@ -0,0 +1 @@ +docs/api usr/share/doc/liblog4j1.2-java Added: trunk/jakarta-log4j/debian/liblog4j1.2-java.poms =================================================================== --- trunk/jakarta-log4j/debian/liblog4j1.2-java.poms (rev 0) +++ trunk/jakarta-log4j/debian/liblog4j1.2-java.poms 2009-08-02 14:33:11 UTC (rev 9462) @@ -0,0 +1 @@ +pom.xml Added: trunk/jakarta-log4j/debian/maven.rules =================================================================== --- trunk/jakarta-log4j/debian/maven.rules (rev 0) +++ trunk/jakarta-log4j/debian/maven.rules 2009-08-02 14:33:11 UTC (rev 9462) @@ -0,0 +1,3 @@ +s/ant/org.apache.ant/ * * s/.*/debian/ * +log4j log4j jar s/1\.2\..*/1.2.x/ + Modified: trunk/jakarta-log4j/debian/rules =================================================================== --- trunk/jakarta-log4j/debian/rules 2009-08-02 14:23:36 UTC (rev 9461) +++ trunk/jakarta-log4j/debian/rules 2009-08-02 14:33:11 UTC (rev 9462) @@ -11,19 +11,20 @@ with_gcj_native := yes endif - +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java -ANT_HOME := /usr/share/ant - -DEB_JARS := gnumail activation +ANT_HOME := /usr/share/ant +DEB_JARS := gnumail activation DEB_ANT_BUILD_TARGET := jar javadoc clean:: -$(RM) -r docs + -rm -rf debian/tmp install/liblog4j1.2-java:: - dh_install dist/lib/log4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java - dh_link usr/share/java/log4j-$(DEB_UPSTREAM_VERSION).jar usr/share/java/log4j-1.2.jar + mh_installpoms -pliblog4j1.2-java + mh_installjar -pliblog4j1.2-java -l --usj-name=log4j-1.2 pom.xml dist/lib/log4j-$(VERSION).jar ifeq ($(with_gcj_native),yes) install/liblog4j1.2-java-gcj:: install/liblog4j1.2-java _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
