[maven-file-management] 02/21: package builds locally

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository maven-file-management.

commit 04f01de8c6cab729581ea950bb9de355c563db0f
Author: Torsten Werner <twerner at debian.org>
Date:   Sat Dec 6 22:20:52 2008 +0000

    package builds locally
---
 debian/build.xml | 10 +++++-----
 debian/rules     |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 15d71d5..230d433 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -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>
 
diff --git a/debian/rules b/debian/rules
index bff9ff5..710440d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ API_DOCS             := build/api
 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

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