This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libquartz-java.
commit 912b4edf98892b5c767545f219fba5e9f801aa9c Author: Torsten Werner <[email protected]> Date: Wed Aug 17 05:35:05 2011 +0000 * Update Homepage field. * Use Maven to build package because upstream has switched to Maven. --- debian/changelog | 4 +++- debian/control | 13 +++++++------ debian/libquartz-java.poms | 29 +++++++++++++++++++++++++++++ debian/libquartz-java.substvars | 8 ++++++++ debian/maven.cleanIgnoreRules | 17 +++++++++++++++++ debian/maven.ignoreRules | 21 +++++++++++++++++++++ debian/maven.publishedRules | 19 +++++++++++++++++++ debian/maven.rules | 22 ++++++++++++++++++++++ debian/rules | 22 +++------------------- 9 files changed, 129 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 55804cb..75b0750 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ libquartz-java (1.7.3-1) unstable; urgency=low * New upstream release. * Update d/watch and d/orig-tar.sh to create the orig tarball from the SVN repo. + * Update Homepage field. + * Use Maven to build package because upstream has switched to Maven. - -- Torsten Werner <[email protected]> Thu, 25 Mar 2010 22:34:02 +0100 + -- Torsten Werner <[email protected]> Wed, 17 Aug 2011 07:34:28 +0200 libquartz-java (1.6.6-1) unstable; urgency=low diff --git a/debian/control b/debian/control index e73eb25..6217e35 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,14 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Varun Hiremath <[email protected]>, Torsten Werner <[email protected]>, Michael Koch <[email protected]> Build-Depends: cdbs, debhelper (>= 7), default-jdk, ant -Build-Depends-Indep: glassfish-javaee, - libcommons-logging-java, libcommons-modeler-java, libservlet2.5-java, - libcommons-dbcp-java, libcommons-beanutils-java, junit, - libcommons-collections3-java, libjboss-naming-java, - libjboss-system-java, libjboss-common-java, libjboss-jmx-java +Build-Depends-Indep: glassfish-javaee, libcommons-modeler-java, + libservlet2.5-java +# libcommons-logging-java +# libcommons-dbcp-java, libcommons-beanutils-java, junit, +# libcommons-collections3-java, libjboss-naming-java, +# libjboss-system-java, libjboss-common-java, libjboss-jmx-java Standards-Version: 3.8.3 -Homepage: http://www.opensymphony.com/quartz/ +Homepage: http://quartz-scheduler.org Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libquartz-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libquartz-java diff --git a/debian/libquartz-java.poms b/debian/libquartz-java.poms new file mode 100644 index 0000000..d3b04ba --- /dev/null +++ b/debian/libquartz-java.poms @@ -0,0 +1,29 @@ +# 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. +# +pom.xml --has-package-version +quartz/pom.xml --has-package-version +quartz-jboss/pom.xml --ignore +examples/pom.xml --ignore diff --git a/debian/libquartz-java.substvars b/debian/libquartz-java.substvars new file mode 100644 index 0000000..33b19b8 --- /dev/null +++ b/debian/libquartz-java.substvars @@ -0,0 +1,8 @@ +#List of dependencies for libquartz-java, generated for use by debian/control +maven.CompileDepends=libmaven-compiler-plugin-java, libsurefire-java +maven.UpstreamPackageVersion=1.7.3 +maven.Depends=glassfish-activation, glassfish-mail +maven.OptionalDepends= +maven.TestDepends= +maven.DocDepends=default-jdk-doc +maven.DocOptionalDepends= diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -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/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..086745c --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,21 @@ +# 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.quartz-scheduler quartz-examples jar * * * +org.quartz-scheduler quartz-jboss jar * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.codehaus.mojo rmic-maven-plugin * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -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/ + diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..498cf50 --- /dev/null +++ b/debian/maven.rules @@ -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/ + +org.quartz-scheduler quartz-parent pom s/.*/debian/ * * +org.quartz-scheduler quartz jar s/.*/debian/ * * +javax.transaction s/jta/transaction-api/ jar s/.*/debian/ * * +s/org.apache.openejb/javax/ javaee-api jar s/.*/debian/ * * diff --git a/debian/rules b/debian/rules index e60242a..1a409e2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,25 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk include /usr/share/cdbs/1/rules/debhelper.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar -#tests fail because clover is missing: -#DEB_ANT_CHECK_TARGET := test -DEB_JARS := commons-logging commons-modeler servlet-api-2.5 glassfish-ejb-api glassfish-javaee \ - commons-dbcp commons-beanutils commons-digester commons-collections3 jnpserver\ - jboss-system jboss-common jboss-jmx junit - -ALL_JARS = $(wildcard build/*.jar) -UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e's,+dak.*,,') - -common-install-prehook-indep:: - for jar in $(ALL_JARS); do \ - FILENAME=`basename $$jar`; \ - LINKBASE=`basename $$jar -$(UPSTREAM_VERSION).jar`; \ - dh_link /usr/share/java/$$FILENAME /usr/share/java/$$LINKBASE.jar; \ - done +JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: - -uscan --upstream-version 0 + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libquartz-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
