[pkg-eucalyptus-commits] r175 - in eucalyptus/trunk/debian: . patches
Rudy Godoy
rudy at alioth.debian.org
Sat Oct 29 19:01:08 UTC 2011
Author: rudy
Date: 2011-10-29 19:01:08 +0000 (Sat, 29 Oct 2011)
New Revision: 175
Added:
eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch
eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch
Removed:
eucalyptus/trunk/debian/patches/hibernate-3.5.patch
Modified:
eucalyptus/trunk/debian/patches/series
eucalyptus/trunk/debian/rules
Log:
Added patch files migrated to quilt format. Removed old CDBS patches. Updated debian/rules to exclude use of simple-patchsys.mk
Added: eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch
===================================================================
--- eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch 2011-10-29 19:01:08 UTC (rev 175)
@@ -0,0 +1,11 @@
+--- a/clc/modules/core/src/main/java/edu/ucsb/eucalyptus/cloud/entities/LVMVolumeInfo.java
++++ b/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;
+
Added: eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch
===================================================================
--- eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch (rev 0)
+++ eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch 2011-10-29 19:01:08 UTC (rev 175)
@@ -0,0 +1,113 @@
+--- a/cluster/Makefile
++++ b/cluster/Makefile
+@@ -58,7 +58,7 @@
+ deploy:
+ $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
+- $(INSTALL) $(CCWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
++ $(INSTALL) -m 0644 $(CCWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
+ #no ws-sec
+ cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(CCWSDLNAME) > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
+
+@@ -69,7 +69,7 @@
+ # cp cc-client-policy.xml $(EUCALYPTUS)/var/lib/eucalyptus/keys/
+ # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
+ # ws
+- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
++ $(INSTALL) -m 0644 $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
+ # no ws
+ # cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
+
+@@ -81,7 +81,7 @@
+
+ install: deploy
+ @$(INSTALL) -m 0555 $(CLIENTKILLALL) $(DESTDIR)$(sbindir)
+- @$(INSTALL) cc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
++ @$(INSTALL) -m 0644 cc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
+
+ uninstall:
+ @$(RM) -f $(DESTDIR)$(sbindir)/$(CLIENTKILLALL)
+--- a/gatherlog/Makefile
++++ b/gatherlog/Makefile
+@@ -45,7 +45,7 @@
+ deploy:
+ $(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
+ $(INSTALL) $(SERVICE_SO) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
+- $(INSTALL) $(GLWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
++ $(INSTALL) -m 0644 $(GLWSDL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
+ #no ws-sec
+ cat generated/services.xml | ../tools/add_wsdllocation.pl $(AXIS2C_SERVICES)/$(SERVICE_NAME)/$(GLWSDLNAME) > $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml
+
+@@ -58,7 +58,7 @@
+ # ws
+ # cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
+ # no ws
+- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
++ $(INSTALL) -m 0644 $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
+
+ clean:
+ rm -f $(SERVICE_SO) *.o $(CLIENT) *~* *#*
+--- a/node/Makefile
++++ b/node/Makefile
+@@ -88,7 +88,7 @@
+ ## cp ../tools/*.pem $(EUCALYPTUS)/var/lib/eucalyptus/keys/
+ # chmod -R 0600 $(EUCALYPTUS)/var/lib/eucalyptus/keys/*
+ # ws
+- $(INSTALL) $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
++ $(INSTALL) -m 0644 $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_WS.xml $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
+ # no ws
+ # cp $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services_noWS.xml $(AXIS2C_SERVICES)/$(SERVICE_NAME)/services.xml
+
+@@ -99,7 +99,7 @@
+ rm -rf generated $(SERVICE_SO) *.o $(CLIENT) $(CLIENT)_local *~* *#*
+
+ install: deploy
+- $(INSTALL) nc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
++ $(INSTALL) -m 0644 nc-client-policy.xml $(DESTDIR)$(vardir)/lib/eucalyptus/keys/
+ $(INSTALL) -m 0755 test_nc $(DESTDIR)$(sbindir)/euca_test_nc
+
+ uninstall:
+--- a/tools/Makefile
++++ b/tools/Makefile
+@@ -42,7 +42,7 @@
+ @$(INSTALL) -m 755 euca_upgrade $(DESTDIR)$(datarootdir)/eucalyptus
+ @$(INSTALL) -m 755 populate_arp.pl $(DESTDIR)$(datarootdir)/eucalyptus
+ @$(INSTALL) -m 755 euca_conf $(DESTDIR)$(sbindir)
+- -$(INSTALL) -m 755 euca_conf.complete $(DESTDIR)/etc/bash_completion.d/euca_conf
++ -$(INSTALL) -m 644 euca_conf.complete $(DESTDIR)/etc/bash_completion.d/euca_conf
+ @$(INSTALL) -m 755 euca_sync_key $(DESTDIR)$(sbindir)
+ @$(INSTALL) -m 755 connect_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
+ @$(INSTALL) -m 755 disconnect_iscsitarget.pl $(DESTDIR)$(datarootdir)/eucalyptus
+--- a/tools/eucalyptus-cc.in
++++ b/tools/eucalyptus-cc.in
+@@ -472,7 +472,7 @@
+ fi
+ fi
+ ;;
+- restart)
++ restart|force-reload)
+ if [ "$VERBOSE" != no ]; then
+ if [ "$WE_HAVE_LSB" = "Y" ]; then
+ log_begin_msg "Restarting $DESC"
+--- a/tools/eucalyptus-cloud.in
++++ b/tools/eucalyptus-cloud.in
+@@ -400,7 +400,7 @@
+ fi
+ fi
+ ;;
+- restart)
++ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+--- a/tools/eucalyptus-nc.in
++++ b/tools/eucalyptus-nc.in
+@@ -396,7 +396,7 @@
+ fi
+ fi
+ ;;
+- restart)
++ restart|force-reload)
+ if [ "$VERBOSE" != no ]; then
+ if [ "$WE_HAVE_LSB" = "Y" ]; then
+ log_begin_msg "Restarting $DESC"
Deleted: eucalyptus/trunk/debian/patches/hibernate-3.5.patch
===================================================================
--- eucalyptus/trunk/debian/patches/hibernate-3.5.patch 2011-10-29 16:49:43 UTC (rev 174)
+++ eucalyptus/trunk/debian/patches/hibernate-3.5.patch 2011-10-29 19:01:08 UTC (rev 175)
@@ -1,14 +0,0 @@
-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/patches/series
===================================================================
--- eucalyptus/trunk/debian/patches/series 2011-10-29 16:49:43 UTC (rev 174)
+++ eucalyptus/trunk/debian/patches/series 2011-10-29 19:01:08 UTC (rev 175)
@@ -1 +1,2 @@
-hibernate-3.5.patch -p0
+002_temporary_lintian_fixes.patch
+001_hibernate-3.5.patch
Modified: eucalyptus/trunk/debian/rules
===================================================================
--- eucalyptus/trunk/debian/rules 2011-10-29 16:49:43 UTC (rev 174)
+++ eucalyptus/trunk/debian/rules 2011-10-29 19:01:08 UTC (rev 175)
@@ -2,7 +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
+#include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_DH_INSTALL_ARGS = --list-missing
More information about the pkg-eucalyptus-commits
mailing list