[pkg-java] r6110 - trunk/plexus-compiler-api/debian

[paulcager-guest at alioth.debian.org]

Author: paulcager-guest
Date: 2008-04-06 22:48:39 +0000 (Sun, 06 Apr 2008)
New Revision: 6110

Removed:
   trunk/plexus-compiler-api/debian/ant.properties
Modified:
   trunk/plexus-compiler-api/debian/build.xml
   trunk/plexus-compiler-api/debian/changelog
   trunk/plexus-compiler-api/debian/control
   trunk/plexus-compiler-api/debian/rules
Log:
Create versioned jar correctly

Deleted: trunk/plexus-compiler-api/debian/ant.properties
===================================================================
--- trunk/plexus-compiler-api/debian/ant.properties	2008-04-06 21:55:30 UTC (rev 6109)
+++ trunk/plexus-compiler-api/debian/ant.properties	2008-04-06 22:48:39 UTC (rev 6110)
@@ -1,4 +0,0 @@
-project.name=plexus-compiler-api
-jar.name=plexus-compiler-api.jar
-source.dir=.
-classes.dir=classes

Modified: trunk/plexus-compiler-api/debian/build.xml
===================================================================
--- trunk/plexus-compiler-api/debian/build.xml	2008-04-06 21:55:30 UTC (rev 6109)
+++ trunk/plexus-compiler-api/debian/build.xml	2008-04-06 22:48:39 UTC (rev 6110)
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<project default="jar" name="${project.name}" basedir="..">
+<project default="jar" name="${component}" basedir="..">
 
   <target name="init">
-    <echo message="Building jar ${jar.name}" />
+    <property name="jar.name" value="${component}-${version}.jar" />
+    <property name="classes.dir" value="classes" />
+    <property name="source.dir" value="." />
   </target>
 
   <target name="clean" depends="init">
@@ -18,6 +20,7 @@
   </target>
 
   <target name="jar" description="o Create the jar" depends="compile">
+    <echo message="Building jar ${jar.name}" />
     <copy todir="${classes.dir}/META-INF">
       <fileset dir="META-INF"/>
     </copy>

Modified: trunk/plexus-compiler-api/debian/changelog
===================================================================
--- trunk/plexus-compiler-api/debian/changelog	2008-04-06 21:55:30 UTC (rev 6109)
+++ trunk/plexus-compiler-api/debian/changelog	2008-04-06 22:48:39 UTC (rev 6110)
@@ -3,4 +3,4 @@
   * Initial release.
     (Closes: 474610).
 
- -- Paul Cager <paul-debian at home.paulcager.org>  Sun, 06 Apr 2008 14:11:19 +0100
+ -- Paul Cager <paul-debian at home.paulcager.org>  Sun, 06 Apr 2008 23:48:13 +0100

Modified: trunk/plexus-compiler-api/debian/control
===================================================================
--- trunk/plexus-compiler-api/debian/control	2008-04-06 21:55:30 UTC (rev 6109)
+++ trunk/plexus-compiler-api/debian/control	2008-04-06 22:48:39 UTC (rev 6110)
@@ -14,9 +14,9 @@
 Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}, libplexus-container-default-java, libplexus-utils-java
 Description: The API for the Plexus compiler system
- The Plexus project provides a full software stack for creating and
- executing software projects. Based on the Plexus container, the applications can
- utilise component-oriented programming to build modular, reusable
- components that can easily be assembled and reused.
+ The Plexus project provides a full software stack for creating and executing
+ software projects. Based on the Plexus container, the applications can
+ utilise component-oriented programming to build modular, reusable components
+ that can easily be assembled and reused.
  .
  This package provides the Plexus Compiler API.

Modified: trunk/plexus-compiler-api/debian/rules
===================================================================
--- trunk/plexus-compiler-api/debian/rules	2008-04-06 21:55:30 UTC (rev 6109)
+++ trunk/plexus-compiler-api/debian/rules	2008-04-06 22:48:39 UTC (rev 6110)
@@ -7,10 +7,11 @@
 DEB_ANT_BUILD_TARGET	:= jar
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_JARS		:= plexus-container-default plexus-utils
+ANT_OPTS		:= -Dversion=$(DEB_UPSTREAM_VERSION) -Dcomponent=$(DEB_SOURCE_PACKAGE)
 
 install/libplexus-compiler-api-java::
-	dh_install plexus-compiler-api.jar usr/share/java/plexus-compiler-api-$(DEB_UPSTREAM_VERSION).jar
-	dh_link /usr/share/java/plexus-compiler-api-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/plexus-compiler-api.jar
+	dh_install $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar usr/share/java
+	dh_link /usr/share/java/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/$(DEB_SOURCE_PACKAGE).jar
 
 get-orig-source:
 	-uscan --upstream-version 0