[libhibernate3-java] 01/03: Depend on libcglib3-java instead of libcglib-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 libhibernate3-java.

commit 36f90eff621fc4d59e7ae7431b66fa3390114ca1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 5 00:48:08 2014 +0200

    Depend on libcglib3-java instead of libcglib-java
---
 debian/changelog                               |  6 ++++++
 debian/control                                 |  4 ++--
 debian/maven.rules                             |  1 +
 debian/patches/0004-cglib3-compatibility.patch | 14 ++++++++++++++
 debian/patches/series                          |  1 +
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7cd39a7..983e38c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libhibernate3-java (3.6.10.Final-3) UNRELEASED; urgency=medium
+
+  * Depend on libcglib3-java instead of libcglib-java
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 05 Oct 2014 00:47:44 +0200
+
 libhibernate3-java (3.6.10.Final-2) unstable; urgency=low
 
   * Use canonical URLs for the Vcs-* fields
diff --git a/debian/control b/debian/control
index 98d25a7..153732c 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends-Indep: glassfish-javaee, libc3p0-java, libehcache-java,
  liboscache-java, libproxool-java, libswarmcache-java,
  libmaven-enforcer-plugin-java, libhsqldb-java, libcommons-logging-java,
  libantlr-maven-plugin-java, libgeronimo-jacc-1.1-spec-java, libdom4j-java,
- libjavassist-java, libantlr-java, ant, libcglib-java, libjgroups-java,
+ libjavassist-java, libantlr-java, ant, libcglib3-java, libjgroups-java,
  libhibernate3-java, libmaven-javadoc-plugin-java,
  libgeronimo-jpa-2.0-spec-java, libmaven-install-plugin-java,
  libgeronimo-validation-1.0-spec-java, libhibernate-commons-annotations-java,
@@ -24,7 +24,7 @@ Package: libhibernate3-java
 Architecture: all
 Depends: ${misc:Depends}, libhibernate-commons-annotations-java, libdom4j-java,
  libslf4j-java
-Recommends: libcglib-java | libjavassist-java
+Recommends: libcglib3-java | libjavassist-java
 Conflicts: libhibernate-entitymanager-java
 Provides: libhibernate-annotations-java, libhibernate-entitymanager-java
 Replaces: libhibernate-annotations-java, libhibernate-entitymanager-java
diff --git a/debian/maven.rules b/debian/maven.rules
index 451e7af..1fd8d7e 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -26,3 +26,4 @@ s/org.jboss.javaee/org.apache.geronimo.specs/ s/jboss-jacc-api_JDK4/geronimo-jac
 s/org.hibernate.javax.persistence/org.apache.geronimo.specs/ s/hibernate-jpa-2.0-api/geronimo-jpa_2.0_spec/ jar s/.*/debian/
 s/javax.validation/org.apache.geronimo.specs/ s/validation-api/geronimo-validation_1.0_spec/ jar s/.*/debian/
 net.sf.ehcache s/ehcache/ehcache-core/ jar s/.*/debian/
+cglib cglib * s/.*/3.x/ * *
diff --git a/debian/patches/0004-cglib3-compatibility.patch b/debian/patches/0004-cglib3-compatibility.patch
new file mode 100644
index 0000000..a82bf21
--- /dev/null
+++ b/debian/patches/0004-cglib3-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Fix the compatibility with CGLIB 3
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/project/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java
++++ b/project/hibernate-core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java
+@@ -80,7 +80,7 @@
+ 		}
+ 
+ 		String[] names = ClassNameReader.getClassInfo( reader );
+-		ClassWriter w = new DebuggingClassWriter( ClassWriter.COMPUTE_MAXS  );
++		DebuggingClassWriter w = new DebuggingClassWriter( ClassWriter.COMPUTE_MAXS  );
+ 		ClassTransformer t = getClassTransformer( names );
+ 		if ( t != null ) {
+ 			if ( log.isDebugEnabled() ) {
diff --git a/debian/patches/series b/debian/patches/series
index c3802f3..a94ec8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-disable-modules-that-do-not-build-yet.patch
 0002-disable-tests-for-entitymanager.patch
 0003-fix-up-jdbc4-testing.patch
+0004-cglib3-compatibility.patch

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