[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r323: need debhelper too, and override the system 'deb' pkg with our dpkg

[Stew Benedict]

------------------------------------------------------------
revno: 323
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: puppet-lsb
timestamp: Fri 2012-07-27 15:25:54 -0400
message:
  need debhelper too, and override the system 'deb' pkg with our dpkg
modified:
  modules/alien/manifests/init.pp
-------------- next part --------------
=== modified file 'modules/alien/manifests/init.pp'
--- a/modules/alien/manifests/init.pp	2012-07-27 16:09:03 +0000
+++ b/modules/alien/manifests/init.pp	2012-07-27 19:25:54 +0000
@@ -1,12 +1,17 @@
 class alien {
 
-    # need alien, dkpg and dependencies to create .deb repos
+    # need alien, dpkg and dependencies to create .deb repos
 
     $sles11alienrepo = "$operatingsystem-$operatingsystemrelease" ? {
         /^SLES-11(\.[0-9])?$/ => File['/etc/zypp/repos.d/alien_for_sles11.repo'],
         default               => undef,
     }
 
+    $dpkgversion = "$operatingsystem-$operatingsystemrelease" ? {
+        /^SLES-11(\.[0-9])?$/ => '1.16.0.1',
+        default               => present,
+    }
+
     file { ['/opt/zypper', '/opt/zypper/alien_for_sles11']:
         ensure => directory,
         mode   => 0755,
@@ -39,7 +44,12 @@
     }
 
     # the bits we really want
-    package { ['alien', 'dpkg', 'perl-Dpkg']:
+    # the native 'deb' package also provides dpkg, use the new one
+    package { 'dpkg':
+        ensure => $dpkgversion,
+        require => $sles11alienrepo,
+    }
+    package { ['alien', 'perl-Dpkg', 'debhelper']:
         ensure => present,
         require => $sles11alienrepo,
     }