[pkg-eucalyptus-commits] r89 - eucalyptus/trunk/debian

[Chris Grzegorczyk]

Author: grze-guest
Date: 2010-09-07 09:45:01 +0000 (Tue, 07 Sep 2010)
New Revision: 89

Modified:
   eucalyptus/trunk/debian/build-jars
   eucalyptus/trunk/debian/changelog
   eucalyptus/trunk/debian/control
   eucalyptus/trunk/debian/copyright
   eucalyptus/trunk/debian/eucalyptus-cloud.postinst
   eucalyptus/trunk/debian/eucalyptus-common.manpages
   eucalyptus/trunk/debian/eucalyptus-java-common.install
   eucalyptus/trunk/debian/eucalyptus-java-common.links
   eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides
Log:
Update to 2.0.0
- update dependencies: asm3, geronimo-jpa-2.0, hibernate-proxool
- fix euca_upgrade failure case in eucalyptus-cloud.postinst
- add override to eucalyptus-nc


Modified: eucalyptus/trunk/debian/build-jars
===================================================================
--- eucalyptus/trunk/debian/build-jars	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/build-jars	2010-09-07 09:45:01 UTC (rev 89)
@@ -16,7 +16,7 @@
 /usr/share/java/commons-io.jar
 /usr/share/java/hsqldb.jar
 /usr/share/java/backport-util-concurrent.jar
-/usr/share/java/asm2.jar
+/usr/share/java/asm3-3.2.jar
 /usr/share/java/antlr.jar
 /usr/share/java/axiom-api.jar
 /usr/share/java/axiom-dom.jar
@@ -36,13 +36,14 @@
 /usr/share/java/mule-module-spring-config-2.0.jar
 /usr/share/java/mule-module-xml-2.0.jar
 /usr/share/java/gnumail.jar
-/usr/share/java/geronimo-jpa-3.0-spec.jar
+/usr/share/java/geronimo-jpa-2.0-spec.jar
 /usr/share/java/google-collections.jar
 /usr/share/groovy/embeddable/groovy-all-1.7.0.jar
 /usr/share/java/gwt-servlet.jar
 /usr/share/java/gwt-user.jar
 /usr/share/java/jaxp-1.3.jar
 /usr/share/java/jetty.jar
+/usr/share/java/jetty-rewrite-handler.jar
 /usr/share/java/jetty-sslengine.jar
 /usr/share/java/jetty-util.jar
 /usr/share/java/json-lib.jar

Modified: eucalyptus/trunk/debian/changelog
===================================================================
--- eucalyptus/trunk/debian/changelog	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/changelog	2010-09-07 09:45:01 UTC (rev 89)
@@ -1,3 +1,9 @@
+eucalyptus (2.0.0-1) UNRELEASED; urgency=low
+
+  * New 2.0 release.
+
+ -- Chris Grzegorczyk <grze at eucalyptus.com>  Wed, 11 Aug 2010 12:32:06 -0700
+
 eucalyptus (1.6.2-3) UNRELEASED; urgency=low
 
   [ Steffen Moeller ]

Modified: eucalyptus/trunk/debian/control
===================================================================
--- eucalyptus/trunk/debian/control	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/control	2010-09-07 09:45:01 UTC (rev 89)
@@ -24,7 +24,7 @@
  libmule-java-2.0,
  libgnumail-java,
  libgeronimo-j2ee-connector-1.5-spec-java,
- libgeronimo-jpa-3.0-spec-java,
+ libgeronimo-jpa-2.0-spec-java,
  libgoogle-collections-java,
  groovy (>= 1.6.4),
  libgwt-user-java,
@@ -143,7 +143,7 @@
  libxml-security-java (>= 1.4.2-1ubuntu1),
  antlr3,
  libantlr-java,
- libasm2-java,
+ libasm3-java,
  libbcel-java,
  libbsf-java,
  libproxool-java,

