[gcc-6] 182/401: * Fix running the libjava testsuite.

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository gcc-6.

commit 44fefa46a5a38df9c1bb50b57d53837208b40f57
Author: doko <doko at 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca>
Date:   Fri Aug 5 09:47:02 2016 +0000

      * Fix running the libjava testsuite.
    
    
    git-svn-id: svn://anonscm.debian.org/gcccvs/branches/sid/gcc-6@8942 6ca36cf4-e1d1-0310-8c6f-e303bb2178ca
---
 debian/changelog                     | 10 ++++++++--
 debian/patches/gcc-base-version.diff |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 94b503f..84114b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-gcc-6 (6.1.1-11) UNRELEASED; urgency=medium
+gcc-6 (6.1.1-12) UNRELEASED; urgency=medium
+
+  * Fix running the libjava testsuite.
+
+ -- Matthias Klose <doko at debian.org>  Fri, 05 Aug 2016 11:45:44 +0200
+
+gcc-6 (6.1.1-11) unstable; urgency=medium
 
   * Update to SVN 20160802 (r238981, 6.1.1) from the gcc-6-branch.
     - Fix PR target/72767 (AVR), PR target/71151 (AVR), PR c/7652,
@@ -11,7 +17,7 @@ gcc-6 (6.1.1-11) UNRELEASED; urgency=medium
   [ Matthias Klose ]
   * Backport AArch64 Vulcan cost models (Dann Frazier). LP: #1603587.
 
- -- Matthias Klose <doko at debian.org>  Tue, 02 Aug 2016 13:07:04 +0200
+ -- Matthias Klose <doko at debian.org>  Wed, 03 Aug 2016 21:53:37 +0200
 
 gcc-6 (6.1.1-10) unstable; urgency=medium
 
diff --git a/debian/patches/gcc-base-version.diff b/debian/patches/gcc-base-version.diff
index 57dcc3f..155d7a6 100644
--- a/debian/patches/gcc-base-version.diff
+++ b/debian/patches/gcc-base-version.diff
@@ -143,7 +143,7 @@ Index: b/src/libjava/testsuite/lib/libjava.exp
      regexp " version \[^\n\r\]*" $text version
 -    set libjava_version [lindex $version 1]
 +    # FIXME: Still needed?
-+    #set libjava_version 6
++    set libjava_version 6
  
      verbose "version: $libjava_version"
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/gcc-6.git