[pkg-java] r15530 - trunk/libxmlrpc3-java/debian

Damien Raude-Morvan drazzib at alioth.debian.org
Mon Dec 12 22:30:29 UTC 2011


Author: drazzib
Date: 2011-12-12 22:30:29 +0000 (Mon, 12 Dec 2011)
New Revision: 15530

Added:
   trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.poms
   trunk/libxmlrpc3-java/debian/maven.ignoreRules
   trunk/libxmlrpc3-java/debian/maven.rules
Removed:
   trunk/libxmlrpc3-java/debian/libxmlrpc3-client-java.install
   trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.install
   trunk/libxmlrpc3-java/debian/libxmlrpc3-server-java.install
Modified:
   trunk/libxmlrpc3-java/debian/changelog
   trunk/libxmlrpc3-java/debian/control
   trunk/libxmlrpc3-java/debian/rules
Log:
* Install maven metadata:
  - d/control: Build-Depends on maven-repo-helper.
  - d/control: Depends on libapache-pom-java.
  - d/rules: Use mh_install to install JAR and POM.

Modified: trunk/libxmlrpc3-java/debian/changelog
===================================================================
--- trunk/libxmlrpc3-java/debian/changelog	2011-12-12 14:52:56 UTC (rev 15529)
+++ trunk/libxmlrpc3-java/debian/changelog	2011-12-12 22:30:29 UTC (rev 15530)
@@ -1,3 +1,12 @@
+libxmlrpc3-java (3.1.3-5) unstable; urgency=low
+
+  * Install maven metadata:
+    - d/control: Build-Depends on maven-repo-helper.
+    - d/control: Depends on libapache-pom-java.
+    - d/rules: Use mh_install to install JAR and POM.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Mon, 12 Dec 2011 23:27:49 +0100
+
 libxmlrpc3-java (3.1.3-4) unstable; urgency=low
 
   [ Jakub Adam ]

Modified: trunk/libxmlrpc3-java/debian/control
===================================================================
--- trunk/libxmlrpc3-java/debian/control	2011-12-12 14:52:56 UTC (rev 15529)
+++ trunk/libxmlrpc3-java/debian/control	2011-12-12 22:30:29 UTC (rev 15530)
@@ -7,7 +7,7 @@
  Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant,
  libcommons-httpclient-java, libcommons-logging-java, libservlet2.5-java, junit,
- libws-commons-util-java, libjaxme-java, default-jdk-doc
+ libws-commons-util-java, libjaxme-java, default-jdk-doc, maven-repo-helper
 Standards-Version: 3.9.2
 Homepage: http://ws.apache.org/xmlrpc/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libxmlrpc3-java
@@ -15,7 +15,7 @@
 
 Package: libxmlrpc3-common-java
 Architecture: all
-Depends: libws-commons-util-java, libjaxme-java, ${misc:Depends}
+Depends: libws-commons-util-java, libjaxme-java, libapache-pom-java, ${misc:Depends}
 Description: XML-RPC implementation in Java
  XML-RPC is a popular protocol using XML over HTTP to implement remote
  procedure calls.

