[pkg-java] r15531 - trunk/libws-commons-util-java/debian

Mon Dec 12 22:31:47 UTC 2011

Author: drazzib
Date: 2011-12-12 22:31:47 +0000 (Mon, 12 Dec 2011)
New Revision: 15531

Added:
   trunk/libws-commons-util-java/debian/libws-commons-util-java.poms
   trunk/libws-commons-util-java/debian/maven.ignoreRules
   trunk/libws-commons-util-java/debian/maven.rules
Modified:
   trunk/libws-commons-util-java/debian/
   trunk/libws-commons-util-java/debian/build.xml
   trunk/libws-commons-util-java/debian/changelog
   trunk/libws-commons-util-java/debian/control
   trunk/libws-commons-util-java/debian/rules
Log:
* Team upload.
* Install maven metadata:
  - d/control: Build-Depends on maven-repo-helper.
  - d/rules: Use mh_installpoms and mh_installjar to install JAR.
* d/control: Bump Standards-Version to 3.9.2: no changes needed.
* d/build.xml: Force source/target javac to 1.4.


Property changes on: trunk/libws-commons-util-java/debian
___________________________________________________________________
Added: mergeWithUpstream
   + 1

Modified: trunk/libws-commons-util-java/debian/build.xml
===================================================================

--- trunk/libws-commons-util-java/debian/build.xml	2011-12-12 22:30:29 UTC (rev 15530)
+++ trunk/libws-commons-util-java/debian/build.xml	2011-12-12 22:31:47 UTC (rev 15531)
@@ -21,7 +21,8 @@
 
 	<target name="compile">
 		<mkdir dir="${build_classdir}" />
-		<javac srcdir="${srcdir}/main/java" destdir="${build_classdir}" debug="true" />
+		<javac srcdir="${srcdir}/main/java" destdir="${build_classdir}"
+            debug="true" source="1.4" target="1.4" />
 	</target>
 
 	<target name="dist" depends="compile">

Modified: trunk/libws-commons-util-java/debian/changelog
===================================================================
--- trunk/libws-commons-util-java/debian/changelog	2011-12-12 22:30:29 UTC (rev 15530)
+++ trunk/libws-commons-util-java/debian/changelog	2011-12-12 22:31:47 UTC (rev 15531)
@@ -1,3 +1,14 @@
+libws-commons-util-java (1.0.1-7) unstable; urgency=low
+
+  * Team upload.
+  * Install maven metadata:
+    - d/control: Build-Depends on maven-repo-helper.
+    - d/rules: Use mh_installpoms and mh_installjar to install JAR.
+  * d/control: Bump Standards-Version to 3.9.2: no changes needed.
+  * d/build.xml: Force source/target javac to 1.4.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 12 Dec 2011 23:21:19 +0100
+
 libws-commons-util-java (1.0.1-6) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libws-commons-util-java/debian/control
===================================================================
--- trunk/libws-commons-util-java/debian/control	2011-12-12 22:30:29 UTC (rev 15530)
+++ trunk/libws-commons-util-java/debian/control	2011-12-12 22:31:47 UTC (rev 15531)
@@ -3,8 +3,8 @@
 Section: java
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Niels Thykier <niels at thykier.net>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, maven-repo-helper
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libws-commons-util-java
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libws-commons-util-java/
 Homepage: http://ws.apache.org/commons/util/

Added: trunk/libws-commons-util-java/debian/libws-commons-util-java.poms
===================================================================
--- trunk/libws-commons-util-java/debian/libws-commons-util-java.poms	                        (rev 0)
+++ trunk/libws-commons-util-java/debian/libws-commons-util-java.poms	2011-12-12 22:31:47 UTC (rev 15531)
@@ -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]
+#
+pom.xml --has-package-version

Added: trunk/libws-commons-util-java/debian/maven.ignoreRules
===================================================================
--- trunk/libws-commons-util-java/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/libws-commons-util-java/debian/maven.ignoreRules	2011-12-12 22:31:47 UTC (rev 15531)
@@ -0,0 +1,20 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+#   junit junit jar s/3\\..*/3.x/
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-eclipse-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *

Added: trunk/libws-commons-util-java/debian/maven.rules
===================================================================
--- trunk/libws-commons-util-java/debian/maven.rules	                        (rev 0)
+++ trunk/libws-commons-util-java/debian/maven.rules	2011-12-12 22:31:47 UTC (rev 15531)
@@ -0,0 +1,20 @@
+# Maven rules - transform Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+#   for the version. In this case, the element is simply matched
+#   and left as it is
+# - * (the star character, alone). In this case, anything will
+#   match and be left as it is. For example, using * on the
+#  position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+#   in this case, elements that match are transformed using
+#   the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+#   junit junit jar s/3\\..*/3.x/
+
+junit junit jar s/3\..*/3.x/ * *
+org.apache.ws.commons ws-commons-util jar s/.*/debian/ * *

Modified: trunk/libws-commons-util-java/debian/rules
===================================================================
--- trunk/libws-commons-util-java/debian/rules	2011-12-12 22:30:29 UTC (rev 15530)
+++ trunk/libws-commons-util-java/debian/rules	2011-12-12 22:31:47 UTC (rev 15531)
@@ -8,9 +8,12 @@
 
 install/libws-commons-util-java::
 	jar umf debian/osgi-MANIFEST.MF  ws-commons-util-$(DEB_UPSTREAM_VERSION).jar
-	dh_install ws-commons-util-$(DEB_UPSTREAM_VERSION).jar usr/share/java
-	dh_link usr/share/java/ws-commons-util-$(DEB_UPSTREAM_VERSION).jar usr/share/java/ws-commons-util.jar
+	mh_installpoms -plibws-commons-util-java
+	mh_installjar -plibws-commons-util-java -l pom.xml ws-commons-util-$(DEB_UPSTREAM_VERSION).jar
 
+clean::
+	-mh_clean
+
 JAVA_HOME := /usr/lib/jvm/default-java
 BUILD_FILE := debian/build.xml
 DEB_ANT_INVOKE := ant -f $(BUILD_FILE)


