From: Peter Michael Green <plugwash@raspbian.org>
Date: Thu, 29 Aug 2019 16:01:05 +0000 (+0000)
Subject: More gcj fixes.
X-Git-Tag: archive/raspbian/1.185+rpi1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=41a576df31946bcbff39ce40ea8e3ec2eea2e8ce;p=gcc-defaults.git

More gcj fixes.
---

diff --git a/debian/rules b/debian/rules
index 8bd568b..4f23d19 100755
--- a/debian/rules
+++ b/debian/rules
@@ -223,7 +223,11 @@ CV_GOBJCXX	:= 9.2.1-$(REL_NO_921)
 CV_GFORT	:= 9.2.1-$(REL_NO_921)
 CV_GGO		:= 9.2.1-$(REL_NO_921)
 CV_GNAT		:= 9.2.1-$(REL_NO_921)
+CV_GCJ		:= 6.4.0-$(REL_NO_64)
+CV_GIJ		:= 6.4.0-$(REL_NO_64)
+CV_LIBGCJBC	:= 6.4.0-$(REL_NO_64)
 CV_GDC		:= 9.2.1-$(REL_NO_921)
+CV_LIBGCJCOMMON	:= 1:6.4-$(REL_NO_64)
 CV_GM2		:= 9.2.1-$(REL_NO_921)
 CV_BRIG		:= 9.2.1-$(REL_NO_921)
 CV_OFFL		:= 9.2.1-$(REL_NO_921)
@@ -1431,7 +1435,7 @@ ifeq ($(with_native),yes)
 	dh_fixperms -i
 	dh_python2 -plibgcj-common
 	dh_installdeb -i
-	dh_gencontrol -plibgcj-common -u-v$(CV_LIBGCJCOMMON)
+	dh_gencontrol -plibgcj-common -- -v$(CV_LIBGCJCOMMON)
 	dh_md5sums -i
 	dh_builddeb -i
   endif