This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-resources.
commit 3d194f178264c4b02dfafe00e7cee0c6db3a4962 Author: Eugene Zhukov <[email protected]> Date: Thu May 16 11:39:28 2013 +0000 fixed patches and maven-debian-helper version --- debian/control | 2 +- .../{configs.patch => config_resources.patch} | 39 +++------------------- debian/patches/pom_fixes.patch | 37 ++++++++++++++++++++ debian/patches/series | 3 +- 4 files changed, 44 insertions(+), 37 deletions(-) diff --git a/debian/control b/debian/control index a480527..4251d97 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Eugene Zhukov <[email protected]> -Build-Depends: debhelper (>= 8), cdbs, default-jdk, maven-debian-helper (>= 1.5) +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.6.1) Build-Depends-Indep: libplexus-containers1.5-java (>= 1.5.5), libplexus-utils-java Standards-Version: 3.9.4 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-resources diff --git a/debian/patches/configs.patch b/debian/patches/config_resources.patch similarity index 71% rename from debian/patches/configs.patch rename to debian/patches/config_resources.patch index ba5140f..4a14c86 100644 --- a/debian/patches/configs.patch +++ b/debian/patches/config_resources.patch @@ -1,41 +1,10 @@ -Description: classpath and parent project config - * configuration from parent project - * adds classpath to MANIFEST.MF +Description: resource config + * resource configuration from parent project Author: Eugene Zhukov <[email protected]> -Last-Update: <2013-05-03> +Last-Update: <2013-05-16> ---- a/pom.xml -+++ b/pom.xml -@@ -30,4 +30,27 @@ - <artifactId>plexus-container-default</artifactId> - </dependency> - </dependencies> -+ -+ <build> -+ <resources> -+ <resource> -+ <directory>src/main/config</directory> -+ <targetPath>META-INF</targetPath> -+ </resource> -+ </resources> -+ <plugins> -+ <plugin> -+ <groupId>org.apache.maven.plugins</groupId> -+ <artifactId>maven-jar-plugin</artifactId> -+ <configuration> -+ <archive> -+ <manifest> -+ <addClasspath>true</addClasspath> -+ </manifest> -+ </archive> -+ </configuration> -+ <version>2.2</version> -+ </plugin> -+ </plugins> -+ </build> - </project> --- /dev/null -+++ b/src/main/config/plexus/components.xml ++++ plexus-resources-1.0~alpha7/src/main/config/plexus/components.xml @@ -0,0 +1,49 @@ +<component-set> + <components> diff --git a/debian/patches/pom_fixes.patch b/debian/patches/pom_fixes.patch new file mode 100644 index 0000000..7b1fed7 --- /dev/null +++ b/debian/patches/pom_fixes.patch @@ -0,0 +1,37 @@ +Description: classpath and parent project config + * configuration from parent project + * adds classpath to MANIFEST.MF +Author: Eugene Zhukov <[email protected]> +Last-Update: <2013-05-16> + +--- plexus-resources-1.0~alpha7.orig/pom.xml ++++ plexus-resources-1.0~alpha7/pom.xml +@@ -30,4 +30,28 @@ + <artifactId>plexus-container-default</artifactId> + </dependency> + </dependencies> ++ ++ <build> ++ <resources> ++ <resource> ++ <directory>src/main/config</directory> ++ <targetPath>META-INF</targetPath> ++ </resource> ++ </resources> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-jar-plugin</artifactId> ++ <configuration> ++ <archive> ++ <manifest> ++ <addClasspath>true</addClasspath> ++ </manifest> ++ </archive> ++ </configuration> ++ <version>2.2</version> ++ </plugin> ++ </plugins> ++ </build> ++ + </project> diff --git a/debian/patches/series b/debian/patches/series index 6cf2aed..7300937 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -configs.patch +config_resources.patch +pom_fixes.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-resources.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
