[pkg-java] r7546 - trunk/maven-file-management/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-06 22:20:52 +0000 (Sat, 06 Dec 2008)
New Revision: 7546

Modified:
   trunk/maven-file-management/debian/
   trunk/maven-file-management/debian/build.xml
   trunk/maven-file-management/debian/rules
Log:
package builds locally



Property changes on: trunk/maven-file-management/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/maven-file-management/debian/build.xml
===================================================================
--- trunk/maven-file-management/debian/build.xml	2008-12-06 22:12:18 UTC (rev 7545)
+++ trunk/maven-file-management/debian/build.xml	2008-12-06 22:20:52 UTC (rev 7546)
@@ -13,15 +13,15 @@
 
     <target name="generate-sources">
         <taskdef name="modello" classname="ModelloTask"/>
-	<modello model="src/main/mdo/fileset.mdo" plugin="xpp3-reader" output="build/generated-sources" version="1.1.0"/>
-	<modello model="src/main/mdo/fileset.mdo" plugin="xpp3-writer" output="build/generated-sources" version="1.1.0"/>
-	<modello model="src/main/mdo/fileset.mdo" plugin="java" output="build/generated-sources" version="1.1.0"/>
-	<modello model="src/main/mdo/fileset.mdo" plugin="xsd" output="build/generated-sources" version="1.1.0"/>
+	<modello model="src/main/mdo/fileset.mdo" plugin="xpp3-reader" output="target/generated-sources" version="1.1.0"/>
+	<modello model="src/main/mdo/fileset.mdo" plugin="xpp3-writer" output="target/generated-sources" version="1.1.0"/>
+	<modello model="src/main/mdo/fileset.mdo" plugin="java" output="target/generated-sources" version="1.1.0"/>
+	<modello model="src/main/mdo/fileset.mdo" plugin="xsd" output="target/generated-sources" version="1.1.0"/>
     </target>
 
     <target name="package" depends="generate-sources">
         <ant target="package" antfile="${maven.build.xml}" dir=".">
-            <property name="artifactId" value="maven-file-management"/>
+            <property name="artifactId" value="file-management"/>
         </ant>
     </target>
 

Modified: trunk/maven-file-management/debian/rules
===================================================================
--- trunk/maven-file-management/debian/rules	2008-12-06 22:12:18 UTC (rev 7545)
+++ trunk/maven-file-management/debian/rules	2008-12-06 22:20:52 UTC (rev 7546)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
+PACKAGE              := file-management
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
 JAVA_HOME            := /usr/lib/jvm/default-java
 DEB_JARS             := maven2 maven-shared-io maven-ant-helper plexus-utils \
@@ -16,6 +16,6 @@
 get-orig-source:
 	uscan --force-download
 
-binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java build/$(PACKAGE)-$(VERSION).jar /usr/share/java
-	dh_link -plib$(PACKAGE)-java /usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar
+binary-post-install/libmaven-$(PACKAGE)-java::
+	dh_install -plibmaven-$(PACKAGE)-java target/$(PACKAGE)-$(VERSION).jar /usr/share/java
+	dh_link -plibmaven-$(PACKAGE)-java /usr/share/java/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar