This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-cdc.
commit cec71634f232bcd241fb6c307f7459f0aff91ab9 Author: Torsten Werner <[email protected]> Date: Wed Dec 10 15:04:19 2008 +0000 package builds now --- debian/maven.mk | 2 +- debian/patches/pom.diff | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 6 +--- 4 files changed, 83 insertions(+), 6 deletions(-) diff --git a/debian/maven.mk b/debian/maven.mk index 712c9e7..0cacbb0 100644 --- a/debian/maven.mk +++ b/debian/maven.mk @@ -50,7 +50,7 @@ debian/stamp-maven-build: $(DEB_MAVEN_INVOKE) $(DEB_MAVEN_BUILD_TARGET) touch $@ -clean:: maven-sanity-check +cleanbuilddir:: maven-sanity-check apply-patches -$(DEB_MAVEN_INVOKE) $(DEB_MAVEN_CLEAN_TARGET) $(RM) debian/stamp-maven-build diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff new file mode 100644 index 0000000..e529cbb --- /dev/null +++ b/debian/patches/pom.diff @@ -0,0 +1,80 @@ +Index: plexus-cdc-1.0~alpha14/pom.xml +=================================================================== +--- plexus-cdc-1.0~alpha14.orig/pom.xml 2008-12-10 15:50:22.000000000 +0100 ++++ plexus-cdc-1.0~alpha14/pom.xml 2008-12-08 12:24:07.000000000 +0100 +@@ -6,13 +6,16 @@ + + <modelVersion>4.0.0</modelVersion> + ++ <!-- + <parent> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-tools</artifactId> + <version>1.0.11</version> + </parent> ++ --> + + <artifactId>plexus-cdc</artifactId> ++ <groupId>org.codehaus.plexus</groupId> + <name>Plexus Component Descriptor Creator</name> + <version>1.0-alpha-14</version> + +@@ -21,6 +24,8 @@ + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.4.3</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/slf4j-api.jar</systemPath> + </dependency> + <!-- + NOTE: When QDox 1.7 is fuly cooked should update this and consider using it to provide source-level +@@ -36,12 +41,30 @@ + <groupId>com.thoughtworks.qdox</groupId> + <artifactId>qdox</artifactId> + <version>1.6.3</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/qdox.jar</systemPath> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.0</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/jdom1.jar</systemPath> + </dependency> ++ <dependency> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-utils</artifactId> ++ <version>1.5.6</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/plexus-utils.jar</systemPath> ++ </dependency> ++ <dependency> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-container-default</artifactId> ++ <version>1.0-alpha-9-stable-1</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/plexus-container-default.jar</systemPath> ++ </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> +@@ -50,6 +73,18 @@ + </dependency> + </dependencies> + ++ <build> ++ <pluginManagement> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-resources-plugin</artifactId> ++ <version>2.3</version> ++ </plugin> ++ </plugins> ++ </pluginManagement> ++ </build> ++ + <scm> + <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1.0.11/plexus-cdc</connection> + <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-tools/tags/plexus-tools-1.0.11/plexus-cdc</developerConnection> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7740e23 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +pom.diff diff --git a/debian/rules b/debian/rules index 7280c82..90b2672 100755 --- a/debian/rules +++ b/debian/rules @@ -8,10 +8,6 @@ PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g" | sed 's,~alpha,-alpha-,') JAVA_HOME := /usr/lib/jvm/java-6-openjdk DEB_JARS := plexus-utils plexus-interpolation -#DEB_ANT_BUILD_TARGET := package #javadoc -#DEB_ANT_BUILDFILE := debian/build.xml -#DEB_ANT_ARGS := -Dversion=$(VERSION) -API_DOCS := build/api get-orig-source: sh -e debian/orig-tar.sh @@ -20,6 +16,6 @@ REPO := /usr/share/maven-repo DEST := $(REPO)/org/codehaus/plexus binary-post-install/lib$(PACKAGE)-java:: - dh_install build/*.jar $(DEST)/$(PACKAGE)/$(VERSION)/ + 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 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-cdc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
