[shiro] 02/06: Removed the dependency on libguava-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository shiro.

commit 646d4aa06b4a28b8f364afb6bf491b98b82db298
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jul 20 15:27:44 2015 +0200

    Removed the dependency on libguava-java
---
 debian/changelog   | 7 +++++++
 debian/control     | 1 -
 debian/maven.rules | 2 --
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 90cf0ed..ecf2091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+shiro (1.2.4-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+    - Removed the dependency on libguava-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 20 Jul 2015 15:27:06 +0200
+
 shiro (1.2.3-1) unstable; urgency=low
 
   * Initial release (Closes: #726534)
diff --git a/debian/control b/debian/control
index ae11cee..d06a065 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends-Indep: libaspectj-java,
                      libcommons-cli-java,
                      libehcache-java,
                      libjstl1.1-java,
-                     libguava-java,
                      libguice-java (>= 3.0-6~),
                      libhsqldb-java,
                      liblog4j1.2-java,
diff --git a/debian/maven.rules b/debian/maven.rules
index f0f92e6..3abfa31 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -2,8 +2,6 @@
 s/aspectj/org.aspectj/ aspectjrt jar s/.*/debian/ * *
 s/aspectj/org.aspectj/ aspectjtools jar s/.*/debian/ * *
 s/aspectj/org.aspectj/ aspectjweaver jar s/.*/debian/ * *
-com.google.guava guava bundle s/.*/debian/ * *
-com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
 commons-beanutils commons-beanutils jar s/.*/debian/ * *
 javax.servlet jstl jar s/.*/1.1/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *

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