[pkg-eucalyptus-commits] r88 - in eucalyptus/trunk/debian: . patches

[Charles Plessy]

Author: plessy
Date: 2010-08-15 09:51:10 +0000 (Sun, 15 Aug 2010)
New Revision: 88

Added:
   eucalyptus/trunk/debian/README.source
   eucalyptus/trunk/debian/patches/
   eucalyptus/trunk/debian/patches/hibernate-3.5.patch
Modified:
   eucalyptus/trunk/debian/changelog
   eucalyptus/trunk/debian/control
   eucalyptus/trunk/debian/rules
Log:
Removed dependency libhibernate-entitymanager-java, not available anymore, and
applied patch from M. Landaeta to build against Hibernate 3.5.

Unfortunately, the package still fails to build with the following errors:


build-groovy:

BUILD FAILED
/build/charles-eucalyptus_1.6.2-3-amd64-E9WM98/eucalyptus-1.6.2/clc/build.xml:88: The following error occurred while executing this line:
/build/charles-eucalyptus_1.6.2-3-amd64-E9WM98/eucalyptus-1.6.2/clc/modules/module-inc.xml:132: The following error occurred while executing this line:
/build/charles-eucalyptus_1.6.2-3-amd64-E9WM98/eucalyptus-1.6.2/clc/modules/msgs/build.xml:84: The following error occurred while executing this line:
/build/charles-eucalyptus_1.6.2-3-amd64-E9WM98/eucalyptus-1.6.2/clc/modules/module-inc.xml:147: taskdef class org.codehaus.groovy.ant.Groovyc cannot be found


Added: eucalyptus/trunk/debian/README.source
===================================================================
--- eucalyptus/trunk/debian/README.source	                        (rev 0)
+++ eucalyptus/trunk/debian/README.source	2010-08-15 09:51:10 UTC (rev 88)
@@ -0,0 +1 @@
+This package uses a patch system, see ‘file:///usr/share/doc/cdbs/cdbs-doc.html#id564292’.

Modified: eucalyptus/trunk/debian/changelog
===================================================================
--- eucalyptus/trunk/debian/changelog	2010-08-01 23:29:44 UTC (rev 87)
+++ eucalyptus/trunk/debian/changelog	2010-08-15 09:51:10 UTC (rev 88)
@@ -4,6 +4,13 @@
   * Applying Dominique Belhachemi's fix of a non-working
     wildcard to the groovy-all.jar. (Closes: #589815)
 
+  [ Charles Plessy ]
+  * Build against Hibernate 3.5 (Closes: #589582).
+    Thanks to Miguel Landaeta for his patch and patience.
+  * Removed build-dependency on old Hibernate package
+    libhibernate-entitymanager-java (Closes: #593050).
+  * Use CDBS' simple-patchsys (debian/rules, debian/README.source).
+
  -- Steffen Moeller <moeller at debian.org>  Mon, 26 Jul 2010 01:36:16 +0200
 
 eucalyptus (1.6.2-2) unstable; urgency=low

Modified: eucalyptus/trunk/debian/control
===================================================================
--- eucalyptus/trunk/debian/control	2010-08-01 23:29:44 UTC (rev 87)
+++ eucalyptus/trunk/debian/control	2010-08-15 09:51:10 UTC (rev 88)
@@ -44,7 +44,7 @@
  libecj-java,
  libantlr-java,
  libspring-beans-2.5-java, libspring-context-support-2.5-java, libspring-context-2.5-java, libspring-core-2.5-java, libspring-web-2.5-java,
- libhibernate-annotations-java, libhibernate-commons-annotations-java, libhibernate-entitymanager-java, libhibernate3-java, libehcache-java 
+ libhibernate-annotations-java, libhibernate-commons-annotations-java, libhibernate3-java, libehcache-java 
 Standards-Version: 3.9.0
 Homepage: http://open.eucalyptus.com/
 
@@ -178,7 +178,7 @@
  libwoodstox-java,
  libxpp3-java,
  libspring-beans-2.5-java, libspring-context-support-2.5-java, libspring-context-2.5-java, libspring-core-2.5-java, libspring-web-2.5-java,
- libhibernate-annotations-java, libhibernate-commons-annotations-java, libhibernate-entitymanager-java, libhibernate3-java, libehcache-java
+ libhibernate-annotations-java, libhibernate-commons-annotations-java, libhibernate3-java, libehcache-java
 Replaces: eucalyptus-javadeps, eucalyptus-common, eucalyptus-cloud 
 Description: Elastic Utility Computing Architecture - Common Java package
  EUCALYPTUS is an open source service overlay that implements elastic

Added: eucalyptus/trunk/debian/patches/hibernate-3.5.patch
===================================================================
--- eucalyptus/trunk/debian/patches/hibernate-3.5.patch	                        (rev 0)
+++ eucalyptus/trunk/debian/patches/hibernate-3.5.patch	2010-08-15 09:51:10 UTC (rev 88)
@@ -0,0 +1,14 @@
+Description: To build Eucalyptus with Hibernate 3.5.
+Origin: vendor, http://bugs.debian.org/589582
+Forwarded: Chris Grzegorczyk <grze at eucalyptus.com>
+--- eucalyptus-1.6.2.orig/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMVolumeInfo.java
++++ eucalyptus-1.6.2/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMVolumeInfo.java
+@@ -70,7 +70,7 @@
+ import org.hibernate.annotations.Cache;
+ import org.hibernate.annotations.CacheConcurrencyStrategy;
+ import org.hibernate.annotations.GenericGenerator;
+-import org.hibernate.lob.SerializableBlob;
++//import org.hibernate.lob.SerializableBlob;
+ 
+ import com.eucalyptus.util.StorageProperties;
+ 

Modified: eucalyptus/trunk/debian/rules
===================================================================
--- eucalyptus/trunk/debian/rules	2010-08-01 23:29:44 UTC (rev 87)
+++ eucalyptus/trunk/debian/rules	2010-08-15 09:51:10 UTC (rev 88)
@@ -2,6 +2,7 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_DH_INSTALL_ARGS = --list-missing