[pkg-java] r18468 - trunk/easymock/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-09-29 13:11:02 +0000 (Mon, 29 Sep 2014)
New Revision: 18468

Modified:
   trunk/easymock/debian/build.xml
   trunk/easymock/debian/changelog
   trunk/easymock/debian/control
   trunk/easymock/debian/pom.xml
   trunk/easymock/debian/rules
Log:
Depend on libcglib3-java instead of libcglib-java



Modified: trunk/easymock/debian/build.xml
===================================================================
--- trunk/easymock/debian/build.xml	2014-09-29 12:46:27 UTC (rev 18467)
+++ trunk/easymock/debian/build.xml	2014-09-29 13:11:02 UTC (rev 18468)
@@ -20,8 +20,8 @@
       <pathelement location="/usr/share/java/junit4.jar"/>
       <!-- only needed for version 3.2 and later -->
       <pathelement location="/usr/share/java/objenesis.jar"/>
-      <pathelement location="/usr/share/java/cglib.jar"/>
-      <pathelement location="/usr/share/java/asm3.jar"/>
+      <pathelement location="/usr/share/java/cglib3.jar"/>
+      <pathelement location="/usr/share/java/asm4.jar"/>
   </path>
 
   <target name="init">

Modified: trunk/easymock/debian/changelog
===================================================================
--- trunk/easymock/debian/changelog	2014-09-29 12:46:27 UTC (rev 18467)
+++ trunk/easymock/debian/changelog	2014-09-29 13:11:02 UTC (rev 18468)
@@ -1,6 +1,7 @@
 easymock (3.2+ds-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Depend on libcglib3-java instead of libcglib-java
   * Standards-Version updated to 3.9.6 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 29 Sep 2014 14:46:05 +0200

Modified: trunk/easymock/debian/control
===================================================================
--- trunk/easymock/debian/control	2014-09-29 12:46:27 UTC (rev 18467)
+++ trunk/easymock/debian/control	2014-09-29 13:11:02 UTC (rev 18468)
@@ -14,7 +14,7 @@
 Build-Depends-Indep:
  default-jdk,
  junit4,
- libcglib-java,
+ libcglib3-java,
  libobjenesis-java
 Standards-Version: 3.9.6
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/easymock/

Modified: trunk/easymock/debian/pom.xml
===================================================================
--- trunk/easymock/debian/pom.xml	2014-09-29 12:46:27 UTC (rev 18467)
+++ trunk/easymock/debian/pom.xml	2014-09-29 13:11:02 UTC (rev 18468)
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-nodep</artifactId>
-      <version>2.2.2</version>
+      <version>3.1</version>
     </dependency>
     <!-- Used for class mocking -->
     <dependency>

Modified: trunk/easymock/debian/rules
===================================================================
--- trunk/easymock/debian/rules	2014-09-29 12:46:27 UTC (rev 18467)
+++ trunk/easymock/debian/rules	2014-09-29 13:11:02 UTC (rev 18468)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib.jar:/usr/share/java/junit4.jar
+export CLASSPATH=/usr/share/java/objenesis.jar:/usr/share/java/cglib3.jar:/usr/share/java/junit4.jar
 PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
 PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
 VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s*([\d\.]+)}')