[pkg-java] r8938 - trunk/maven-filtering/debian

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

Author: ludovicc-guest
Date: 2009-07-07 23:48:59 +0000 (Tue, 07 Jul 2009)
New Revision: 8938

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

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

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

Deleted: trunk/maven-filtering/debian/build.xml
===================================================================
--- trunk/maven-filtering/debian/build.xml	2009-07-07 23:45:48 UTC (rev 8937)
+++ trunk/maven-filtering/debian/build.xml	2009-07-07 23:48:59 UTC (rev 8938)
@@ -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-filtering"/>
-    </ant>
-  </target>
-
-  <target name="javadoc">
-    <javadoc destdir="${javadoc.dir}">
-      <packageset dir="src/main/java/"/>
-    </javadoc>
-  </target>
-
-</project>

Modified: trunk/maven-filtering/debian/changelog
===================================================================
--- trunk/maven-filtering/debian/changelog	2009-07-07 23:45:48 UTC (rev 8937)
+++ trunk/maven-filtering/debian/changelog	2009-07-07 23:48:59 UTC (rev 8938)
@@ -1,3 +1,15 @@
+maven-filtering (1.0~beta-2-2) unstable; urgency=low
+
+  * 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
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Thu, 14 May 2009 21:42:10 +0100
+
 maven-filtering (1.0~beta-2-1) unstable; urgency=low
 
   * Initial release. (Closes: #508102)

Modified: trunk/maven-filtering/debian/components.xml
===================================================================
--- trunk/maven-filtering/debian/components.xml	2009-07-07 23:45:48 UTC (rev 8937)
+++ trunk/maven-filtering/debian/components.xml	2009-07-07 23:48:59 UTC (rev 8938)
@@ -1,12 +1,6 @@
 <component-set>
   <components>
     <component>
-      <role>org.apache.maven.shared.filtering.MavenFileFilter</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.shared.filtering.DefaultMavenFileFilter</implementation>
-      <description></description>
-    </component>
-    <component>
       <role>org.apache.maven.shared.filtering.MavenResourcesFiltering</role>
       <role-hint>default</role-hint>
       <implementation>org.apache.maven.shared.filtering.DefaultMavenResourcesFiltering</implementation>
@@ -19,5 +13,11 @@
         </requirement>
       </requirements>
     </component>
+    <component>
+      <role>org.apache.maven.shared.filtering.MavenFileFilter</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.shared.filtering.DefaultMavenFileFilter</implementation>
+      <description></description>
+    </component>
   </components>
 </component-set>

Modified: trunk/maven-filtering/debian/control
===================================================================
--- trunk/maven-filtering/debian/control	2009-07-07 23:45:48 UTC (rev 8937)
+++ trunk/maven-filtering/debian/control	2009-07-07 23:48:59 UTC (rev 8938)
@@ -1,20 +1,21 @@
 Source: maven-filtering
-Section: devel
+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,
- libplexus-containers-java, libplexus-interpolation-java, libplexus-utils-java,
- maven2
-Standards-Version: 3.8.0
+Build-Depends: default-jdk, debhelper (>= 5), cdbs
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ junit,
+ libmaven2-core-java, libplexus-container-default-java, 
+ libplexus-interpolation-java, libplexus-utils-java,
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-filtering
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-filtering/
 Homepage: http://maven.apache.org/shared/maven-filtering/
 
 Package: libmaven-filtering-java
 Architecture: all
-Section: devel
-Depends: ${misc:Depends}, default-jre | java2-runtime, libplexus-containers-java,
+Depends: ${misc:Depends}, libmaven2-core-java, libplexus-container-default-java,
  libplexus-interpolation-java, libplexus-utils-java
 Description: Maven Filtering
  Maven is a software project management and comprehension tool. Based on the

Modified: trunk/maven-filtering/debian/copyright
===================================================================
--- trunk/maven-filtering/debian/copyright	2009-07-07 23:45:48 UTC (rev 8937)
+++ trunk/maven-filtering/debian/copyright	2009-07-07 23:48:59 UTC (rev 8938)
@@ -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-filtering>.

Added: trunk/maven-filtering/debian/libmaven-filtering-java.poms
===================================================================
--- trunk/maven-filtering/debian/libmaven-filtering-java.poms	                        (rev 0)
+++ trunk/maven-filtering/debian/libmaven-filtering-java.poms	2009-07-07 23:48:59 UTC (rev 8938)
@@ -0,0 +1 @@
+pom.xml --no-parent

Added: trunk/maven-filtering/debian/maven.rules
===================================================================
--- trunk/maven-filtering/debian/maven.rules	                        (rev 0)
+++ trunk/maven-filtering/debian/maven.rules	2009-07-07 23:48:59 UTC (rev 8938)
@@ -0,0 +1,3 @@
+junit junit jar s/3\..*/3.x/
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
+


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

Modified: trunk/maven-filtering/debian/rules
===================================================================
--- trunk/maven-filtering/debian/rules	2009-07-07 23:45:48 UTC (rev 8937)
+++ trunk/maven-filtering/debian/rules	2009-07-07 23:48:59 UTC (rev 8938)
@@ -2,29 +2,32 @@
 
 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/' | sed 's/~/-/')
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := maven2 plexus-container-default-1.0 plexus-interpolation \
-  plexus-utils
+DEB_JARS             := ant-nodeps maven-core maven-project maven-model \
+  plexus-container-default-alpha plexus-interpolation plexus-utils junit
 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/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
-	dh_link $(DEST)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).jar /usr/share/java/$(PACKAGE).jar
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
+
+clean::
+	-rm -rf debian/tmp
+
+# Extract generated plexus components.xml files from a standard Maven build
+copy-plexus-components: target/classes/META-INF/plexus/components.xml
+	cp target/classes/META-INF/plexus/components.xml debian/components.xml
+


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

More information about the pkg-java-commits mailing list