Author: twerner
Date: 2010-02-07 19:45:12 +0000 (Sun, 07 Feb 2010)
New Revision: 11533
Added:
trunk/maven-embedder/debian/README.source
trunk/maven-embedder/debian/libmaven-embedder-java.poms
trunk/maven-embedder/debian/patches/
trunk/maven-embedder/debian/patches/01_build_fix.diff
trunk/maven-embedder/debian/patches/series
trunk/maven-embedder/debian/poms/
trunk/maven-embedder/debian/poms/maven-embedder.xml
Modified:
trunk/maven-embedder/debian/
trunk/maven-embedder/debian/changelog
trunk/maven-embedder/debian/control
trunk/maven-embedder/debian/rules
Log:
* Non-maintainer upload.
* debian/control
- Add build dependencies quilt, libmaven2-core-java, maven-repo-helper.
- Add appropriate runtime dependencies.
- Add {misc:Depends} dependency to fix lintian warning.
- Change section to java.
- Update standards version to 3.8.4.
* debian/rules
- Include quilt patch system makefile.
- Add jar files necessary to build this package to DEB_JARS.
- Set package name by using ant argument.
- Use commands from maven-repo-helper to install jar files.
- Add target to get pom files from maven repository.
* debian/poms/maven-embedder.xml, debian/libmaven-embedder-java.poms
- Add pom file downloaded from maven repository.
* debian/patches/01_build_fix.diff, debian/patches/series
- Patch to fix a compilation error.
* debian/README.source - Add to comply with policy.
* Closes: #543103
Property changes on: trunk/maven-embedder/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: trunk/maven-embedder/debian/README.source
===================================================================
--- trunk/maven-embedder/debian/README.source (rev 0)
+++ trunk/maven-embedder/debian/README.source 2010-02-07 19:45:12 UTC (rev
11533)
@@ -0,0 +1,3 @@
+This package uses quilt in order to apply patches to the upstream source.
+Patches are stored in debian/patches.
+For further details, check /usr/share/doc/quilt/README.source.
Modified: trunk/maven-embedder/debian/changelog
===================================================================
--- trunk/maven-embedder/debian/changelog 2010-02-07 19:41:04 UTC (rev
11532)
+++ trunk/maven-embedder/debian/changelog 2010-02-07 19:45:12 UTC (rev
11533)
@@ -1,3 +1,27 @@
+maven-embedder (2.0.4-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control
+ - Add build dependencies quilt, libmaven2-core-java, maven-repo-helper.
+ - Add appropriate runtime dependencies.
+ - Add {misc:Depends} dependency to fix lintian warning.
+ - Change section to java.
+ - Update standards version to 3.8.4.
+ * debian/rules
+ - Include quilt patch system makefile.
+ - Add jar files necessary to build this package to DEB_JARS.
+ - Set package name by using ant argument.
+ - Use commands from maven-repo-helper to install jar files.
+ - Add target to get pom files from maven repository.
+ * debian/poms/maven-embedder.xml, debian/libmaven-embedder-java.poms
+ - Add pom file downloaded from maven repository.
+ * debian/patches/01_build_fix.diff, debian/patches/series
+ - Patch to fix a compilation error.
+ * debian/README.source - Add to comply with policy.
+ * Closes: #543103
+
+ -- Onkar Shinde <onkarshi...@ubuntu.com> Sat, 30 Jan 2010 18:26:05 +0530
+
maven-embedder (2.0.4-1) unstable; urgency=low
* Initial release (Closes: #508525)
Modified: trunk/maven-embedder/debian/control
===================================================================
--- trunk/maven-embedder/debian/control 2010-02-07 19:41:04 UTC (rev 11532)
+++ trunk/maven-embedder/debian/control 2010-02-07 19:45:12 UTC (rev 11533)
@@ -1,14 +1,15 @@
Source: maven-embedder
-Section: devel
+Section: java
Priority: optional
Maintainer: Ludovic Claude <ludovic.cla...@laposte.net>
-Standards-Version: 3.8.0
-Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, maven2,
maven-ant-helper,
+Standards-Version: 3.8.4
+Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven2,
maven-ant-helper,
libclassworlds-java, libplexus-container-default-java
+Build-Depends-Indep: libmaven2-core-java, maven-repo-helper
Package: libmaven-embedder-java
Architecture: all
-Depends: maven2
+Depends: ${misc:Depends}, maven2, libmaven2-core-java, libclassworlds-java,
libplexus-container-default-java
Description: Maven Embedder
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,
Added: trunk/maven-embedder/debian/libmaven-embedder-java.poms
===================================================================
--- trunk/maven-embedder/debian/libmaven-embedder-java.poms
(rev 0)
+++ trunk/maven-embedder/debian/libmaven-embedder-java.poms 2010-02-07
19:45:12 UTC (rev 11533)
@@ -0,0 +1 @@
+debian/poms/maven-embedder.xml
Added: trunk/maven-embedder/debian/patches/01_build_fix.diff
===================================================================
--- trunk/maven-embedder/debian/patches/01_build_fix.diff
(rev 0)
+++ trunk/maven-embedder/debian/patches/01_build_fix.diff 2010-02-07
19:45:12 UTC (rev 11533)
@@ -0,0 +1,30 @@
+Index:
maven-embedder-2.0.4/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
+===================================================================
+---
maven-embedder-2.0.4.orig/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
2010-02-02 23:09:04.000000000 +0530
++++
maven-embedder-2.0.4/src/main/java/org/apache/maven/embedder/MavenEmbedder.java
2010-02-02 23:29:22.000000000 +0530
+@@ -45,6 +45,7 @@
+ import org.apache.maven.project.DuplicateProjectException;
+ import org.apache.maven.project.MavenProject;
+ import org.apache.maven.project.MavenProjectBuilder;
++import org.apache.maven.project.MissingProjectException;
+ import org.apache.maven.project.ProjectBuildingException;
+ import org.apache.maven.settings.MavenSettingsBuilder;
+ import org.apache.maven.settings.RuntimeInfo;
+@@ -377,7 +378,7 @@
+ TransferListener transferListener,
+ Properties properties,
+ File executionRootDirectory )
+- throws CycleDetectedException, LifecycleExecutionException,
BuildFailureException, DuplicateProjectException
++ throws CycleDetectedException, LifecycleExecutionException,
BuildFailureException, DuplicateProjectException, MissingProjectException
+ {
+ execute( Collections.singletonList( project ), goals, eventMonitor,
transferListener, properties, executionRootDirectory );
+ }
+@@ -388,7 +389,7 @@
+ TransferListener transferListener,
+ Properties properties,
+ File executionRootDirectory )
+- throws CycleDetectedException, LifecycleExecutionException,
BuildFailureException, DuplicateProjectException
++ throws CycleDetectedException, LifecycleExecutionException,
BuildFailureException, DuplicateProjectException, MissingProjectException
+ {
+ ReactorManager rm = new ReactorManager( projects );
+
Added: trunk/maven-embedder/debian/patches/series
===================================================================
--- trunk/maven-embedder/debian/patches/series (rev 0)
+++ trunk/maven-embedder/debian/patches/series 2010-02-07 19:45:12 UTC (rev
11533)
@@ -0,0 +1 @@
+01_build_fix.diff
Added: trunk/maven-embedder/debian/poms/maven-embedder.xml
===================================================================
--- trunk/maven-embedder/debian/poms/maven-embedder.xml
(rev 0)
+++ trunk/maven-embedder/debian/poms/maven-embedder.xml 2010-02-07 19:45:12 UTC
(rev 11533)
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>maven</artifactId>
+ <groupId>org.apache.maven</groupId>
+ <version>2.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-embedder</artifactId>
+ <name>Maven Embedder</name>
+ <version>2.0.4</version>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ </dependencies>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-pmd-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+ <distributionManagement>
+ <status>deployed</status>
+ </distributionManagement>
+ <properties>
+ <mavenVersion>2.0.4</mavenVersion>
+ </properties>
+</project>
\ No newline at end of file
Modified: trunk/maven-embedder/debian/rules
===================================================================
--- trunk/maven-embedder/debian/rules 2010-02-07 19:41:04 UTC (rev 11532)
+++ trunk/maven-embedder/debian/rules 2010-02-07 19:45:12 UTC (rev 11533)
@@ -2,20 +2,27 @@
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
+POM_VERSION := 2.0.4
+MAVEN_REPO :=
http://repository.sonatype.org/service/local/repositories/central/content
+
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := maven2 wagon-provider-api plexus-utils
plexus-container-default classworlds
+DEB_JARS := maven-artifact maven-artifact-manager maven-core
maven-model maven-monitor maven-plugin-api maven-plugin-descriptor
maven-profile maven-project maven-settings maven2 wagon-provider-api
plexus-utils plexus-container-default-alpha classworlds
DEB_ANT_BUILD_TARGET := package #javadoc
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
API_DOCS := target/api
get-orig-source:
uscan --force-download --upstream-version $(VERSION)
-binary-post-install/lib$(PACKAGE)-java::
- dh_install -plib$(PACKAGE)-java target/$(PACKAGE)-$(VERSION).jar
/usr/share/java
- dh_link -plib$(PACKAGE)-java /usr/share/java/$(PACKAGE)-$(VERSION).jar
/usr/share/java/$(PACKAGE).jar
+install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l debian/poms/$(PACKAGE).xml
target/$(PACKAGE)-$(VERSION).jar
+get-orig-pom:
+ mkdir -p debian/poms
+ wget -O debian/poms/$(PACKAGE).xml
$(MAVEN_REPO)/org/apache/maven/$(PACKAGE)/$(POM_VERSION)/$(PACKAGE)-$(POM_VERSION).pom
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
