[pkg-java] r17795 - trunk/libjcip-annotations-java/debian

Mon Feb 17 23:45:27 UTC 2014

Author: matthew
Date: 2014-02-17 23:45:27 +0000 (Mon, 17 Feb 2014)
New Revision: 17795

Added:
   trunk/libjcip-annotations-java/debian/libjcip-annotations-java.poms
   trunk/libjcip-annotations-java/debian/maven.rules
   trunk/libjcip-annotations-java/debian/pom.xml
Modified:
   trunk/libjcip-annotations-java/debian/changelog
   trunk/libjcip-annotations-java/debian/control
   trunk/libjcip-annotations-java/debian/rules
Log:
Version 20060626-5



Modified: trunk/libjcip-annotations-java/debian/changelog
===================================================================

--- trunk/libjcip-annotations-java/debian/changelog	2014-02-17 23:43:46 UTC (rev 17794)
+++ trunk/libjcip-annotations-java/debian/changelog	2014-02-17 23:45:27 UTC (rev 17795)
@@ -1,3 +1,16 @@
+libjcip-annotations-java (20060626-5) unstable; urgency=low
+
+  * Correctly apply the patch (the pom got lost) from the previous version.
+
+ -- Matthew Vernon <mcv21 at cam.ac.uk>  Mon, 17 Feb 2014 12:01:32 +0000
+
+libjcip-annotations-java (20060626-4) unstable; urgency=low
+
+  * Patch from Dennis van Dock <dennisvd at nikhef.nl> to add maven support
+    (Closes: #656316)
+
+ -- Matthew Vernon <matthew at debian.org>  Mon, 17 Feb 2014 11:04:08 +0000
+
 libjcip-annotations-java (20060626-3) unstable; urgency=low
 
   * Remove Rafal from Uploaders list.

Modified: trunk/libjcip-annotations-java/debian/control
===================================================================
--- trunk/libjcip-annotations-java/debian/control	2014-02-17 23:43:46 UTC (rev 17794)
+++ trunk/libjcip-annotations-java/debian/control	2014-02-17 23:45:27 UTC (rev 17795)
@@ -2,9 +2,9 @@
 Section: java
 Priority: extra
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Matthew Vernon <matthew at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
-Build-Depends-Indep: ant, default-jdk
+Build-Depends-Indep: ant, default-jdk, maven-repo-helper
 Standards-Version: 3.8.3
 Homepage: http://www.jcip.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjcip-annotations-java

Added: trunk/libjcip-annotations-java/debian/libjcip-annotations-java.poms
===================================================================
--- trunk/libjcip-annotations-java/debian/libjcip-annotations-java.poms	                        (rev 0)
+++ trunk/libjcip-annotations-java/debian/libjcip-annotations-java.poms	2014-02-17 23:45:27 UTC (rev 17795)
@@ -0,0 +1,26 @@
+# 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 or
+#   --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
+#   --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.
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars.
+#
+debian/pom.xml --has-package-version

Added: trunk/libjcip-annotations-java/debian/maven.rules
===================================================================
--- trunk/libjcip-annotations-java/debian/maven.rules	                        (rev 0)
+++ trunk/libjcip-annotations-java/debian/maven.rules	2014-02-17 23:45:27 UTC (rev 17795)
@@ -0,0 +1,19 @@
+# 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/
+
+net.jcip jcip-annotations jar s/.*/debian/ * *

Added: trunk/libjcip-annotations-java/debian/pom.xml
===================================================================
--- trunk/libjcip-annotations-java/debian/pom.xml	                        (rev 0)
+++ trunk/libjcip-annotations-java/debian/pom.xml	2014-02-17 23:45:27 UTC (rev 17795)
@@ -0,0 +1,11 @@
+<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>net.jcip</groupId>
+  <artifactId>jcip-annotations</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0</version>
+  <name>"Java Concurrency in Practice" book annotations</name>
+  <url>http://jcip.net/</url>
+  <description>Java Concurrency In Practice annotations library</description>
+
+</project>

Modified: trunk/libjcip-annotations-java/debian/rules
===================================================================
--- trunk/libjcip-annotations-java/debian/rules	2014-02-17 23:43:46 UTC (rev 17794)
+++ trunk/libjcip-annotations-java/debian/rules	2014-02-17 23:45:27 UTC (rev 17795)
@@ -16,3 +16,9 @@
 get-orig-source:
 	sh debian/orig-tar.sh
 
+binary-post-install/$(DEB_SOURCE_PACKAGE)::
+	mh_installpoms -p$(DEB_SOURCE_PACKAGE)
+	mh_installjar -p$(DEB_SOURCE_PACKAGE) -l debian/pom.xml dist/jcip.jar
+
+clean::
+	mh_clean


