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 1bca637ee82711687c7d232ffcb63b4e02d737ab Author: Ludovic Claude <[email protected]> Date: Thu Apr 19 21:33:07 2012 +0000 * 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. --- debian/changelog | 9 +++++++++ debian/maven.ignoreRules | 2 ++ debian/maven.rules | 2 +- debian/patches/0001-disable-2-modules.patch | 22 ---------------------- debian/patches/removederby.patch | 19 ------------------- debian/patches/renamejunit.patch | 13 ------------- debian/patches/series | 3 --- 7 files changed, 12 insertions(+), 58 deletions(-) diff --git a/debian/changelog b/debian/changelog index 59da1ca..b8b022f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +libquartz-java (2.1.3-2) UNRELEASED; 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. + + -- Ludovic Claude <[email protected]> Wed, 18 Apr 2012 01:17:01 +0200 + libquartz-java (2.1.3-1) unstable; urgency=low * New upstream. Closes: #667598 diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 170d56c..213bced 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -19,3 +19,5 @@ org.apache.maven.plugins maven-deploy-plugin * * * * org.apache.maven.plugins maven-source-plugin * * * * org.codehaus.mojo findbugs-maven-plugin * * * * org.codehaus.mojo rmic-maven-plugin * * * * +org.apache.derby derby * * * * + diff --git a/debian/maven.rules b/debian/maven.rules index c17f825..4307a23 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -18,7 +18,7 @@ asm asm jar s/3\..*/3.x/ * * junit junit jar s/3\..*/3.x/ * * -junit junit jar s/4\..*/4.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/ * * org.quartz-scheduler quartz-parent pom s/.*/debian/ * * diff --git a/debian/patches/0001-disable-2-modules.patch b/debian/patches/0001-disable-2-modules.patch deleted file mode 100644 index 2e44bb1..0000000 --- a/debian/patches/0001-disable-2-modules.patch +++ /dev/null @@ -1,22 +0,0 @@ -From: Torsten Werner <[email protected]> -Date: Wed, 17 Aug 2011 13:28:39 +0200 -Subject: [PATCH] disable 2 modules - ---- - pom.xml | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -Index: libquartz-java-2.1.4.orig/pom.xml -=================================================================== ---- libquartz-java-2.1.4.orig.orig/pom.xml 2012-03-30 18:09:35.000000000 +0200 -+++ libquartz-java-2.1.4.orig/pom.xml 2012-04-05 10:55:21.000000000 +0200 -@@ -67,9 +67,7 @@ - - <modules> - <module>quartz</module> -- <module>quartz-jboss</module> - <module>quartz-backward-compat</module> -- <module>examples</module> - </modules> - - <build> diff --git a/debian/patches/removederby.patch b/debian/patches/removederby.patch deleted file mode 100644 index f4b51d0..0000000 --- a/debian/patches/removederby.patch +++ /dev/null @@ -1,19 +0,0 @@ -Index: libquartz-java-2.1.4.orig/quartz/pom.xml -=================================================================== ---- libquartz-java-2.1.4.orig.orig/quartz/pom.xml 2012-04-05 11:54:30.000000000 +0200 -+++ libquartz-java-2.1.4.orig/quartz/pom.xml 2012-04-05 11:54:42.000000000 +0200 -@@ -65,12 +65,14 @@ - <version>3.2</version> - <scope>test</scope> - </dependency> -+<!-- - <dependency> - <groupId>org.apache.derby</groupId> - <artifactId>derby</artifactId> - <version>10.8.1.2</version> - <scope>test</scope> - </dependency> -+--> - - </dependencies> - diff --git a/debian/patches/renamejunit.patch b/debian/patches/renamejunit.patch deleted file mode 100644 index e07853f..0000000 --- a/debian/patches/renamejunit.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: libquartz-java-2.1.4.orig/quartz/pom.xml -=================================================================== ---- libquartz-java-2.1.4.orig.orig/quartz/pom.xml 2012-04-05 11:48:41.000000000 +0200 -+++ libquartz-java-2.1.4.orig/quartz/pom.xml 2012-04-05 11:48:47.000000000 +0200 -@@ -55,7 +55,7 @@ - </dependency> - <dependency> - <groupId>junit</groupId> -- <artifactId>junit-dep</artifactId> -+ <artifactId>junit</artifactId> - <version>4.8.2</version> - <scope>test</scope> - </dependency> diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index dc17f31..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -0001-disable-2-modules.patch -renamejunit.patch -removederby.patch -- 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
