[tycho] 03/12: Revert "Update fix-sonatype-bug.patch to add missing version to tycho-core dependency"

[Markus Koschany]

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

apo pushed a commit to branch master
in repository tycho.

commit 98487c591128e134ebc804df10f4203d369821fa
Author: Markus Koschany <apo at debian.org>
Date:   Sat Sep 2 02:19:10 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 22b8314..8b7a824 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,6 @@ 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 a7699b7..98e8eab 100644
--- a/debian/patches/fix-sonatype-bug.patch
+++ b/debian/patches/fix-sonatype-bug.patch
@@ -1,15 +1,10 @@
-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
-
+Tycho requires aether to compile. I think this an upstream bug.
 --- a/tycho-core/pom.xml
 +++ b/tycho-core/pom.xml
-@@ -161,6 +161,17 @@
- 		<dependency>
+@@ -162,6 +162,16 @@
  			<groupId>org.mockito</groupId>
  			<artifactId>mockito-core</artifactId>
-+                        <version>debian</version>
-+		</dependency>
+ 		</dependency>
 + 		<dependency>
 +			<groupId>org.sonatype.aether</groupId>
 +			<artifactId>aether-spi</artifactId>
@@ -19,6 +14,7 @@ Last-Update: 2017-07-18
 +			<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