Control: tags 830333 + patch
Control: tags 830333 + pending

Dear maintainer,

I've prepared an NMU for topal (versioned as 75-2.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru topal-75/debian/changelog topal-75/debian/changelog
--- topal-75/debian/changelog	2016-07-11 18:38:39.000000000 +0200
+++ topal-75/debian/changelog	2016-07-11 18:38:39.000000000 +0200
@@ -1,3 +1,11 @@
+topal (75-2.1) unstable; urgency=medium
+
+  * Non maintainer upload.
+  * Rebuild with gnat-6 and bump ALI version. Closes: #830333.
+    Select gnatgcc (currently gcc-6) instead of gcc (currently gcc-5).
+
+ -- Nicolas Boulenguez <nico...@debian.org>  Mon, 11 Jul 2016 18:12:06 +0200
+
 topal (75-2) unstable; urgency=medium
 
   * Remove metamail from suggests list.  (Closes: #665090.)
diff -Nru topal-75/debian/control topal-75/debian/control
--- topal-75/debian/control	2016-07-11 18:38:39.000000000 +0200
+++ topal-75/debian/control	2016-07-11 18:38:39.000000000 +0200
@@ -2,7 +2,7 @@
 Section: mail
 Priority: optional
 Maintainer: Phil Brooke <p...@debian.org>
-Build-Depends: debhelper (>> 6.0.0), libreadline-dev, gnat, gnat-4.9, lynx, texlive, texlive-latex-extra, texlive-fonts-extra
+Build-Depends: debhelper (>> 6.0.0), libreadline-dev, gnat, gnat-6, lynx, texlive, texlive-latex-extra, texlive-fonts-extra
 Standards-Version: 3.9.5
 
 Package: topal
diff -Nru topal-75/debian/rules topal-75/debian/rules
--- topal-75/debian/rules	2016-07-11 18:38:39.000000000 +0200
+++ topal-75/debian/rules	2016-07-11 18:38:39.000000000 +0200
@@ -32,7 +32,7 @@
 	dh_testdir
 
 	# Add here commands to compile the package.
-	$(MAKE)
+	$(MAKE) CC=gnatgcc
 	#/usr/bin/docbook-to-man debian/topal.sgml > topal.1
 
 	touch build-stamp
diff -Nru topal-75/Makefile topal-75/Makefile
--- topal-75/Makefile	2016-07-11 18:38:39.000000000 +0200
+++ topal-75/Makefile	2016-07-11 18:38:39.000000000 +0200
@@ -38,6 +38,8 @@
 
 DEBCFLAGS=$(filter-out -Wformat,$(shell dpkg-buildflags --get CFLAGS))
 
+CC ?= gcc
+
 # The default action.
 all:	binary topal.pdf
 
@@ -46,13 +48,13 @@
 all2:	package distrib
 
 ada-readline-c.o:	ada-readline-c.c
-	gcc -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) ada-readline-c.c
+	$(CC) -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) ada-readline-c.c
 
 ada-echo-c.o:	ada-echo-c.c
-	gcc -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) ada-echo-c.c
+	$(CC) -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) ada-echo-c.c
 
 externals-c.o:	externals-c.c
-	gcc -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) externals-c.c
+	$(CC) -c -Wall $(shell dpkg-buildflags --get CFLAGS) $(TOPALDEBUG) externals-c.c
 
 mime-tool:	
 	make -C MIME-tool
diff -Nru topal-75/MIME-tool/Makefile topal-75/MIME-tool/Makefile
--- topal-75/MIME-tool/Makefile	2016-07-11 18:38:39.000000000 +0200
+++ topal-75/MIME-tool/Makefile	2016-07-11 18:38:39.000000000 +0200
@@ -1,9 +1,11 @@
 .PHONY:	all clean realclean distrib
 
+CC ?= gcc
+
 all:	mime-tool
 
 mime-tool:	mime.c
-	gcc $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get LDFLAGS) -Wall -o mime-tool mime.c
+	$(CC) $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get LDFLAGS) -Wall -o mime-tool mime.c
 	-strip mime-tool
 
 realclean:	clean

Reply via email to