Author: drazzib Date: 2009-10-08 20:22:42 +0000 (Thu, 08 Oct 2009) New Revision: 10786
Removed: trunk/libhibernate3-java/debian/patches/asm.diff trunk/libhibernate3-java/debian/patches/cglib.diff Modified: trunk/libhibernate3-java/debian/changelog trunk/libhibernate3-java/debian/compat trunk/libhibernate3-java/debian/control trunk/libhibernate3-java/debian/patches/series trunk/libhibernate3-java/debian/rules Log: * New upstream release. - Drop asm.diff and cglib.diff: merged upstream * Update my email address * Build-Depends on debhelper (>= 7) * Build-Depends on libcglib-java instead of libcglib2.1-java - libcglib-java now provide cglib 2.2 * Build-Depends on libasm3-java instead of libasm-java Modified: trunk/libhibernate3-java/debian/changelog =================================================================== --- trunk/libhibernate3-java/debian/changelog 2009-10-08 19:35:57 UTC (rev 10785) +++ trunk/libhibernate3-java/debian/changelog 2009-10-08 20:22:42 UTC (rev 10786) @@ -1,3 +1,15 @@ +libhibernate3-java (3.3.2.GA-1) unstable; urgency=low + + * New upstream release. + - Drop asm.diff and cglib.diff: merged upstream + * Update my email address + * Build-Depends on debhelper (>= 7) + * Build-Depends on libcglib-java instead of libcglib2.1-java + - libcglib-java now provide cglib 2.2 + * Build-Depends on libasm3-java instead of libasm-java + + -- Damien Raude-Morvan <[email protected]> Thu, 08 Oct 2009 22:21:14 +0200 + libhibernate3-java (3.3.1.GA+dak1-5) unstable; urgency=low * Fix the installation of the jar file. (Closes: #545643) Modified: trunk/libhibernate3-java/debian/compat =================================================================== --- trunk/libhibernate3-java/debian/compat 2009-10-08 19:35:57 UTC (rev 10785) +++ trunk/libhibernate3-java/debian/compat 2009-10-08 20:22:42 UTC (rev 10786) @@ -1 +1 @@ -5 +7 Modified: trunk/libhibernate3-java/debian/control =================================================================== --- trunk/libhibernate3-java/debian/control 2009-10-08 19:35:57 UTC (rev 10785) +++ trunk/libhibernate3-java/debian/control 2009-10-08 20:22:42 UTC (rev 10786) @@ -3,10 +3,10 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Varun Hiremath <[email protected]>, - Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, quilt, java-gcj-compat-dev, ant + Damien Raude-Morvan <[email protected]> +Build-Depends: debhelper (>= 7), cdbs, quilt, java-gcj-compat-dev, ant Build-Depends-Indep: ant-optional, antlr, glassfish-javaee, - junit, libasm-java, libcglib2.1-java, libcommons-collections3-java, + junit, libasm3-java, libcglib-java, libcommons-collections3-java, libcommons-logging-java, libc3p0-java, libdom4j-java, libehcache-java, libjavassist-java, liboscache-java, libproxool-java, libswarmcache-java, libjboss-jmx-java, libjboss-system-java, libjboss-cache1-java, @@ -19,7 +19,7 @@ Package: libhibernate3-java Architecture: all Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless, antlr, glassfish-javaee, - junit, libasm-java, libcglib2.1-java, libcommons-collections3-java, + junit, libasm3-java, libcglib-java, libcommons-collections3-java, libcommons-logging-java, libc3p0-java, libdom4j-java, libehcache-java, libjavassist-java, liboscache-java, libproxool-java, libswarmcache-java, libjboss-jmx-java, libjboss-system-java, libjboss-cache1-java, libslf4j-java Deleted: trunk/libhibernate3-java/debian/patches/asm.diff =================================================================== --- trunk/libhibernate3-java/debian/patches/asm.diff 2009-10-08 19:35:57 UTC (rev 10785) +++ trunk/libhibernate3-java/debian/patches/asm.diff 2009-10-08 20:22:42 UTC (rev 10786) @@ -1,34 +0,0 @@ -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:34:59.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:35:44.000000000 +0100 -@@ -43,11 +43,11 @@ - import org.hibernate.bytecode.util.FieldFilter; - import org.hibernate.bytecode.util.ClassFilter; - import org.hibernate.HibernateException; --import net.sf.cglib.asm.Attribute; --import net.sf.cglib.asm.Type; --import net.sf.cglib.asm.ClassReader; --import net.sf.cglib.asm.ClassWriter; --import net.sf.cglib.asm.attrs.Attributes; -+import org.objectweb.asm.Attribute; -+import org.objectweb.asm.Type; -+import org.objectweb.asm.ClassReader; -+import org.objectweb.asm.ClassWriter; -+import org.objectweb.asm.attrs.Attributes; - - /** - * Enhance the classes allowing them to implements InterceptFieldEnabled -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:35:47.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:35:52.000000000 +0100 -@@ -29,7 +29,7 @@ - import org.hibernate.bytecode.cglib.BytecodeProviderImpl; - import org.hibernate.bytecode.ClassTransformer; - import org.hibernate.tool.instrument.BasicInstrumentationTask; --import net.sf.cglib.asm.ClassReader; -+import org.objectweb.asm.ClassReader; - - import java.io.ByteArrayInputStream; - Deleted: trunk/libhibernate3-java/debian/patches/cglib.diff =================================================================== --- trunk/libhibernate3-java/debian/patches/cglib.diff 2009-10-08 19:35:57 UTC (rev 10785) +++ trunk/libhibernate3-java/debian/patches/cglib.diff 2009-10-08 20:22:42 UTC (rev 10786) @@ -1,218 +0,0 @@ -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2008-11-09 20:20:12.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/AccessOptimizerAdapter.java 2008-11-09 20:20:18.000000000 +0100 -@@ -26,8 +26,8 @@ - - import org.hibernate.bytecode.ReflectionOptimizer; - import org.hibernate.PropertyAccessException; --import org.hibernate.repackage.cglib.beans.BulkBean; --import org.hibernate.repackage.cglib.beans.BulkBeanException; -+import net.sf.cglib.beans.BulkBean; -+import net.sf.cglib.beans.BulkBeanException; - - import java.io.Serializable; - import java.io.ObjectOutputStream; -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2008-11-09 20:19:56.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/BytecodeProviderImpl.java 2008-11-09 20:20:00.000000000 +0100 -@@ -26,9 +26,9 @@ - - import java.lang.reflect.Modifier; - --import org.hibernate.repackage.cglib.beans.BulkBean; --import org.hibernate.repackage.cglib.beans.BulkBeanException; --import org.hibernate.repackage.cglib.reflect.FastClass; -+import net.sf.cglib.beans.BulkBean; -+import net.sf.cglib.beans.BulkBeanException; -+import net.sf.cglib.reflect.FastClass; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; - import org.hibernate.bytecode.BytecodeProvider; -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:20:03.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/CglibClassTransformer.java 2008-11-09 20:20:10.000000000 +0100 -@@ -29,25 +29,25 @@ - import java.io.IOException; - import java.io.ByteArrayOutputStream; - --import org.hibernate.repackage.cglib.transform.ClassTransformer; --import org.hibernate.repackage.cglib.transform.TransformingClassGenerator; --import org.hibernate.repackage.cglib.transform.ClassReaderGenerator; --import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled; --import org.hibernate.repackage.cglib.transform.impl.InterceptFieldFilter; --import org.hibernate.repackage.cglib.transform.impl.InterceptFieldTransformer; --import org.hibernate.repackage.cglib.core.ClassNameReader; --import org.hibernate.repackage.cglib.core.DebuggingClassWriter; -+import net.sf.cglib.transform.ClassTransformer; -+import net.sf.cglib.transform.TransformingClassGenerator; -+import net.sf.cglib.transform.ClassReaderGenerator; -+import net.sf.cglib.transform.impl.InterceptFieldEnabled; -+import net.sf.cglib.transform.impl.InterceptFieldFilter; -+import net.sf.cglib.transform.impl.InterceptFieldTransformer; -+import net.sf.cglib.core.ClassNameReader; -+import net.sf.cglib.core.DebuggingClassWriter; - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; - import org.hibernate.bytecode.AbstractClassTransformerImpl; - import org.hibernate.bytecode.util.FieldFilter; - import org.hibernate.bytecode.util.ClassFilter; - import org.hibernate.HibernateException; --import org.hibernate.repackage.cglib.asm.Attribute; --import org.hibernate.repackage.cglib.asm.Type; --import org.hibernate.repackage.cglib.asm.ClassReader; --import org.hibernate.repackage.cglib.asm.ClassWriter; --import org.hibernate.repackage.cglib.asm.attrs.Attributes; -+import net.sf.cglib.asm.Attribute; -+import net.sf.cglib.asm.Type; -+import net.sf.cglib.asm.ClassReader; -+import net.sf.cglib.asm.ClassWriter; -+import net.sf.cglib.asm.attrs.Attributes; - - /** - * Enhance the classes allowing them to implements InterceptFieldEnabled -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2008-11-09 20:19:18.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/InstantiationOptimizerAdapter.java 2008-11-09 20:19:31.000000000 +0100 -@@ -25,7 +25,7 @@ - package org.hibernate.bytecode.cglib; - - import org.hibernate.bytecode.ReflectionOptimizer; --import org.hibernate.repackage.cglib.reflect.FastClass; -+import net.sf.cglib.reflect.FastClass; - import org.hibernate.InstantiationException; - - import java.io.Serializable; -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2008-11-09 20:19:46.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/bytecode/cglib/ProxyFactoryFactoryImpl.java 2008-11-09 20:19:53.000000000 +0100 -@@ -30,13 +30,13 @@ - import org.hibernate.proxy.pojo.cglib.CGLIBProxyFactory; - import org.hibernate.AssertionFailure; - import org.hibernate.HibernateException; --import org.hibernate.repackage.cglib.proxy.Enhancer; --import org.hibernate.repackage.cglib.proxy.CallbackFilter; --import org.hibernate.repackage.cglib.proxy.MethodInterceptor; --import org.hibernate.repackage.cglib.proxy.MethodProxy; --import org.hibernate.repackage.cglib.proxy.NoOp; --import org.hibernate.repackage.cglib.proxy.Callback; --import org.hibernate.repackage.cglib.proxy.Factory; -+import net.sf.cglib.proxy.Enhancer; -+import net.sf.cglib.proxy.CallbackFilter; -+import net.sf.cglib.proxy.MethodInterceptor; -+import net.sf.cglib.proxy.MethodProxy; -+import net.sf.cglib.proxy.NoOp; -+import net.sf.cglib.proxy.Callback; -+import net.sf.cglib.proxy.Factory; - - import java.lang.reflect.Method; - import java.util.HashMap; -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java 2008-11-09 20:20:21.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/FieldInterceptionHelper.java 2008-11-09 20:20:33.000000000 +0100 -@@ -50,7 +50,7 @@ - public static boolean isInstrumented(Class entityClass) { - Class[] definedInterfaces = entityClass.getInterfaces(); - for ( int i = 0; i < definedInterfaces.length; i++ ) { -- if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) -+ if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) - || "org.hibernate.bytecode.javassist.FieldHandled".equals( definedInterfaces[i].getName() ) ) { - return true; - } -@@ -68,7 +68,7 @@ - } - Class[] definedInterfaces = entity.getClass().getInterfaces(); - for ( int i = 0; i < definedInterfaces.length; i++ ) { -- if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { -+ if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { - // we have a CGLIB enhanced entity - return CGLIBHelper.extractFieldInterceptor( entity ); - } -@@ -88,7 +88,7 @@ - if ( entity != null ) { - Class[] definedInterfaces = entity.getClass().getInterfaces(); - for ( int i = 0; i < definedInterfaces.length; i++ ) { -- if ( "org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { -+ if ( "net.sf.cglib.transform.impl.InterceptFieldEnabled".equals( definedInterfaces[i].getName() ) ) { - // we have a CGLIB enhanced entity - return CGLIBHelper.injectFieldInterceptor( entity, entityName, uninitializedFieldNames, session ); - } -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java 2008-11-09 20:20:42.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/CGLIBHelper.java 2008-11-09 20:20:50.000000000 +0100 -@@ -26,7 +26,7 @@ - - import org.hibernate.intercept.FieldInterceptor; - import org.hibernate.engine.SessionImplementor; --import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled; -+import net.sf.cglib.transform.impl.InterceptFieldEnabled; - - import java.util.Set; - -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java 2008-11-09 20:20:36.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/intercept/cglib/FieldInterceptorImpl.java 2008-11-09 20:20:40.000000000 +0100 -@@ -27,7 +27,7 @@ - import java.io.Serializable; - import java.util.Set; - --import org.hibernate.repackage.cglib.transform.impl.InterceptFieldCallback; -+import net.sf.cglib.transform.impl.InterceptFieldCallback; - - import org.hibernate.intercept.AbstractFieldInterceptor; - import org.hibernate.engine.SessionImplementor; -@@ -167,4 +167,4 @@ - ')'; - } - --} -\ No newline at end of file -+} -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2008-11-09 20:20:53.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/proxy/pojo/cglib/CGLIBLazyInitializer.java 2008-11-09 20:21:00.000000000 +0100 -@@ -28,11 +28,11 @@ - import java.lang.reflect.InvocationTargetException; - import java.lang.reflect.Method; - --import org.hibernate.repackage.cglib.proxy.Callback; --import org.hibernate.repackage.cglib.proxy.CallbackFilter; --import org.hibernate.repackage.cglib.proxy.Enhancer; --import org.hibernate.repackage.cglib.proxy.InvocationHandler; --import org.hibernate.repackage.cglib.proxy.NoOp; -+import net.sf.cglib.proxy.Callback; -+import net.sf.cglib.proxy.CallbackFilter; -+import net.sf.cglib.proxy.Enhancer; -+import net.sf.cglib.proxy.InvocationHandler; -+import net.sf.cglib.proxy.NoOp; - - import org.hibernate.HibernateException; - import org.hibernate.LazyInitializationException; -Index: libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java -=================================================================== ---- libhibernate3-java-3.3.1.GA.orig/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:18:35.000000000 +0100 -+++ libhibernate3-java-3.3.1.GA/project/core/src/main/java/org/hibernate/tool/instrument/cglib/InstrumentTask.java 2008-11-09 20:19:44.000000000 +0100 -@@ -29,12 +29,12 @@ - import org.hibernate.bytecode.cglib.BytecodeProviderImpl; - import org.hibernate.bytecode.ClassTransformer; - import org.hibernate.tool.instrument.BasicInstrumentationTask; --import org.hibernate.repackage.cglib.asm.ClassReader; -+import net.sf.cglib.asm.ClassReader; - - import java.io.ByteArrayInputStream; - --import org.hibernate.repackage.cglib.core.ClassNameReader; --import org.hibernate.repackage.cglib.transform.impl.InterceptFieldEnabled; -+import net.sf.cglib.core.ClassNameReader; -+import net.sf.cglib.transform.impl.InterceptFieldEnabled; - - /** - * An Ant task for instrumenting persistent classes in order to enable Modified: trunk/libhibernate3-java/debian/patches/series =================================================================== --- trunk/libhibernate3-java/debian/patches/series 2009-10-08 19:35:57 UTC (rev 10785) +++ trunk/libhibernate3-java/debian/patches/series 2009-10-08 20:22:42 UTC (rev 10786) @@ -1,2 +1,2 @@ -cglib.diff -asm.diff + + Modified: trunk/libhibernate3-java/debian/rules =================================================================== --- trunk/libhibernate3-java/debian/rules 2009-10-08 19:35:57 UTC (rev 10785) +++ trunk/libhibernate3-java/debian/rules 2009-10-08 20:22:42 UTC (rev 10786) @@ -7,7 +7,7 @@ JAVA_HOME := /usr/lib/jvm/java-gcj DEB_ANT_BUILDFILE := debian/build.xml DEB_ANT_BUILD_TARGET := jar javadoc -DEB_JARS := ant-antlr ant-junit antlr asm asm-attrs ehcache cglib commons-collections3 \ +DEB_JARS := ant-antlr ant-junit antlr asm3 asm3-attrs ehcache cglib commons-collections3 \ commons-logging c3p0 dom4j javassist jboss-system jboss-jmx \ glassfish-javaee junit oscache proxool swarmcache slf4j-api \ jgroups-all _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
