Accept patch from Helmut Grohne

5 files changed, 62 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index cacea12..4a5df51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+qrouter (1.3.80-2) UNRELEASED; urgency=medium
+
+  [Helmut Grohne]
+  * FTCBFS: fails to propagate the cross compiler from configure to make
+    (Closes: #894831)
+
+ -- Ruben Undheim <ruben.undheim@gmail.com>  Wed, 11 Jul 2018 13:04:54 +0200
+
 qrouter (1.3.80-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch b/debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch
new file mode 100644
index 0000000..adbf0ff
--- /dev/null
+++ b/debian/patches/0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch
@@ -0,0 +1,20 @@
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: Wed, 11 Jul 2018 13:01:29 +0200
+Subject: FTCBFS: fails to propagate the cross compiler from configure to make
+
+---
+ Makefile.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.in b/Makefile.in
+index dbe4a1b..76c9b52 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -3,6 +3,7 @@
+ #
+ 
+ # Main compiler arguments
++CC = @CC@
+ CFLAGS += @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
+ DEFS = @DEFS@
diff --git a/debian/patches/01_chmod_executable.patch b/debian/patches/01_chmod_executable.patch
index 1064fbe..8bace25 100644
--- a/debian/patches/01_chmod_executable.patch
+++ b/debian/patches/01_chmod_executable.patch
@@ -1,12 +1,17 @@
-Description: This sets the correct permission
-  on console.tcl and qrouter.tcl
-Author: Ruben Undheim <ruben.undheim@gmail.com>
-Last-Update: 2015-02-20
-Index: qrouter/Makefile.in
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: 2015-02-20
+Subject: This sets the correct permission on console.tcl and qrouter.tcl
+
 ===================================================================
---- qrouter.orig/Makefile.in	2016-10-06 18:23:53.802011779 +0200
-+++ qrouter/Makefile.in	2016-10-06 18:23:58.673545877 +0200
-@@ -108,9 +108,9 @@
+---
+ Makefile.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index cdb4c80..d1d14b0 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -108,9 +108,9 @@ install-tcl: qrouter.sh qrouter.tcl qrouter$(SHDLIB_EXT) \
  	$(INSTALL) qrouter$(SHDLIB_EXT) $(DESTDIR)${LIBINSTALL}
  	$(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
  	$(INSTALL) qrouternullg$(EXEEXT) $(DESTDIR)${LIBINSTALL}
diff --git a/debian/patches/02_use_tkcon_from_debian.patch b/debian/patches/02_use_tkcon_from_debian.patch
index aaca6c5..0f0db00 100644
--- a/debian/patches/02_use_tkcon_from_debian.patch
+++ b/debian/patches/02_use_tkcon_from_debian.patch
@@ -1,13 +1,19 @@
-Description: This patch makes sure that the tkcon
-  version from debian is used instead of the version
-  bundled with the source of qrouter.
-Author: Ruben Undheim <ruben.undheim@gmail.com>
-Last-Update: 2015-02-20
-Index: qrouter/Makefile.in
+From: Ruben Undheim <ruben.undheim@gmail.com>
+Date: 2015-02-20
+Subject: Use tkon from debian
+Description: This patch makes sure that the tkcon version from debian is used instead of the version  bundled with the source of qrouter.
+
 ===================================================================
---- qrouter.orig/Makefile.in	2016-10-06 18:24:01.789247901 +0200
-+++ qrouter/Makefile.in	2016-10-06 18:25:45.099367586 +0200
-@@ -109,7 +109,6 @@
+---
+ Makefile.in   | 1 -
+ qrouter.sh.in | 2 +-
+ 2 files changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index d1d14b0..dbe4a1b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -109,7 +109,6 @@ install-tcl: qrouter.sh qrouter.tcl qrouter$(SHDLIB_EXT) \
  	$(INSTALL) qrouterexec$(EXEEXT) $(DESTDIR)${LIBINSTALL}
  	$(INSTALL) qrouternullg$(EXEEXT) $(DESTDIR)${LIBINSTALL}
  	$(INSTALL) -m 0644 console.tcl $(DESTDIR)${LIBINSTALL}
@@ -15,11 +21,11 @@ Index: qrouter/Makefile.in
  	$(INSTALL) -m 0644 qrouter.tcl $(DESTDIR)${LIBINSTALL}
  
  uninstall:
-Index: qrouter/qrouter.sh.in
-===================================================================
---- qrouter.orig/qrouter.sh.in	2016-10-06 18:24:01.789247901 +0200
-+++ qrouter/qrouter.sh.in	2016-10-06 18:24:01.785248284 +0200
-@@ -57,7 +57,7 @@
+diff --git a/qrouter.sh.in b/qrouter.sh.in
+index 12bab42..8e7cbda 100755
+--- a/qrouter.sh.in
++++ b/qrouter.sh.in
+@@ -57,7 +57,7 @@ shift
  
  if [ $TKCON ]; then
  
diff --git a/debian/patches/series b/debian/patches/series
index eb0fbef..1ecbe17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_chmod_executable.patch
 02_use_tkcon_from_debian.patch
+0003-FTCBFS-fails-to-propagate-the-cross-compiler-from-co.patch