[SCM] jenkins packaging branch, master, updated. debian/1.480.3+dfsg-1_exp1-10-g622bbac

James Page james.page at ubuntu.com
Tue Jul 2 13:32:25 UTC 2013


The following commit has been merged in the master branch:
commit f1efa726cda597906e568bc6e1034826c3453438
Author: James Page <james.page at ubuntu.com>
Date:   Tue Jul 2 11:45:26 2013 +0100

    d/control: Fixup versioned inter-dependencies between jenkins packages (Closes: #704845).

diff --git a/debian/changelog b/debian/changelog
index 4073f8c..39ed372 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 jenkins (1.480.3+dfsg-1) unstable; urgency=low
 
   * Upload to unstable.
+  * d/control: Fixup versioned inter-dependencies between jenkins
+    packages (Closes: #704845).
 
  -- James Page <james.page at ubuntu.com>  Tue, 02 Jul 2013 11:38:50 +0100
 
diff --git a/debian/control b/debian/control
index 27638bb..e916048 100644
--- a/debian/control
+++ b/debian/control
@@ -131,7 +131,7 @@ Package: libjenkins-plugin-parent-java
 Architecture: all
 Depends:
  junit4,
- libjenkins-java,
+ libjenkins-java (= ${binary:Version}),
  libmaven-hpi-plugin-java,
  libmaven-javadoc-plugin-java,
  libmaven-stapler-plugin-java,
@@ -194,7 +194,7 @@ Architecture: all
 Depends:
  adduser,
  default-jre-headless | java6-runtime-headless,
- jenkins-common,
+ jenkins-common (= ${binary:Version}),
  ${jenkins-daemon-deps},
  ${misc:Depends}
 Conflicts: jenkins-tomcat, tomcat6
@@ -315,7 +315,7 @@ Description: Jenkins CI Command Line Interface
 
 Package: jenkins-tomcat
 Architecture: all
-Depends: jenkins-common, tomcat6, ${misc:Depends}
+Depends: jenkins-common (= ${binary:Version}), tomcat6, ${misc:Depends}
 Conflicts: jenkins
 Provides: jenkins
 Description: Jenkins CI on Tomcat 6

-- 
jenkins packaging



More information about the pkg-java-commits mailing list