[pkg-eucalyptus-commits] r276 - eucalyptus/trunk/debian/patches

[Brian Thomason]

Author: iamfuzz-guest
Date: 2012-10-05 17:19:49 +0000 (Fri, 05 Oct 2012)
New Revision: 276

Removed:
   eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch
   eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch
Log:
Removed two old patches


Deleted: eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch
===================================================================
--- eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch	2012-10-04 20:22:50 UTC (rev 275)
+++ eucalyptus/trunk/debian/patches/001_hibernate-3.5.patch	2012-10-05 17:19:49 UTC (rev 276)
@@ -1,11 +0,0 @@
---- 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;
- 

Deleted: eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch
===================================================================
--- eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch	2012-10-04 20:22:50 UTC (rev 275)
+++ eucalyptus/trunk/debian/patches/002_temporary_lintian_fixes.patch	2012-10-05 17:19:49 UTC (rev 276)
@@ -1,113 +0,0 @@
---- 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"