Browse Source

Drop jenkins-debian-glue-repoenv package + add dependency on "reprepro | freight" to jenkins-debian-glue

reprepro should be present on every system to avoid failures with
package inclusion in repository. Depending on reprepro in the
main jenkins-debian-glue package avoids that problem while still
supporting setups where cowbuilder etc aren't necessary on
repository-only systems.

Closes: #76
merge-requests/109/head
Michael Prokop 8 years ago
parent
commit
80057b07f9
  1. 13
      debian/control
  2. 3
      puppet/jenkins_debian_glue.pp

13
debian/control

@ -11,9 +11,9 @@ Vcs-Browser: https://github.com/mika/jenkins-debian-glue
Package: jenkins-debian-glue
Architecture: all
Depends: sudo | sudo-ldap,
Depends: reprepro | freight,
sudo | sudo-ldap,
${misc:Depends}
Recommends: jenkins-debian-glue-repoenv
Description: glue scripts for building Debian packages inside Jenkins
This package provides scripts which should make building Debian
package inside Jenkins (a Continuous Integration suite) easier.
@ -21,15 +21,6 @@ Description: glue scripts for building Debian packages inside Jenkins
It's meant to make Q/A builds of Debian packages inside Jenkins
as manageable and homogeneous as possible.
Package: jenkins-debian-glue-repoenv
Architecture: all
Depends: jenkins-debian-glue,
reprepro | freight,
${misc:Depends}
Description: Virtual package for repository only hosts
This virtual package depends on the software packages required
for using jenkins-debian-glue for repo only jobs (PROVIDE_ONLY set).
Package: jenkins-debian-glue-buildenv
Architecture: all
Depends: cowbuilder,

3
puppet/jenkins_debian_glue.pp

@ -181,8 +181,7 @@ class jenkins::software {
'jenkins-debian-glue-buildenv-lintian',
'jenkins-debian-glue-buildenv-svn',
'jenkins-debian-glue-buildenv-taptools',
'jenkins-debian-glue-buildenv-piuparts',
'jenkins-debian-glue-repoenv' ]:
'jenkins-debian-glue-buildenv-piuparts' ]:
ensure => present,
require => [
File['/etc/apt/sources.list.d/jenkins-debian-glue.list'],

Loading…
Cancel
Save