[spock] 05/06: Depend on libcglib-nodep-java instead of libcglib3-java

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue May 10 20:01:58 UTC 2016


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

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

commit 11bfe1d6cd78aeee11623efb4a54419f0f0a45fe
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 10 21:56:45 2016 +0200

    Depend on libcglib-nodep-java instead of libcglib3-java
---
 debian/build.xml | 4 ++--
 debian/changelog | 1 +
 debian/control   | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 808da7b..9d0c672 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -30,7 +30,7 @@ http://pkgs.fedoraproject.org/cgit/spock.git/
     <path refid="groovyc.classpath"/>
     <pathelement location="${core.build.dir}/**"/>
     <fileset dir="/usr/share/java" includes="ant.jar"/>
-    <fileset dir="/usr/share/java" includes="cglib3.jar"/>
+    <fileset dir="/usr/share/java" includes="cglib-nodep.jar"/>
     <fileset dir="/usr/share/java" includes="hamcrest-core.jar"/>
     <fileset dir="/usr/share/java" includes="hamcrest-library.jar"/>
     <fileset dir="/usr/share/java" includes="junit4.jar"/>
@@ -51,7 +51,7 @@ http://pkgs.fedoraproject.org/cgit/spock.git/
     <fileset dir="${guice.dir}/build/libs" includes="spock-guice-${impl.version}.jar"/>
     <fileset dir="/usr/share/java" includes="ant.jar"/>
     <fileset dir="/usr/share/java" includes="aopalliance.jar"/>
-    <fileset dir="/usr/share/java" includes="cglib3.jar"/>
+    <fileset dir="/usr/share/java" includes="cglib-nodep.jar"/>
     <fileset dir="/usr/share/java" includes="guice.jar"/>
     <fileset dir="/usr/share/java" includes="hamcrest-core.jar"/>
     <fileset dir="/usr/share/java" includes="hamcrest-library.jar"/>
diff --git a/debian/changelog b/debian/changelog
index bee4a0d..3c98dfb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ spock (0.7-groovy-2.0-2) UNRELEASED; urgency=medium
   * Team upload.
   * Depend on groovy instead of groovy2
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
+  * Depend on libcglib-nodep-java instead of libcglib3-java
   * Standards-Version updated to 3.9.8 (no changes)
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index 071a088..86fd3a7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends-Indep: groovy,
                      junit4,
                      libaopalliance-java,
                      libasm-java (>= 5.0),
-                     libcglib3-java,
+                     libcglib-nodep-java,
                      libguice-java,
                      libhamcrest-java,
                      libobjenesis-java,
@@ -26,7 +26,7 @@ Depends: ant,
          junit4,
          libaopalliance-java,
          libasm-java (>= 5.0),
-         libcglib3-java,
+         libcglib-nodep-java,
          libguice-java,
          libhamcrest-java,
          libobjenesis-java,

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



More information about the pkg-java-commits mailing list