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

Ludovic Claude ludovicc-guest at alioth.debian.org
Tue Jul 7 23:50:27 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-07 23:50:27 +0000 (Tue, 07 Jul 2009)
New Revision: 8939

Added:
   trunk/maven-archiver/debian/build.properties
   trunk/maven-archiver/debian/libmaven-archiver-java.poms
   trunk/maven-archiver/debian/maven.rules
Removed:
   trunk/maven-archiver/debian/ant.properties
   trunk/maven-archiver/debian/build.xml
   trunk/maven-archiver/debian/patches/
Modified:
   trunk/maven-archiver/debian/changelog
   trunk/maven-archiver/debian/control
   trunk/maven-archiver/debian/copyright
   trunk/maven-archiver/debian/orig-tar.sh
   trunk/maven-archiver/debian/rules
Log:
* New version

Deleted: trunk/maven-archiver/debian/ant.properties
===================================================================
--- trunk/maven-archiver/debian/ant.properties	2009-07-07 23:48:59 UTC (rev 8938)
+++ trunk/maven-archiver/debian/ant.properties	2009-07-07 23:50:27 UTC (rev 8939)
@@ -1,4 +0,0 @@
-javadoc.dir=build/api
-build.directory=target
-build.outputDirectory=target/classes
-maven.test.skip=true

Added: trunk/maven-archiver/debian/build.properties
===================================================================
--- trunk/maven-archiver/debian/build.properties	                        (rev 0)
+++ trunk/maven-archiver/debian/build.properties	2009-07-07 23:50:27 UTC (rev 8939)
@@ -0,0 +1,3 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true

Deleted: trunk/maven-archiver/debian/build.xml
===================================================================
--- trunk/maven-archiver/debian/build.xml	2009-07-07 23:48:59 UTC (rev 8938)
+++ trunk/maven-archiver/debian/build.xml	2009-07-07 23:50:27 UTC (rev 8939)
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
-  <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-  <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
-  <target name="clean">
-    <ant target="clean" antfile="${maven.build.xml}" dir="."/>
-  </target>
-
-  <target name="package">
-    <ant target="package" antfile="${maven.build.xml}" dir=".">
-      <property name="artifactId" value="maven-archiver"/>
-    </ant>
-  </target>
-
-  <target name="javadoc">
-    <javadoc destdir="${javadoc.dir}">
-      <packageset dir="src/main/java/"/>
-    </javadoc>
-  </target>
-
-</project>

Modified: trunk/maven-archiver/debian/changelog
===================================================================
--- trunk/maven-archiver/debian/changelog	2009-07-07 23:48:59 UTC (rev 8938)
+++ trunk/maven-archiver/debian/changelog	2009-07-07 23:50:27 UTC (rev 8939)
@@ -1,3 +1,18 @@
+maven-archiver (2.4-1) unstable; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Add the Maven POM to the package,
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Remove the patch for the POM as it's no longer needed, as well as
+    the dependency on Quilt
+  * Add a dependency on libplexus-interpolation-java, change the dependency
+    on maven2 to libmaven2-core-java
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 14 May 2009 20:54:44 +0100
+
 maven-archiver (2.3-3) unstable; urgency=low
 
   UNRELEASED

Modified: trunk/maven-archiver/debian/control
===================================================================
--- trunk/maven-archiver/debian/control	2009-07-07 23:48:59 UTC (rev 8938)
+++ trunk/maven-archiver/debian/control	2009-07-07 23:50:27 UTC (rev 8939)
@@ -1,20 +1,21 @@
 Source: maven-archiver
-Section: libdevel
+Section: java
 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,
- maven2, libplexus-archiver-java, libplexus-utils-java, libplexus-containers-java
-Standards-Version: 3.8.0
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: default-jdk, debhelper (>= 5), cdbs
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+ libmaven2-core-java, libplexus-archiver-java, libplexus-interpolation-java,
+ libplexus-utils-java, libplexus-containers-java
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-archiver
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-archiver/
 Homepage: http://maven.apache.org/shared/maven-archiver/
 
 Package: libmaven-archiver-java
 Architecture: all
-Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime, libplexus-archiver-java,
- libplexus-utils-java, libplexus-containers-java
+Depends: ${misc:Depends}, libmaven2-core-java, libplexus-archiver-java,
+ libplexus-interpolation-java, libplexus-utils-java, libplexus-containers-java
 Description: Archiver component for Maven
  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	2009-07-07 23:48:59 UTC (rev 8938)
+++ trunk/maven-archiver/debian/copyright	2009-07-07 23:50:27 UTC (rev 8939)
@@ -3,7 +3,7 @@
 The Debian packaging is Copyright (c) 2008 Torsten Werner and is
 licensed under the GNU General Public License version 3. On Debian
 systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL'.
+found in '/usr/share/common-licenses/GPL-3'.
 
 The package was downloaded from
 <http://maven.apache.org/shared/maven-archiver>.

Added: trunk/maven-archiver/debian/libmaven-archiver-java.poms
===================================================================
--- trunk/maven-archiver/debian/libmaven-archiver-java.poms	                        (rev 0)
+++ trunk/maven-archiver/debian/libmaven-archiver-java.poms	2009-07-07 23:50:27 UTC (rev 8939)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/maven-archiver/debian/maven.rules
===================================================================
--- trunk/maven-archiver/debian/maven.rules	                        (rev 0)
+++ trunk/maven-archiver/debian/maven.rules	2009-07-07 23:50:27 UTC (rev 8939)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/
+


Property changes on: trunk/maven-archiver/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Modified: trunk/maven-archiver/debian/rules
===================================================================
--- trunk/maven-archiver/debian/rules	2009-07-07 23:48:59 UTC (rev 8938)
+++ trunk/maven-archiver/debian/rules	2009-07-07 23:50:27 UTC (rev 8939)
@@ -2,24 +2,24 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := maven2 plexus-archiver plexus-utils plexus-container-default-1.0
+DEB_JARS             := ant-nodeps maven-core maven-artifact maven-artifact-manager maven-project \
+ maven-model plexus-archiver plexus-interpolation plexus-utils plexus-container-default
 DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dversion=$(VERSION)
-API_DOCS             := build/api
+DEB_ANT_BUILDFILE    := /usr/share/maven-ant-helper/maven-build.xml
+DEB_ANT_ARGS         := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS             := target/api
 
 get-orig-source:
-	uscan --force-download
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
-REPO := /usr/share/maven-repo
-DEST := $(REPO)/org/apache/maven
+binary-post-install/lib$(PACKAGE)-java::
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
 
-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
-	dh_link $(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar
+clean::
+	-rm -rf debian/tmp
+


Property changes on: trunk/maven-archiver/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *

More information about the pkg-java-commits mailing list