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

[Rudy Godoy]

Author: rudy
Date: 2012-07-27 12:40:40 +0000 (Fri, 27 Jul 2012)
New Revision: 259

Modified:
   eucalyptus/trunk/debian/changelog
   eucalyptus/trunk/debian/control
   eucalyptus/trunk/debian/copyright
Log:
Minor packaging fixes

Modified: eucalyptus/trunk/debian/changelog
===================================================================
--- eucalyptus/trunk/debian/changelog	2012-07-22 09:16:26 UTC (rev 258)
+++ eucalyptus/trunk/debian/changelog	2012-07-27 12:40:40 UTC (rev 259)
@@ -1,3 +1,15 @@
+eucalyptus (3.1.0-4) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Minor fixes:
+    - Dependency on isc-dchp-server instead of dhcp3-server to ease
+      lenny -> squeeze upgrade.
+    - Dependency on m-t-a prefered, postfix as alternative.
+    - Dropped dependency on libhamcrest1.2-java, Ubuntu only.
+  * Corrected Apache 2.0 license abbreviation on debian/copyright.
+
+ -- Rudy Godoy <rudy at stone-head.org>  Sun, 22 Jul 2012 04:16:48 -0500
+
 eucalyptus (3.1.0-3) unstable; urgency=low
 
   * Fixed lintian warnings for:

Modified: eucalyptus/trunk/debian/control
===================================================================
--- eucalyptus/trunk/debian/control	2012-07-22 09:16:26 UTC (rev 258)
+++ eucalyptus/trunk/debian/control	2012-07-27 12:40:40 UTC (rev 259)
@@ -65,7 +65,7 @@
                libgeronimo-jta-1.1-spec-java,
                libgeronimo-stax-1.2-spec-java,
                libguava-java,
-               libhamcrest1.2-java | libhamcrest-java (>= 1.2),
+               libhamcrest-java (>= 1.2),
                libhsqldb-java,
                libitext-java,
                libjavassist-java,
@@ -174,7 +174,7 @@
          lvm2, euca2ools (>= 2.0), libgetargs-long-perl, eucalyptus-admin-tools (= ${binary:Version}),
          postgresql-9.1
 Replaces: eucalyptus-cc (<< 1.6), eucalyptus-sc (<< 1.6), eucalyptus-walrus (<< 1.6)
-Recommends: python-boto (>= 2.1), postfix | mail-transport-agent
+Recommends: python-boto (>= 2.1),  mail-transport-agent | postfix 
 Description: Elastic Utility Computing Architecture - Cloud controller
  EUCALYPTUS is an open source service overlay that implements elastic
  computing using existing resources. The goal of EUCALYPTUS is to allow
@@ -245,7 +245,7 @@
 Architecture: amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}, eucalyptus-common (= ${binary:Version}), apache2,
          libapache2-mod-axis2c, eucalyptus-gl (= ${binary:Version}), librampart0 (>= 1.3.0-1euca2),
-         bridge-utils, vlan, dhcp3-server, iptables, eucalyptus-admin-tools (= ${binary:Version})
+         bridge-utils, vlan, isc-dhcp-server, iptables, eucalyptus-admin-tools (= ${binary:Version})
 Recommends: vtun, libpam-modules (>= 1.0.1-9ubuntu3)
 Conflicts: apache2-mpm-itk
 Description: Elastic Utility Computing Architecture - Cluster controller

Modified: eucalyptus/trunk/debian/copyright
===================================================================
--- eucalyptus/trunk/debian/copyright	2012-07-22 09:16:26 UTC (rev 258)
+++ eucalyptus/trunk/debian/copyright	2012-07-27 12:40:40 UTC (rev 259)
@@ -55,7 +55,7 @@
 
 Files: clc/modules/wsstack/src/main/java/org/*
 Copyright: Copyright (C) 2009 Red Hat, Inc.
-License: Apache
+License: Apache-2.0
  Copyright 2009 Red Hat, Inc.
  Red Hat licenses this file to you under the Apache License, version 2.0
  (the "License"); you may not use this file except in compliance with the