Deleted: trunk/libxmlrpc3-java/debian/libxmlrpc3-client-java.install
===================================================================
--- trunk/libxmlrpc3-java/debian/libxmlrpc3-client-java.install	2011-12-12 14:52:56 UTC (rev 15529)
+++ trunk/libxmlrpc3-java/debian/libxmlrpc3-client-java.install	2011-12-12 22:30:29 UTC (rev 15530)
@@ -1 +0,0 @@
-client/target/*.jar usr/share/java

Deleted: trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.install
===================================================================
--- trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.install	2011-12-12 14:52:56 UTC (rev 15529)
+++ trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.install	2011-12-12 22:30:29 UTC (rev 15530)
@@ -1 +0,0 @@
-common/target/*.jar usr/share/java

Added: trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.poms
===================================================================
--- trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.poms	                        (rev 0)
+++ trunk/libxmlrpc3-java/debian/libxmlrpc3-common-java.poms	2011-12-12 22:30:29 UTC (rev 15530)
@@ -0,0 +1,32 @@
+# 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 --package=libxmlrpc3-common-java
+common/pom.xml --has-package-version --package=libxmlrpc3-common-java --java-lib --usj-version=3.1 --artifact=common/target/xmlrpc-common-*.jar
+client/pom.xml --has-package-version --package=libxmlrpc3-client-java --java-lib --usj-version=3.1 --artifact=client/target/xmlrpc-client-*.jar
+server/pom.xml --has-package-version --package=libxmlrpc3-server-java --java-lib --usj-version=3.1 --artifact=server/target/xmlrpc-server-*.jar
+dist/pom.xml --ignore

Deleted: trunk/libxmlrpc3-java/debian/libxmlrpc3-server-java.install
===================================================================
--- trunk/libxmlrpc3-java/debian/libxmlrpc3-server-java.install	2011-12-12 14:52:56 UTC (rev 15529)
+++ trunk/libxmlrpc3-java/debian/libxmlrpc3-server-java.install	2011-12-12 22:30:29 UTC (rev 15530)
@@ -1 +0,0 @@
-server/target/*.jar usr/share/java

Added: trunk/libxmlrpc3-java/debian/maven.ignoreRules
===================================================================
--- trunk/libxmlrpc3-java/debian/maven.ignoreRules	                        (rev 0)
+++ trunk/libxmlrpc3-java/debian/maven.ignoreRules	2011-12-12 22:30:29 UTC (rev 15530)
@@ -0,0 +1,22 @@
+# 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-changes-plugin * * * *
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.apache.rat apache-rat-plugin * * * *
+junit junit * * * *
+jaxme jaxmeapi * * * *

Added: trunk/libxmlrpc3-java/debian/maven.rules
===================================================================
--- trunk/libxmlrpc3-java/debian/maven.rules	                        (rev 0)
+++ trunk/libxmlrpc3-java/debian/maven.rules	2011-12-12 22:30:29 UTC (rev 15530)
@@ -0,0 +1,28 @@
+# 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/
+
+org.apache.xmlrpc xmlrpc-client jar s/.*/debian/ * *
+org.apache.xmlrpc xmlrpc-common jar s/.*/debian/ * *
+org.apache.xmlrpc xmlrpc-dist pom s/.*/debian/ * *
+org.apache.xmlrpc xmlrpc-server jar s/.*/debian/ * *
+org.apache.xmlrpc xmlrpc pom s/.*/debian/ * *
+
+org.apache apache pom s/.*/debian/ * *
+s/org.apache.ws.commons.util/org.apache.ws.commons/ ws-commons-util jar s/.*/debian/ * *
+commons-httpclient commons-httpclient jar s/3\..*/3.x/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *

Modified: trunk/libxmlrpc3-java/debian/rules
===================================================================
--- trunk/libxmlrpc3-java/debian/rules	2011-12-12 14:52:56 UTC (rev 15529)
+++ trunk/libxmlrpc3-java/debian/rules	2011-12-12 22:30:29 UTC (rev 15530)
@@ -23,6 +23,9 @@
 build/libxmlrpc3-java-doc::
 	$(JAVA_HOME)/bin/javadoc @debian/javadoc.options @debian/javadoc.packages
 
+binary-post-install/%-java::
+	mh_install
+
 binary-post-install/%-gcj:: binary-post-install/%
 	rm -rf debian/$*-gcj/usr/share/doc/$*-gcj
 	ln -s $* debian/$*-gcj/usr/share/doc/$*-gcj
@@ -32,7 +35,7 @@
 
 clean::
 	rm -Rf target
+	-mh_clean
 
-
 get-orig-source::
 	uscan --force-download --repack --rename




More information about the pkg-java-commits mailing list