sbuild-update: Install debhelper before tweaking dh_builddeb

diff --git a/jenkins/sbuild-update.sh b/jenkins/sbuild-update.sh
index 19499b75df1c9534b016760d06625346ee8301c2..a7a4fe3c352744b973b241e97e3a078020c577e0 100755 (executable)
--- a/jenkins/sbuild-update.sh
+++ b/jenkins/sbuild-update.sh
@@ -134,7 +134,7 @@ EOT
        fi
        
        apt-get -y dist-upgrade
-       apt-get -y install pgdg-buildenv lintian-
+       apt-get -y install debhelper # install before tweaking dh_builddeb
        apt-get -y autoremove --purge
 
        # overwrite ucf.conf (the package ships its own file)
@@ -153,17 +153,13 @@ EOT
          fi
        fi
        
-       # remove libreadline-dev if present
-       if dpkg -l 'libreadline*-dev' | grep -q '^ii'; then
-         apt-get remove -y 'libreadline*-dev'
-       fi
-
        # install PostgreSQL
        apt-get -y install postgresql-common
+       apt-get -y install pgdg-buildenv
        apt-get -y install $CHROOT_INSTALL_PKGS # separate step to ease bootstrapping
 
        apt-get clean
-       dpkg -l 'libpq*' 'newpid' 'pgdg*' 'postgresql*' 'libreadline*' 'libedit*' '*llvm*' '*clang*' || :
+       dpkg -l 'libpq*' 'newpid' 'pgdg*' 'postgresql*' '*llvm*' '*clang*' || :
 
        EOF
 ) 9> $LOCKDIR/$distribution-$architecture.lock