[sisu-guice] 02/02: Prepare for upload 3.2.5

[Eugene Zhukov]

This is an automated email from the git hooks/post-receive script.

eugene-guest pushed a commit to branch master
in repository sisu-guice.

commit e5bba7bc5f308ffdca743c82bb730d5c2a0ec6f3
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Wed Jan 28 15:57:05 2015 +0000

    Prepare for upload 3.2.5
---
 debian/changelog                 |  7 +++++++
 debian/maven.rules               |  6 ++++--
 debian/patches/allow_maven2.diff | 24 ++++++++++++------------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 974219f..42140ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sisu-guice (3.2.5-1) experimental; urgency=medium
+
+  * New upstream release.
+  * Refreshed allow_maven2.diff patch.
+
+ -- Eugene Zhukov <jevgeni.zh at gmail.com>  Wed, 28 Jan 2015 14:22:08 +0000
+
 sisu-guice (3.2.4-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/maven.rules b/debian/maven.rules
index 162ee19..b067060 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,9 +1,9 @@
 
-cglib cglib * s/.*/3.x/ * *
 com.google.guava guava bundle s/.*/debian/ * *
 com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/ * *
 junit junit jar s/4\..*/4.x/ * *
+org.ow2.asm asm jar s/.*/4.x/ * *
 org.sonatype.sisu sisu-guice jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-assistedinject jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-extensions pom s/.*/debian/ * *
@@ -17,9 +17,11 @@ org.sonatype.sisu.inject guice-servlet jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-spring jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-struts2 jar s/.*/debian/ * *
 org.sonatype.sisu.inject guice-throwingproviders jar s/.*/debian/ * *
+cglib cglib * s/.*/3.x/ * *
 s/easymock/org.easymock/ easymock * s/.*/debian/ * *
+cglib * * s/3\..*/3.x/ * *
+org.ow2.asm * * s/.*/4.x/ * *
 org.springframework * * s/3\..*/3.x/ * *
 s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
 s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
-org.ow2.asm asm jar s/.*/4.x/ * *
 s/org.sonatype.sisu/com.google.guava/ s/sisu-guava/guava/ jar s/.*/debian/ * *
diff --git a/debian/patches/allow_maven2.diff b/debian/patches/allow_maven2.diff
index 396aa35..1ad8ed6 100644
--- a/debian/patches/allow_maven2.diff
+++ b/debian/patches/allow_maven2.diff
@@ -1,16 +1,16 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -89,11 +89,11 @@
-     <module>core</module>
-     <module>extensions</module>
+Description: Allow building with maven 2
+
+--- sisu-guice-3.2.5.orig/pom.xml
++++ sisu-guice-3.2.5/pom.xml
+@@ -92,9 +92,9 @@ See the Apache License Version 2.0 for t
+     <!-- jdk8-tests module activated only when running under JDK8, below -->
    </modules>
--
-+<!--
-   <prerequisites>
+ 
+-  <prerequisites>
++  <!--prerequisites>
      <maven>3.0</maven>
-   </prerequisites>
--
-+-->
+-  </prerequisites>
++  </prerequisites-->
+ 
    <properties>
      <!--
-      | The spec version of the public Guice API

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sisu-guice.git