[Pkg-ganeti-commits] r50 - trunk/ganeti/debian

[ultrotter at alioth.debian.org]

Author: ultrotter
Date: 2008-06-15 08:17:09 +0000 (Sun, 15 Jun 2008)
New Revision: 50

Modified:
   trunk/ganeti/debian/changelog
   trunk/ganeti/debian/control
Log:
Removing python-pyopenssl as an alternative

Leaving it doesn't satisfy lintian, so removing it. It will have to be added
manually for backporting to distributions which don't have python-openssl.


Modified: trunk/ganeti/debian/changelog
===================================================================
--- trunk/ganeti/debian/changelog	2008-06-15 08:08:47 UTC (rev 49)
+++ trunk/ganeti/debian/changelog	2008-06-15 08:17:09 UTC (rev 50)
@@ -1,8 +1,7 @@
 ganeti (1.2.4-2) unstable; urgency=low
 
   * Check new policy and bump up standards version
-  * Depend on python-openssl rather than python-pyopenssl, but leave the
-    latter as an alternative to ease backports
+  * Depend on python-openssl rather than python-pyopenssl
 
  -- Guido Trotter <ultrotter at debian.org>  Sun, 15 Jun 2008 09:05:37 +0100
 

Modified: trunk/ganeti/debian/control
===================================================================
--- trunk/ganeti/debian/control	2008-06-15 08:08:47 UTC (rev 49)
+++ trunk/ganeti/debian/control	2008-06-15 08:17:09 UTC (rev 50)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Ganeti Team <pkg-ganeti-devel at lists.alioth.debian.org>
 Uploaders: Guido Trotter <ultrotter at debian.org>, Iustin Pop <iusty at k1024.org>, Leonardo Rodrigues de Mello <l at lmello.eu.org>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), docbook-utils, python-simplejson, python-pyparsing, python-openssl | python-pyopenssl, python-twisted-core, patchutils, python-support (>= 0.6)
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), docbook-utils, python-simplejson, python-pyparsing, python-openssl, python-twisted-core, patchutils, python-support (>= 0.6)
 Standards-Version: 3.8.0.1
 Vcs-Svn: http://ganeti.googlecode.com/svn/trunk/ganeti/
 Vcs-Browser: http://ganeti.googlecode.com/svn/trunk/ganeti/
@@ -11,7 +11,7 @@
 
 Package: ganeti
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, ssh, bridge-utils, iproute, iputils-arping, fping, openssl, python-simplejson, python-pyparsing, python-openssl | python-pyopenssl, python-twisted-core
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, lvm2, ssh, bridge-utils, iproute, iputils-arping, fping, openssl, python-simplejson, python-pyparsing, python-openssl, python-twisted-core
 Recommends: drbd8-utils (>= 8.0.7) | drbd0.7-utils, mdadm, xen-linux-system-2.6.18-5-xen-vserver-686 | xen-linux-system-2.6.18-4-xen-686 | xen-linux-system-2.6.18-5-xen-686 | xen-linux-system-2.6.18-4-xen-vserver-686 | xen-linux-system-2.6.18-4-xen-amd64 | xen-linux-system-2.6.18-4-xen-vserver-amd64 | xen-linux-system-2.6.18-5-xen-amd64 |  xen-linux-system-2.6.18-5-xen-vserver-amd64
 Suggests: drbd8-module-source (>= 8.0.7) | drbd0.7-module-source
 Provides: ${python:Provides}