[pkg-java] r15646 - trunk/libbsf-java/debian
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Jan 5 23:36:11 UTC 2012
Author: drazzib
Date: 2012-01-05 23:36:10 +0000 (Thu, 05 Jan 2012)
New Revision: 15646
Added:
trunk/libbsf-java/debian/bsf.pom
trunk/libbsf-java/debian/libbsf-java-doc.doc-base
trunk/libbsf-java/debian/libbsf-java-doc.install
trunk/libbsf-java/debian/libbsf-java.poms
Removed:
trunk/libbsf-java/debian/dirs
trunk/libbsf-java/debian/libbsf-java.doc-base
trunk/libbsf-java/debian/libbsf-java.docs
Modified:
trunk/libbsf-java/debian/changelog
trunk/libbsf-java/debian/control
trunk/libbsf-java/debian/copyright
trunk/libbsf-java/debian/rules
Log:
* d/control: Remove Michael Koch from Uploaders. Thanks Michael!
(Closes: #654047).
* d/control: Update Standards-Version: 3.9.2.
* d/rules: Drop patchsys-quilt.mk.
* d/control: Drop dependencies on jython; its broken with jython >= 2.5
and generates additional main requirements in Ubuntu. Thanks to James Page
for patch. (Closes: #646094).
* d/control: Drop depends on Java runtime since its a library.
* d/{control,copyright}: Wrap and sort.
* Move Javadoc to a separate libbsf-java-doc package. (Closes: #506357).
* Install maven metadata:
- d/control: Build-Depends on maven-repo-helper and
Depends on libapache-pom-java.
- d/rules: Use mh_installpoms and mh_installjar.
- d/rules: Provide get-orig-pom to download a POM.
Added: trunk/libbsf-java/debian/bsf.pom
===================================================================
--- trunk/libbsf-java/debian/bsf.pom (rev 0)
+++ trunk/libbsf-java/debian/bsf.pom 2012-01-05 23:36:10 UTC (rev 15646)
@@ -0,0 +1,37 @@
+<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>
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>3</version>
+ </parent>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.4.0</version>
+ <name>Bean Scripting Framework</name>
+ <url>http://jakarta.apache.org/bsf</url>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/jakarta/bsf/tags/bsf-2.4.0</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/jakarta/bsf/tags/bsf-2.4.0</developerConnection>
+ <url>http://svn.apache.org/viewvc/jakarta/bsf/tags/bsf-2.4.0</url>
+ </scm>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
Modified: trunk/libbsf-java/debian/changelog
===================================================================
--- trunk/libbsf-java/debian/changelog 2012-01-05 22:46:18 UTC (rev 15645)
+++ trunk/libbsf-java/debian/changelog 2012-01-05 23:36:10 UTC (rev 15646)
@@ -1,13 +1,31 @@
-libbsf-java (1:2.4.0-5) UNRELEASED; urgency=low
+libbsf-java (1:2.4.0-5) unstable; urgency=low
* Team upload.
+
+ [ tony mancill ]
* Apply patch detecting optional languages at build time
Thanks to Ximin Lao. (Closes: #601685)
- * Update standards version to 3.9.1 (no changes)
* Convert to source format 3.0 (quilt); drop build-depends on quilt.
- -- tony mancill <tmancill at debian.org> Thu, 28 Oct 2010 21:49:02 -0700
+ [ Damien Raude-Morvan ]
+ * d/control: Remove Michael Koch from Uploaders. Thanks Michael!
+ (Closes: #654047).
+ * d/control: Update Standards-Version: 3.9.2.
+ * d/rules: Drop patchsys-quilt.mk.
+ * d/control: Drop dependencies on jython; its broken with jython >= 2.5
+ and generates additional main requirements in Ubuntu. Thanks to James Page
+ for patch. (Closes: #646094).
+ * d/control: Drop depends on Java runtime since its a library.
+ * d/{control,copyright}: Wrap and sort.
+ * Move Javadoc to a separate libbsf-java-doc package. (Closes: #506357).
+ * Install maven metadata:
+ - d/control: Build-Depends on maven-repo-helper and
+ Depends on libapache-pom-java.
+ - d/rules: Use mh_installpoms and mh_installjar.
+ - d/rules: Provide get-orig-pom to download a POM.
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 06 Jan 2012 00:34:08 +0100
+
libbsf-java (1:2.4.0-4) unstable; urgency=low
* Disable jython support because it is broken for jython >= 2.5.
Modified: trunk/libbsf-java/debian/control
===================================================================
--- trunk/libbsf-java/debian/control 2012-01-05 22:46:18 UTC (rev 15645)
+++ trunk/libbsf-java/debian/control 2012-01-05 23:36:10 UTC (rev 15646)
@@ -2,19 +2,24 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
-Build-Depends: debhelper (>= 5), cdbs
-Build-Depends-Indep: ant, ant-optional, default-jdk, libxalan2-java, jython, junit, libcommons-logging-java
-Standards-Version: 3.9.1
+Uploaders: Torsten Werner <twerner at debian.org>
+Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends-Indep: ant,
+ ant-optional,
+ default-jdk,
+ junit,
+ libcommons-logging-java,
+ libxalan2-java,
+ maven-repo-helper
+Standards-Version: 3.9.2
Homepage: http://jakarta.apache.org/bsf/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libbsf-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libbsf-java/
Package: libbsf-java
Architecture: all
-Depends: default-jre-headless | java1-runtime-headless | java2-runtime-headless,
- ${misc:Depends}
-Suggests: libxalan2-java, jython, rhino, bsh
+Depends: ${misc:Depends}, libapache-pom-java
+Suggests: bsh, libxalan2-java, rhino
Description: Bean Scripting Framework to support scripting languages in Java
Bean Scripting Framework (BSF) is a set of Java classes which provides
scripting language support within Java applications, and access to Java
@@ -32,5 +37,35 @@
* XSLT Stylesheets (as a component of Apache XML project's Xalan and Xerces)
* BeanShell (using bsh) via its own bsf adapter
.
- Support for Tcl, NetRexx is not available in this Debian
+ Support for Tcl, NetRexx is not available in this Debian
package since Jacl, NetRexx (non-free) are not packaged.
+
+Package: libbsf-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Suggests: libbsf-java
+Breaks: libbsf-java (<< 1:2.4.0-5)
+Replaces: libbsf-java (<< 1:2.4.0-5)
+Description: Bean Scripting Framework to support scripting - documentation
+ Bean Scripting Framework (BSF) is a set of Java classes which provides
+ scripting language support within Java applications, and access to Java
+ objects and methods from scripting languages. BSF allows one to write JSPs in
+ languages other than Java while providing access to the Java class library. In
+ addition, BSF permits any Java application to be implemented in part (or
+ dynamically extended) by a language that is embedded within it. This is
+ achieved by providing an API that permits calling scripting language engines
+ from within Java, as well as an object registry that exposes Java objects to
+ these scripting language engines.
+ .
+ BSF supports these scripting languages:
+ * Python (using Jython)
+ * JavaScript (using rhino)
+ * XSLT Stylesheets (as a component of Apache XML project's Xalan and Xerces)
+ * BeanShell (using bsh) via its own bsf adapter
+ .
+ Support for Tcl, NetRexx is not available in this Debian
+ package since Jacl, NetRexx (non-free) are not packaged.
+ .
+ This package contains Javadoc HTML documentation for
+ libbsf-java.
Modified: trunk/libbsf-java/debian/copyright
===================================================================
--- trunk/libbsf-java/debian/copyright 2012-01-05 22:46:18 UTC (rev 15645)
+++ trunk/libbsf-java/debian/copyright 2012-01-05 23:36:10 UTC (rev 15646)
@@ -19,38 +19,38 @@
Copyright (BSD-style license):
The Apache Software License, Version 1.1
-
+
Copyright (c) 2002 The Apache Software Foundation. All rights
reserved.
-
+
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
-
+
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
-
+
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in
the documentation and/or other materials provided with the
distribution.
-
+
3. The end-user documentation included with the redistribution,
if any, must include the following acknowledgment:
"This product includes software developed by the
Apache Software Foundation (http://www.apache.org/)."
Alternately, this acknowledgment may appear in the software itself,
if and wherever such third-party acknowledgments normally appear.
-
+
4. The names "BSF", "Apache", and "Apache Software Foundation" must
not be used to endorse or promote products derived from this
software without prior written permission. For written
permission, please contact apache at apache.org.
-
+
5. Products derived from this software may not be called "Apache",
nor may "Apache" appear in their name, without prior written
permission of the Apache Software Foundation.
-
+
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -69,4 +69,3 @@
Sanjiva Weerawarana and others at International Business Machines
Corporation. For more information on the Apache Software Foundation,
please see <http://www.apache.org/>.
-
Deleted: trunk/libbsf-java/debian/dirs
===================================================================
--- trunk/libbsf-java/debian/dirs 2012-01-05 22:46:18 UTC (rev 15645)
+++ trunk/libbsf-java/debian/dirs 2012-01-05 23:36:10 UTC (rev 15646)
@@ -1 +0,0 @@
-usr/share/java
Copied: trunk/libbsf-java/debian/libbsf-java-doc.doc-base (from rev 15643, trunk/libbsf-java/debian/libbsf-java.doc-base)
===================================================================
--- trunk/libbsf-java/debian/libbsf-java-doc.doc-base (rev 0)
+++ trunk/libbsf-java/debian/libbsf-java-doc.doc-base 2012-01-05 23:36:10 UTC (rev 15646)
@@ -0,0 +1,10 @@
+Document: libbsf-java1
+Title: Programmer API for libbsf-java
+Author: Apache BSF developer team
+Abstract: Javadocs programmer API of libbsf-java, the Bean Scripting
+ Framework to support scripting languages in Java.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libbsf-java/api/index.html
+Files: /usr/share/doc/libbsf-java/api/*.html
Copied: trunk/libbsf-java/debian/libbsf-java-doc.install (from rev 15643, trunk/libbsf-java/debian/libbsf-java.docs)
===================================================================
--- trunk/libbsf-java/debian/libbsf-java-doc.install (rev 0)
+++ trunk/libbsf-java/debian/libbsf-java-doc.install 2012-01-05 23:36:10 UTC (rev 15646)
@@ -0,0 +1 @@
+docs/* /usr/share/doc/libbsf-java
Deleted: trunk/libbsf-java/debian/libbsf-java.doc-base
===================================================================
--- trunk/libbsf-java/debian/libbsf-java.doc-base 2012-01-05 22:46:18 UTC (rev 15645)
+++ trunk/libbsf-java/debian/libbsf-java.doc-base 2012-01-05 23:36:10 UTC (rev 15646)
@@ -1,10 +0,0 @@
-Document: libbsf-java1
-Title: Programmer API for libbsf-java
-Author: Apache BSF developer team
-Abstract: Javadocs programmer API of libbsf-java, the Bean Scripting
- Framework to support scripting languages in Java.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libbsf-java/api/index.html
-Files: /usr/share/doc/libbsf-java/api/*.html
Deleted: trunk/libbsf-java/debian/libbsf-java.docs
===================================================================
--- trunk/libbsf-java/debian/libbsf-java.docs 2012-01-05 22:46:18 UTC (rev 15645)
+++ trunk/libbsf-java/debian/libbsf-java.docs 2012-01-05 23:36:10 UTC (rev 15646)
@@ -1 +0,0 @@
-docs
Added: trunk/libbsf-java/debian/libbsf-java.poms
===================================================================
--- trunk/libbsf-java/debian/libbsf-java.poms (rev 0)
+++ trunk/libbsf-java/debian/libbsf-java.poms 2012-01-05 23:36:10 UTC (rev 15646)
@@ -0,0 +1,28 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+# --ignore: ignore this POM and its artifact if any
+# --ignore-pom: don't install the POM. To use on POM files that are created
+# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+# --no-parent: remove the <parent> tag from the POM
+# --package=<package>: an alternative package to use when installing this POM
+# and its artifact
+# --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+# of the version for the package.
+# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: path to the build artifact associated with this POM,
+# it will be installed when using the command mh_install. [mh_install]
+# --java-lib: install the jar into /usr/share/java to comply with Debian
+# packaging guidelines
+# --usj-name=<name>: name to use when installing the library in /usr/share/java
+# --usj-version=<version>: version to use when installing the library in /usr/share/java
+# --no-usj-versionless: don't install the versionless link in /usr/share/java
+# --dest-jar=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+debian/bsf.pom
Modified: trunk/libbsf-java/debian/rules
===================================================================
--- trunk/libbsf-java/debian/rules 2012-01-05 22:46:18 UTC (rev 15645)
+++ trunk/libbsf-java/debian/rules 2012-01-05 23:36:10 UTC (rev 15646)
@@ -2,7 +2,6 @@
# debian/rules file for libbsf-java (uses cdbs)
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
@@ -11,19 +10,22 @@
# disable jython support because it is broken for jython >= 2.5
#DEB_JARS := xalan2 jython js ${ANT_HOME}/lib/ant-junit.jar junit commons-logging
DEB_JARS := xalan2 js ${ANT_HOME}/lib/ant-junit.jar junit commons-logging
+MAVEN_REPO := http://repo1.maven.org/maven2
DEB_ANT_BUILD_TARGET := jar javadocs
#DEB_ANT_CHECK_TARGET := test
clean::
$(RM) -r build lib
+ mh_clean
makebuilddir::
mkdir -p lib
install/libbsf-java::
- install -m 644 lib/bsf.jar debian/libbsf-java/usr/share/java/bsf-$(DEB_UPSTREAM_VERSION).jar
- ln -s bsf-$(DEB_UPSTREAM_VERSION).jar debian/libbsf-java/usr/share/java/bsf.jar
- # install the javadocs into api directory
- install -d $(CURDIR)/debian/libbsf-java/usr/share/doc/libbsf-java/api/
- cp -a build/api/* $(CURDIR)/debian/libbsf-java/usr/share/doc/libbsf-java/api/
+ mh_installpoms -plibbsf-java
+ mh_installjar -plibbsf-java -l -e$(DEB_UPSTREAM_VERSION) debian/bsf.pom lib/bsf.jar
+
+get-orig-pom:
+ wget -U NoSuchBrowser/1.0 -O debian/bsf.pom \
+ $(MAVEN_REPO)/bsf/bsf/$(DEB_UPSTREAM_VERSION)/bsf-$(DEB_UPSTREAM_VERSION).pom
More information about the pkg-java-commits
mailing list