Modified: eucalyptus/trunk/debian/copyright
===================================================================
--- eucalyptus/trunk/debian/copyright	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/copyright	2010-09-07 09:45:01 UTC (rev 89)
@@ -29,6 +29,17 @@
  You should have received a copy of the GNU General Public License
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+ In addition, as a special exception, Eucalyptus Systems, Inc.
+ gives permission to link the code of the Eucalyptus components:
+ Eucalyptus Node Controller (eucalyptus-nc) with the OpenSSL project's
+ "OpenSSL" library (or with modified versions of it that use the same
+ license as the "OpenSSL" library), and distribute the linked
+ executables.  You must obey the GNU General Public License in all
+ respects for all of the code used other than "OpenSSL".  If you modify
+ this file, you may extend this exception to your version of the file,
+ but you are not obligated to do so.  If you do not wish to do so,
+ delete this exception statement from your version.
+
  On Debian systems, the complete text of the GNU General Public
  License, version 3, can be found in /usr/share/common-licenses/GPL-3.
 

Modified: eucalyptus/trunk/debian/eucalyptus-cloud.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.postinst	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.postinst	2010-09-07 09:45:01 UTC (rev 89)
@@ -3,7 +3,7 @@
 if [ "$1" = "configure" ]
 then
     if dpkg --compare-versions "$2" lt "1.6" ; then
-        /usr/share/eucalyptus/euca_upgrade --old / --new / --db
+        /usr/share/eucalyptus/euca_upgrade --old / --new / --db || true
     fi
     if ! dpkg-statoverride --list /var/lib/eucalyptus/db >/dev/null 2>&1; then
         chown eucalyptus:eucalyptus /var/lib/eucalyptus/db || true

Modified: eucalyptus/trunk/debian/eucalyptus-common.manpages
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-common.manpages	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/eucalyptus-common.manpages	2010-09-07 09:45:01 UTC (rev 89)
@@ -1 +1 @@
-tools/euca_conf.1
+tools/euca_conf.8

Modified: eucalyptus/trunk/debian/eucalyptus-java-common.install
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.install	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.install	2010-09-07 09:45:01 UTC (rev 89)
@@ -2,6 +2,7 @@
 /usr/share/eucalyptus/eucalyptus-interface-*.jar
 /usr/share/eucalyptus/eucalyptus-auth-*.jar
 /usr/share/eucalyptus/eucalyptus-core-*.jar
+/usr/share/eucalyptus/eucalyptus-component-*.jar
 /usr/share/eucalyptus/eucalyptus-groupmgr-*.jar
 /usr/share/eucalyptus/eucalyptus-dns-*.jar
 /usr/share/eucalyptus/eucalyptus-db-*.jar

Modified: eucalyptus/trunk/debian/eucalyptus-java-common.links
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-java-common.links	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/eucalyptus-java-common.links	2010-09-07 09:45:01 UTC (rev 89)
@@ -19,13 +19,14 @@
 /usr/share/java/gnumail.jar /usr/share/eucalyptus/gnumail.jar
 /usr/share/java/gnumail-providers.jar /usr/share/eucalyptus/gnumail-providers.jar
 /usr/share/java/inetlib.jar /usr/share/eucalyptus/inetlib.jar
-/usr/share/java/geronimo-jpa-3.0-spec.jar /usr/share/eucalyptus/geronimo-jpa-3.0-spec.jar
+/usr/share/java/geronimo-jpa-2.0-spec.jar /usr/share/eucalyptus/geronimo-jpa-2.0-spec.jar
 /usr/share/java/google-collections.jar /usr/share/eucalyptus/google-collections.jar
 /usr/share/java/groovy-all.jar /usr/share/eucalyptus/groovy.jar
 /usr/share/java/gwt-servlet.jar /usr/share/eucalyptus/gwt-servlet.jar
 /usr/share/java/gwt-user.jar /usr/share/eucalyptus/gwt-user.jar
 /usr/share/java/jaxp-1.3.jar /usr/share/eucalyptus/jaxp-1.3.jar
 /usr/share/java/jetty.jar /usr/share/eucalyptus/jetty.jar
