[libquartz2-java] 59/63: Renamed the package to libquartz2-java

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libquartz2-java.

commit 3ea4084f05992af16ead256c377d79a1695bb2b1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Apr 12 13:23:26 2016 +0200

    Renamed the package to libquartz2-java
---
 debian/README.source                                 | 4 ++--
 debian/changelog                                     | 5 +++--
 debian/control                                       | 4 ++--
 debian/libquartz-java.classpath                      | 1 -
 debian/libquartz2-java.classpath                     | 1 +
 debian/{libquartz-java.poms => libquartz2-java.poms} | 0
 debian/maven.rules                                   | 1 +
 debian/orig-tar.sh                                   | 4 ++--
 debian/rules                                         | 4 ++--
 9 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index cfd7ae4..65e9e33 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
-Information about libquartz-java
---------------------------------
+Information about libquartz2-java
+---------------------------------
 
 This package was debianized using the mh_make command
 from the maven-debian-helper package.
diff --git a/debian/changelog b/debian/changelog
index 8682f0b..1f7dc41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
-libquartz-java (1:2.2.2-1) UNRELEASED; urgency=medium
+libquartz2-java (2.2.2-1) UNRELEASED; urgency=medium
 
   * Team upload.
-  * New upstream release
+  * New upstream release (Closes: #694341)
+    - Renamed the package to libquartz2-java
     - Build the new modules (core, jobs, plugins)
     - Enabled the commonj support
     - New dependencies on libc3p0-java, libgeronimo-commonj-spec-java,
diff --git a/debian/control b/debian/control
index 72c99d7..13e206d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libquartz-java
+Source: libquartz2-java
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
@@ -28,7 +28,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-java/libquartz-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libquartz-java.git
 Homepage: http://quartz-scheduler.org
 
-Package: libquartz-java
+Package: libquartz2-java
 Architecture: all
 Depends: ${maven:Depends}, ${misc:Depends}
 Suggests: ${maven:OptionalDepends}
diff --git a/debian/libquartz-java.classpath b/debian/libquartz-java.classpath
deleted file mode 100644
index d8ff9f5..0000000
--- a/debian/libquartz-java.classpath
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/quartz.jar /usr/share/java/slf4j-api.jar
diff --git a/debian/libquartz2-java.classpath b/debian/libquartz2-java.classpath
new file mode 100644
index 0000000..85fbf1b
--- /dev/null
+++ b/debian/libquartz2-java.classpath
@@ -0,0 +1 @@
+usr/share/java/quartz2.jar /usr/share/java/slf4j-api.jar
diff --git a/debian/libquartz-java.poms b/debian/libquartz2-java.poms
similarity index 100%
rename from debian/libquartz-java.poms
rename to debian/libquartz2-java.poms
diff --git a/debian/maven.rules b/debian/maven.rules
index 23f47a1..11f311b 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,6 +16,7 @@
 # and version starting with 3., replacing the version with 3.x
 #   junit junit jar s/3\..*/3.x/
 
+org.quartz-scheduler * * s/.*/2.x/ * *
 s/asm/org.ow2.asm/ * * s/.*/debian/ * *
 junit s/junit-dep/junit jar s/4\..*/4.x/ * *
 log4j log4j jar s/.*/1.2.x/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 1cefa62..b9dd5a0 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -3,8 +3,8 @@
 # called by uscan with '--upstream-version' <version> <file>
 SVN=http://svn.terracotta.org/svn/quartz/tags
 VERSION=$2
-TAR=../libquartz-java_$VERSION.orig.tar.xz
-DIR=libquartz-java-$VERSION.orig
+TAR=../libquartz2-java_$VERSION.orig.tar.xz
+DIR=libquartz2-java-$VERSION.orig
 
 # clean up the upstream tarball
 svn export $SVN/quartz-$VERSION $DIR
diff --git a/debian/rules b/debian/rules
index 70519ba..f186527 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@
 	dh $@ --buildsystem=maven --with javahelper
 
 override_dh_auto_install:
-	mh_installpom -plibquartz-java --no-parent quartz/target/dependency-reduced-pom.xml
-	mh_installjar -plibquartz-java --java-lib quartz/target/dependency-reduced-pom.xml quartz/target/quartz-2.2.2.jar
+	mh_installpom -plibquartz2-java --no-parent quartz/target/dependency-reduced-pom.xml
+	mh_installjar -plibquartz2-java --java-lib --usj-name=quartz2 quartz/target/dependency-reduced-pom.xml quartz/target/quartz-2.2.2.jar
 
 get-orig-source:
 	uscan --download-current-version --force-download

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libquartz2-java.git