[pkg-java] r16482 - trunk/libitext5-java/debian
Andrew Ross
rockclimb-guest at alioth.debian.org
Wed Apr 3 20:39:26 UTC 2013
Author: rockclimb-guest
Date: 2013-04-03 20:39:26 +0000 (Wed, 03 Apr 2013)
New Revision: 16482
Added:
trunk/libitext5-java/debian/libitext5-java-doc.doc-base.api
trunk/libitext5-java/debian/libitext5-java-doc.install
trunk/libitext5-java/debian/libitext5-java.poms
trunk/libitext5-java/debian/maven.cleanIgnoreRules
trunk/libitext5-java/debian/maven.ignoreRules
trunk/libitext5-java/debian/maven.properties
trunk/libitext5-java/debian/maven.publishedRules
trunk/libitext5-java/debian/maven.rules
Removed:
trunk/libitext5-java/debian/javabuild
trunk/libitext5-java/debian/libitext5-java-doc.javadoc
trunk/libitext5-java/debian/libitext5-java.jlibs
Modified:
trunk/libitext5-java/debian/changelog
trunk/libitext5-java/debian/control
trunk/libitext5-java/debian/rules
Log:
Update to build using maven
Modified: trunk/libitext5-java/debian/changelog
===================================================================
--- trunk/libitext5-java/debian/changelog 2013-04-03 12:31:15 UTC (rev 16481)
+++ trunk/libitext5-java/debian/changelog 2013-04-03 20:39:26 UTC (rev 16482)
@@ -1,11 +1,15 @@
libitext5-java (5.4.0-1) experimental; urgency=low
- * Team upload.
+ [Emmanuel Bourg]
* New upstream release.
* Updated standards version to 3.9.4 (no changes needed)
- -- Emmanuel Bourg <ebourg at apache.org> Sat, 30 Mar 2013 01:04:57 +0100
+ [Andrew Ross]
+ * Build with maven-debian-helper.
+ * Install maven poms.
+ -- Andrew Ross <ubuntu at rossfamily.co.uk> Tue, 02 Apr 2013 21:04:57 +0100
+
libitext5-java (5.0.6+svn4804-1) unstable; urgency=low
* New upstream release from SVN, with updated AGPL additional license term.
Modified: trunk/libitext5-java/debian/control
===================================================================
--- trunk/libitext5-java/debian/control 2013-04-03 12:31:15 UTC (rev 16481)
+++ trunk/libitext5-java/debian/control 2013-04-03 20:39:26 UTC (rev 16482)
@@ -3,10 +3,10 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Andrew Ross <ubuntu at rossfamily.co.uk>, Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 7.0.50~), javahelper (>=0.32~),
- libbcprov-java (>= 1.48), libbcmail-java, libbcpkix-java, libbcprov-java-doc,
- libbcmail-java-doc, libbcpkix-java-doc
-Build-Depends-Indep: default-jdk, default-jdk-doc
+Build-Depends: debhelper (>= 7.0.50~), cdbs, default-jdk,
+ maven-debian-helper (>= 1.5)
+Build-Depends-Indep: libmaven-bundle-plugin-java, default-jdk-doc, libmaven-javadoc-plugin-java,
+ libbcprov-java (>= 1.48), libbcpkix-java, libbcprov-java-doc, libbcpkix-java-doc
Standards-Version: 3.9.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libitext5-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libitext5-java
@@ -14,8 +14,9 @@
Package: libitext5-java
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libitext5-java-doc
Description: Java Library to create and manipulate PDF on the fly
iText is a library that allows you to generate PDF files on the fly.
The iText classes are very useful for people who need to generate read-only,
@@ -27,8 +28,9 @@
Package: libitext5-java-doc
Section: doc
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}
-Recommends: ${java:Recommends}
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libitext5-java
Description: Java Library to create and manipulate PDF on the fly (documentation)
iText is a library that allows you to generate PDF files on the fly.
The iText classes are very useful for people who need to generate read-only,
Deleted: trunk/libitext5-java/debian/javabuild
===================================================================
--- trunk/libitext5-java/debian/javabuild 2013-04-03 12:31:15 UTC (rev 16481)
+++ trunk/libitext5-java/debian/javabuild 2013-04-03 20:39:26 UTC (rev 16482)
@@ -1 +0,0 @@
-itext5.jar src/main/java
Added: trunk/libitext5-java/debian/libitext5-java-doc.doc-base.api
===================================================================
--- trunk/libitext5-java/debian/libitext5-java-doc.doc-base.api (rev 0)
+++ trunk/libitext5-java/debian/libitext5-java-doc.doc-base.api 2013-04-03 20:39:26 UTC (rev 16482)
@@ -0,0 +1,10 @@
+Document: libitext5-java
+Title: API Javadoc for iText, a Free Java-PDF library
+Author: iText, a Free Java-PDF library developers
+Abstract: This is the API Javadoc provided for the
+ libitext5-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libitext5-java/api/index.html
+Files: /usr/share/doc/libitext5-java/api/*
Added: trunk/libitext5-java/debian/libitext5-java-doc.install
===================================================================
--- trunk/libitext5-java/debian/libitext5-java-doc.install (rev 0)
+++ trunk/libitext5-java/debian/libitext5-java-doc.install 2013-04-03 20:39:26 UTC (rev 16482)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libitext5-java/api
+
Deleted: trunk/libitext5-java/debian/libitext5-java-doc.javadoc
===================================================================
--- trunk/libitext5-java/debian/libitext5-java-doc.javadoc 2013-04-03 12:31:15 UTC (rev 16481)
+++ trunk/libitext5-java/debian/libitext5-java-doc.javadoc 2013-04-03 20:39:26 UTC (rev 16482)
@@ -1 +0,0 @@
-internal /usr/share/doc/libitext5-java/api
Deleted: trunk/libitext5-java/debian/libitext5-java.jlibs
===================================================================
--- trunk/libitext5-java/debian/libitext5-java.jlibs 2013-04-03 12:31:15 UTC (rev 16481)
+++ trunk/libitext5-java/debian/libitext5-java.jlibs 2013-04-03 20:39:26 UTC (rev 16482)
@@ -1 +0,0 @@
-itext5.jar
Added: trunk/libitext5-java/debian/libitext5-java.poms
===================================================================
--- trunk/libitext5-java/debian/libitext5-java.poms (rev 0)
+++ trunk/libitext5-java/debian/libitext5-java.poms 2013-04-03 20:39:26 UTC (rev 16482)
@@ -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 --no-parent --has-package-version --java-lib --usj-name=itext5
Added: trunk/libitext5-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libitext5-java/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/libitext5-java/debian/maven.cleanIgnoreRules 2013-04-03 20:39:26 UTC (rev 16482)
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# 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 before mvn clean is called
+# junit junit jar s/3\..*/3.x/
+
Added: trunk/libitext5-java/debian/maven.ignoreRules
===================================================================
--- trunk/libitext5-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libitext5-java/debian/maven.ignoreRules 2013-04-03 20:39:26 UTC (rev 16482)
@@ -0,0 +1,17 @@
+# 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.codehaus.mojo buildnumber-maven-plugin * * * *
Added: trunk/libitext5-java/debian/maven.properties
===================================================================
--- trunk/libitext5-java/debian/maven.properties (rev 0)
+++ trunk/libitext5-java/debian/maven.properties 2013-04-03 20:39:26 UTC (rev 16482)
@@ -0,0 +1,7 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.compiler.source=1.5
+maven.compiler.target=1.5
+maven.test.skip=true
Added: trunk/libitext5-java/debian/maven.publishedRules
===================================================================
--- trunk/libitext5-java/debian/maven.publishedRules (rev 0)
+++ trunk/libitext5-java/debian/maven.publishedRules 2013-04-03 20:39:26 UTC (rev 16482)
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# 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/
+
Added: trunk/libitext5-java/debian/maven.rules
===================================================================
--- trunk/libitext5-java/debian/maven.rules (rev 0)
+++ trunk/libitext5-java/debian/maven.rules 2013-04-03 20:39:26 UTC (rev 16482)
@@ -0,0 +1,22 @@
+# 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/
+
+com.itextpdf itextpdf jar s/5\..*/5.x/ * *
+junit junit jar s/4\..*/4.x/ * *
+org.bouncycastle s/bcpkix-jdk15on/bcpkix/ * s/.*/debian/ * *
+org.bouncycastle s/bcprov-jdk15on/bcprov/ * s/.*/debian/ * *
Modified: trunk/libitext5-java/debian/rules
===================================================================
--- trunk/libitext5-java/debian/rules 2013-04-03 12:31:15 UTC (rev 16481)
+++ trunk/libitext5-java/debian/rules 2013-04-03 20:39:26 UTC (rev 16482)
@@ -1,28 +1,10 @@
#!/usr/bin/make -f
# -*- makefile -*-
-DEB_SRCDIR ?= .
-JAVA_HOME := /usr/lib/jvm/default-java
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
-export CLASSPATH=/usr/share/java/bcprov.jar:/usr/share/java/bcmail.jar:/usr/share/java/bcpkix.jar
+JAVA_HOME := /usr/lib/jvm/default-java
-# Include the resource files in the jar:
-#export JH_JAR_EXTRA=$(shell find src/main/resources -type f)
-
-%:
- dh $@ --with javahelper
-
-# Link src/main/resources/. Using JH_JAR_EXTRA above instead results in the
-# files being in the wrong place in the resulting jar.
-override_jh_build:
- ln -s $(DEB_SRCDIR)/src/main/resources/com $(DEB_SRCDIR)/com
- JH_JAR_EXTRA=`find com/ -type f` jh_build
-
-
-# Clean up our symlink
-override_dh_clean:
- rm -f $(DEB_SRCDIR)/com
- dh_clean
-
get-orig-source:
sh orig-tar.sh
More information about the pkg-java-commits
mailing list