+/usr/share/java/jetty-rewrite-handler.jar /usr/share/eucalyptus/jetty-rewrite-handler.jar
 /usr/share/java/jibx-run-1.1.jar /usr/share/eucalyptus/jibx-run-1.1.jar
 /usr/share/java/json-lib.jar /usr/share/eucalyptus/json-lib.jar
 /usr/share/java/junit.jar /usr/share/eucalyptus/junit.jar
@@ -36,8 +37,9 @@
 /usr/share/java/xalan2.jar /usr/share/eucalyptus/xalan2.jar
 /usr/share/java/xercesImpl.jar /usr/share/eucalyptus/xercesImpl.jar
 /usr/share/java/xml-security.jar /usr/share/eucalyptus/xml-security.jar
-/usr/share/java/antlr3-3.0.1+dfsg.jar /usr/share/eucalyptus/antlr3-3.0.1+dfsg.jar
-/usr/share/java/asm2.jar /usr/share/eucalyptus/asm2.jar
+/usr/share/java/antlr3.jar /usr/share/eucalyptus/antlr3.jar
+/usr/share/java/ant.jar /usr/share/eucalyptus/ant.jar
+/usr/share/java/asm3-3.2.jar /usr/share/eucalyptus/asm3-3.2.jar
 /usr/share/java/bcel.jar /usr/share/eucalyptus/bcel.jar
 /usr/share/java/bsf.jar /usr/share/eucalyptus/bsf.jar
 /usr/share/java/proxool.jar /usr/share/eucalyptus/proxool.jar
@@ -60,7 +62,7 @@
 /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/eucalyptus/geronimo-j2ee-connector-1.5-spec.jar
 /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/eucalyptus/geronimo-jms-1.1-spec.jar
 /usr/share/java/geronimo-jta-1.0.1b-spec.jar /usr/share/eucalyptus/geronimo-jta-1.0.1b-spec.jar
-/usr/share/java/geronimo-jacc-1.1-spec.jar /usr/share/eucalyptus/geronimo-jacc-1.1-spec.jar
+/usr/share/java/geronimo-jacc_1.1_spec.jar /usr/share/eucalyptus/geronimo-jacc_1.1_spec.jar
 /usr/share/java/geronimo-interceptor-3.0-spec.jar /usr/share/eucalyptus/geronimo-interceptor-3.0-spec.jar
 /usr/share/java/hsqldb.jar /usr/share/eucalyptus/hsqldb.jar
 /usr/share/java/hsqldbutil.jar /usr/share/eucalyptus/hsqldbutil.jar
@@ -94,5 +96,6 @@
 /usr/share/java/hibernate-annotations.jar /usr/share/eucalyptus/hibernate-annotations.jar
 /usr/share/java/hibernate-commons-annotations.jar /usr/share/eucalyptus/hibernate-commons-annotations.jar
 /usr/share/java/hibernate-entitymanager.jar /usr/share/eucalyptus/hibernate-entitymanager.jar
+/usr/share/java/hibernate-proxool.jar /usr/share/eucalyptus/hibernate-proxool.jar
 /usr/share/java/ehcache.jar /usr/share/eucalyptus/ehcache.jar
 /usr/share/java/wstx-lgpl.jar /usr/share/eucalyptus/wstx-lgpl.jar

Modified: eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides	2010-08-15 09:51:10 UTC (rev 88)
+++ eucalyptus/trunk/debian/eucalyptus-nc.lintian-overrides	2010-09-07 09:45:01 UTC (rev 89)
@@ -1,2 +1,4 @@
 # helper, will never have manpage
 eucalyptus-nc: binary-without-manpage usr/sbin/euca_test_nc
+#  
+eucalyptus-nc: possible-gpl-code-linked-with-openssl