[tycho] 01/02: Update fix-sonatype-bug.patch to add missing version to tycho-core dependency

Christopher Stuart Hoskin mans0954 at moszumanska.debian.org
Wed Jul 19 21:16:31 UTC 2017


This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch master
in repository tycho.

commit 21f0c94574ba59ca237943be3c263f0086b0e27c
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Wed Jul 19 19:33:11 2017 +0100

    Update fix-sonatype-bug.patch to add missing version to tycho-core dependency
---
 debian/changelog                      |  1 +
 debian/patches/fix-sonatype-bug.patch | 14 +++++++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b7a824..22b8314 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ tycho (0.25.0-2) UNRELEASED; urgency=medium
     before quilt patches are unapplied)   
   * Add libtycho-java Build-Conflicts
   * Fix paths with spaces in debian/copyright 
+  * Update fix-sonatype-bug.patch to add missing version to tycho-core dependency 
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Jan 2017 14:51:11 +0100
 
diff --git a/debian/patches/fix-sonatype-bug.patch b/debian/patches/fix-sonatype-bug.patch
index 98e8eab..a7699b7 100644
--- a/debian/patches/fix-sonatype-bug.patch
+++ b/debian/patches/fix-sonatype-bug.patch
@@ -1,10 +1,15 @@
-Tycho requires aether to compile. I think this an upstream bug.
+Subject: Tycho requires aether to compile. I think this an upstream bug.
+Author: vercelli <vercelli at LENALKE119>, Christopher Hoskin <mans0954 at debian.org>
+Last-Update: 2017-07-18
+
 --- a/tycho-core/pom.xml
 +++ b/tycho-core/pom.xml
-@@ -162,6 +162,16 @@
+@@ -161,6 +161,17 @@
+ 		<dependency>
  			<groupId>org.mockito</groupId>
  			<artifactId>mockito-core</artifactId>
- 		</dependency>
++                        <version>debian</version>
++		</dependency>
 + 		<dependency>
 +			<groupId>org.sonatype.aether</groupId>
 +			<artifactId>aether-spi</artifactId>
@@ -14,7 +19,6 @@ Tycho requires aether to compile. I think this an upstream bug.
 +			<groupId>org.sonatype.aether</groupId>
 +			<artifactId>aether-util</artifactId>
 +			<version>debian</version>
-+		</dependency>
+ 		</dependency>
  	</dependencies>
  
- </project>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tycho.git



More information about the pkg-java-commits mailing list