[pkg-java] r15899 - in trunk/libquartz-java/debian: . patches

Mathieu Malaterre malat at alioth.debian.org
Thu Apr 5 09:34:50 UTC 2012 

Author: malat
Date: 2012-04-05 09:34:49 +0000 (Thu, 05 Apr 2012)
New Revision: 15899

Modified:
   trunk/libquartz-java/debian/changelog
   trunk/libquartz-java/debian/control
   trunk/libquartz-java/debian/copyright
   trunk/libquartz-java/debian/libquartz-java.poms
   trunk/libquartz-java/debian/maven.cleanIgnoreRules
   trunk/libquartz-java/debian/maven.ignoreRules
   trunk/libquartz-java/debian/maven.publishedRules
   trunk/libquartz-java/debian/maven.rules
   trunk/libquartz-java/debian/patches/0001-disable-2-modules.patch
Log:
Start working on new release of quartz-scheduler

Modified: trunk/libquartz-java/debian/changelog
===================================================================
--- trunk/libquartz-java/debian/changelog	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/changelog	2012-04-05 09:34:49 UTC (rev 15899)
@@ -1,3 +1,12 @@
+libquartz-java (2.1.4-1) UNRELEASED; urgency=low
+
+  * New upstream
+  * Add myself as uploader
+  * Remove Michael Koch from uploaders. Closes: #654091
+  * Bump Std-Vers to 3.9.3, no changes needed
+
+ -- Mathieu Malaterre <malat at debian.org>  Thu, 05 Apr 2012 10:49:51 +0200
+
 libquartz-java (1.7.3-2) unstable; urgency=low
 
   * Add missing Build-Depends: libcommons-validator-java. (Closes: #643503)

Modified: trunk/libquartz-java/debian/control
===================================================================
--- trunk/libquartz-java/debian/control	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/control	2012-04-05 09:34:49 UTC (rev 15899)
@@ -2,17 +2,17 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Michael Koch <konqueror at gmx.de>
+Uploaders: Varun Hiremath <varun at debian.org>, Torsten Werner <twerner at debian.org>, Mathieu Malaterre <malat at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: glassfish-activation, glassfish-javaee, glassfish-mail, libcommons-logging-java,  
  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
-Standards-Version: 3.9.1
+ libcommons-modeler-java, libcommons-dbcp-java, libcommons-validator-java, libc3p0-java
+Standards-Version: 3.9.3
 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
+Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libquartz-java
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libquartz-java/
 
 Package: libquartz-java
 Architecture: all

Modified: trunk/libquartz-java/debian/copyright
===================================================================
--- trunk/libquartz-java/debian/copyright	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/copyright	2012-04-05 09:34:49 UTC (rev 15899)
@@ -1,4 +1,4 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Quartz Parent POM
 Upstream-Contact:  James House <jhouse at terracotta.org> as Primary Developer 
              Jason Voegele <jvoegele at terracotta.org> as Build Engineer, Release Engineer 

Modified: trunk/libquartz-java/debian/libquartz-java.poms
===================================================================
--- trunk/libquartz-java/debian/libquartz-java.poms	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/libquartz-java.poms	2012-04-05 09:34:49 UTC (rev 15899)
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --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
@@ -11,19 +13,20 @@
 #   --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
+#      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.
+#   --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.
-#   --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.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
 pom.xml --has-package-version
 quartz/pom.xml --has-package-version
 quartz-jboss/pom.xml --ignore
+quartz-backward-compat/pom.xml --has-package-version
 examples/pom.xml --ignore

Modified: trunk/libquartz-java/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/libquartz-java/debian/maven.cleanIgnoreRules	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/maven.cleanIgnoreRules	2012-04-05 09:34:49 UTC (rev 15899)
@@ -13,5 +13,5 @@
 # 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/
+#   junit junit jar s/3\..*/3.x/
 

Modified: trunk/libquartz-java/debian/maven.ignoreRules
===================================================================
--- trunk/libquartz-java/debian/maven.ignoreRules	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/maven.ignoreRules	2012-04-05 09:34:49 UTC (rev 15899)
@@ -12,10 +12,12 @@
 # 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/
+#   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 * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *

Modified: trunk/libquartz-java/debian/maven.publishedRules
===================================================================
--- trunk/libquartz-java/debian/maven.publishedRules	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/maven.publishedRules	2012-04-05 09:34:49 UTC (rev 15899)
@@ -15,5 +15,5 @@
 # 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/
+#   junit junit jar s/3\..*/3.x/
 

Modified: trunk/libquartz-java/debian/maven.rules
===================================================================
--- trunk/libquartz-java/debian/maven.rules	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/maven.rules	2012-04-05 09:34:49 UTC (rev 15899)
@@ -14,13 +14,14 @@
 # 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/
+#   junit junit jar s/3\..*/3.x/
 
 org.quartz-scheduler quartz-parent pom s/.*/debian/ * *
 org.quartz-scheduler quartz jar s/.*/debian/ * *
+org.quartz-scheduler quartz-backward-compat jar s/.*/debian/ * *
 javax.transaction s/jta/transaction-api/ jar s/.*/debian/ * * 
 s/org.apache.openejb/javax/ javaee-api jar s/.*/debian/ * *
-junit junit jar s/3\..*/3.x/
-asm asm jar s/3\..*/3.x/
-log4j log4j jar s/1\.2.*/1.2.x/
-javax.servlet servlet-api jar s/2\.5.*/2.5/
+junit junit jar s/3\..*/3.x/ * *
+asm asm jar s/3\..*/3.x/ * *
+log4j log4j jar s/1\.2.*/1.2.x/ * *
+javax.servlet servlet-api jar s/2\.5.*/2.5/ * *

Modified: trunk/libquartz-java/debian/patches/0001-disable-2-modules.patch
===================================================================
--- trunk/libquartz-java/debian/patches/0001-disable-2-modules.patch	2012-04-05 07:37:41 UTC (rev 15898)
+++ trunk/libquartz-java/debian/patches/0001-disable-2-modules.patch	2012-04-05 09:34:49 UTC (rev 15899)
@@ -6,17 +6,17 @@
  pom.xml |    2 --
  1 files changed, 0 insertions(+), 2 deletions(-)
 
-diff --git a/pom.xml b/pom.xml
-index fc2b698..23b2cc6 100644
---- a/pom.xml
-+++ b/pom.xml
-@@ -68,8 +68,6 @@
+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>
---

More information about the pkg-java-commits mailing list