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 d55880066ce25310793e332ad9476ece931d3617 Author: Mathieu Malaterre <[email protected]> Date: Sat Apr 21 14:54:02 2012 +0000 Fixing libquartz-java package 1.x --- debian/changelog | 11 +++++------ debian/control | 2 +- debian/libquartz-java-doc.lintian-overrides | 2 -- debian/libquartz-java.classpath | 2 +- debian/libquartz-java.poms | 1 - debian/maven.properties | 4 +--- debian/maven.rules | 2 +- 7 files changed, 9 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index b8b022f..ccef3f8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,10 @@ -libquartz-java (2.1.3-2) UNRELEASED; urgency=low +libquartz-java (1:1.7.3-1) unstable; urgency=low - * maven.rules: update junit rule to rename artifact junit-dep into junit - * maven.ignoreRules: add org.apache.derby:derby to the list of ignored - dependencies - * remove debian/patches as the Maven rules have the same effect. + * Revert to release 1.7.3 since 2.x is not compatible. Closes: #669080 + - This upload with an epoch value overwrite a 2.1.3 upload which broke + binary compat. See also #669081 for more info on epoch reason. - -- Ludovic Claude <[email protected]> Wed, 18 Apr 2012 01:17:01 +0200 + -- Mathieu Malaterre <[email protected]> Sat, 21 Apr 2012 10:36:06 +0200 libquartz-java (2.1.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 72ac5ce..e21667a 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends-Indep: glassfish-activation, glassfish-javaee, glassfish-mail, lib libservlet2.5-java, junit, libasm3-java, default-jdk-doc, libcommons-logging-java-doc, libservlet2.5-java-doc, libcommons-beanutils-java-doc, libcommons-dbcp-java-doc, libcommons-pool-java-doc, liblog4j1.2-java-doc, libmaven-javadoc-plugin-java, - libcommons-modeler-java, libcommons-dbcp-java, libcommons-validator-java, libc3p0-java + libcommons-modeler-java, libcommons-dbcp-java, libcommons-validator-java Standards-Version: 3.9.3 Homepage: http://quartz-scheduler.org Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libquartz-java diff --git a/debian/libquartz-java-doc.lintian-overrides b/debian/libquartz-java-doc.lintian-overrides deleted file mode 100644 index a78d45d..0000000 --- a/debian/libquartz-java-doc.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -libquartz-java-doc: codeless-jar usr/share/maven-repo/org/quartz-scheduler/quartz-backward-compat/2.1.3/quartz-backward-compat-2.1.3-javadoc.jar -libquartz-java-doc: codeless-jar usr/share/maven-repo/org/quartz-scheduler/quartz/2.1.3/quartz-2.1.3-javadoc.jar diff --git a/debian/libquartz-java.classpath b/debian/libquartz-java.classpath index 3e9fe84..d8ff9f5 100644 --- a/debian/libquartz-java.classpath +++ b/debian/libquartz-java.classpath @@ -1 +1 @@ -usr/share/java/quartz.jar /usr/share/java/c3p0.jar /usr/share/java/slf4j-api.jar +usr/share/java/quartz.jar /usr/share/java/slf4j-api.jar diff --git a/debian/libquartz-java.poms b/debian/libquartz-java.poms index 4eaae62..1e6573a 100644 --- a/debian/libquartz-java.poms +++ b/debian/libquartz-java.poms @@ -28,5 +28,4 @@ pom.xml --has-package-version quartz/pom.xml --has-package-version --java-lib quartz-jboss/pom.xml --ignore -quartz-backward-compat/pom.xml --has-package-version --java-lib examples/pom.xml --ignore diff --git a/debian/maven.properties b/debian/maven.properties index e23d8e3..7c29bd7 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -1,6 +1,4 @@ # Include here properties to pass to Maven during the build. # For example: -maven.test.skip=true +# maven.test.skip=true -maven.test.error.ignore=true -maven.test.failure.ignore=true diff --git a/debian/maven.rules b/debian/maven.rules index 4307a23..5d1109f 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -20,7 +20,7 @@ asm asm jar s/3\..*/3.x/ * * junit junit jar s/3\..*/3.x/ * * junit s/junit-dep/junit jar s/4\..*/4.x/ * * log4j log4j jar s/1\.2.*/1.2.x/ * * -org.quartz-scheduler quartz-backward-compat jar s/.*/debian/ * * +javax.transaction s/jta/transaction-api/ jar s/.*/debian/ * * org.quartz-scheduler quartz-parent pom s/.*/debian/ * * org.quartz-scheduler quartz jar s/.*/debian/ * * log4j log4j * s/1\.2\..*/1.2.x/ * * -- 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
