[pkg-java] r7613 - trunk/maven-archiver/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-09 21:07:08 +0000 (Tue, 09 Dec 2008)
New Revision: 7613

Modified:
   trunk/maven-archiver/debian/
   trunk/maven-archiver/debian/changelog
   trunk/maven-archiver/debian/control
   trunk/maven-archiver/debian/copyright
   trunk/maven-archiver/debian/rules
Log:
some fixes



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

Modified: trunk/maven-archiver/debian/changelog
===================================================================
--- trunk/maven-archiver/debian/changelog	2008-12-09 20:48:48 UTC (rev 7612)
+++ trunk/maven-archiver/debian/changelog	2008-12-09 21:07:08 UTC (rev 7613)
@@ -1,4 +1,4 @@
-maven-filtering (2.3-1) unstable; urgency=low
+maven-archiver (2.3-1) unstable; urgency=low
 
   * Initial release. (Closes: #xxxxxx)
 

Modified: trunk/maven-archiver/debian/control
===================================================================
--- trunk/maven-archiver/debian/control	2008-12-09 20:48:48 UTC (rev 7612)
+++ trunk/maven-archiver/debian/control	2008-12-09 21:07:08 UTC (rev 7613)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper
+Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper,
+ maven2, libplexus-archiver-java, libplexus-utils-java, libplexus-containers-java
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-archiver
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-archiver/
@@ -12,7 +13,8 @@
 Package: libmaven-archiver-java
 Architecture: all
 Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime
+Depends: ${misc:Depends}, default-jre | java2-runtime, libplexus-archiver-java,
+ libplexus-utils-java, libplexus-containers-java
 Description: Maven Archiver
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,

Modified: trunk/maven-archiver/debian/copyright
===================================================================
--- trunk/maven-archiver/debian/copyright	2008-12-09 20:48:48 UTC (rev 7612)
+++ trunk/maven-archiver/debian/copyright	2008-12-09 21:07:08 UTC (rev 7613)
@@ -8,7 +8,7 @@
 The package was downloaded from
 <http://maven.apache.org/shared/maven-archiver>.
 
-Copyright: 2008 The Apache Software Foundation.
+Copyright: 2007-2008 The Apache Software Foundation.
 
 License:
 

Modified: trunk/maven-archiver/debian/rules
===================================================================
--- trunk/maven-archiver/debian/rules	2008-12-09 20:48:48 UTC (rev 7612)
+++ trunk/maven-archiver/debian/rules	2008-12-09 21:07:08 UTC (rev 7613)
@@ -7,7 +7,7 @@
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := 
+DEB_JARS             := maven2 plexus-archiver plexus-utils plexus-container-default-1.0
 DEB_ANT_BUILD_TARGET := package #javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
 DEB_ANT_ARGS         := -Dversion=$(VERSION)
@@ -19,10 +19,6 @@
 REPO := /usr/share/maven-repo
 DEST := $(REPO)/org/apache/maven/shared
 
-makebuilddir/lib$(PACKAGE)-java::
-	install -d target/classes/META-INF/plexus/
-	install -m644 debian/components.xml target/classes/META-INF/plexus/
-
 binary-post-install/lib$(PACKAGE)-java::
 	dh_install target/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/
 	install -m644 pom.xml $(DEB_DESTDIR)$(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom