[pkg-java] r15739 - in trunk/maven-debian-helper: debian maven-debian-plugin/src/main/java/org/debian/maven/plugin

[Ludovic Claude]

Author: ludovicc-guest
Date: 2012-01-24 22:55:57 +0000 (Tue, 24 Jan 2012)
New Revision: 15739

Modified:
   trunk/maven-debian-helper/debian/changelog
   trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
Log:
Fix installation of artifacts using a classifier

Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog	2012-01-24 22:44:55 UTC (rev 15738)
+++ trunk/maven-debian-helper/debian/changelog	2012-01-24 22:55:57 UTC (rev 15739)
@@ -1,4 +1,4 @@
-maven-debian-helper (1.5) UNRELEASED; urgency=low
+maven-debian-helper (1.5) unstable; urgency=low
 
   [ Ludovic Claude ]
   * Install jars in /usr/share/java (Closes: #636660)
@@ -20,6 +20,7 @@
   * mh_make: Don't include document packages in the dependency search
     (Closes: #656235)
   * Fix installation of javadoc jar (Closes: #656311)
+  * Fix installation of artifacts using a classifier
 
   [ Damien Raude-Morvan ]
   * maven-packager-utils/src/main/resources/build.xml.vm: package-module ant
@@ -27,7 +28,7 @@
   * Follow-up for #589635: avoid creating a file called mvn-build during
     the build.
 
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 10 Jan 2012 00:20:32 +0100
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 24 Jan 2012 23:55:22 +0100
 
 maven-debian-helper (1.4.5) unstable; urgency=low
 

Modified: trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java	2012-01-24 22:44:55 UTC (rev 15738)
+++ trunk/maven-debian-helper/maven-debian-plugin/src/main/java/org/debian/maven/plugin/SysInstallMojo.java	2012-01-24 22:55:57 UTC (rev 15739)
@@ -318,12 +318,11 @@
         if (finalName != null && finalName.length() > 0) {
             jarName = finalName;
         } else {
-            if (classifier != null) {
-                jarName = artifactId + "-" + version + "-" + classifier;
-            } else {
-                jarName = artifactId + "-" + version;
-            }
+            jarName = artifactId + "-" + version;
         }
+        if (classifier != null) {
+            jarName += "-" + classifier;
+        }
         return jarName + ".jar";
     }