tags 453206 + pending
thanks

Attached is the NMU diff.

Thanks, Tobias
diff -urpN gdb-avr-6.4.90.dfsg.orig/debian/changelog gdb-avr-6.4.90.dfsg/debian/changelog
--- gdb-avr-6.4.90.dfsg.orig/debian/changelog	2008-01-12 12:40:52.000000000 +0100
+++ gdb-avr-6.4.90.dfsg/debian/changelog	2008-01-12 12:39:03.000000000 +0100
@@ -1,3 +1,10 @@
+gdb-avr (6.4.90.dfsg-2.1) unstable; urgency=low
+
+  * Non-maintainer upload from the Zurich BSP
+  * Fix FTBFS, patch taken from gdb-m68hc1x package (Closes: #453206)
+
+ -- Tobias Klauser <[EMAIL PROTECTED]>  Sat, 12 Jan 2008 12:36:13 +0100
+
 gdb-avr (6.4.90.dfsg-1) unstable; urgency=low
 
   * Removed GFDL-files from src pkg (closes: #392961)
diff -urpN gdb-avr-6.4.90.dfsg.orig/debian/rules gdb-avr-6.4.90.dfsg/debian/rules
--- gdb-avr-6.4.90.dfsg.orig/debian/rules	2008-01-12 12:40:52.000000000 +0100
+++ gdb-avr-6.4.90.dfsg/debian/rules	2008-01-12 12:28:47.000000000 +0100
@@ -28,6 +28,9 @@ export DH_COMPAT=4
 unpack: unpack-stamp
 unpack-stamp:
 	tar xjf gdb*.tar.bz2
+	for i in *.diffs ; do \
+		cat $$i | patch -p0 ; \
+	done
 	mv `ls -d gdb* | grep -v tar` src
 	rm `find src -name \*.info`
 	mkdir build
diff -urpN gdb-avr-6.4.90.dfsg.orig/makeinfo.diffs gdb-avr-6.4.90.dfsg/makeinfo.diffs
--- gdb-avr-6.4.90.dfsg.orig/makeinfo.diffs	1970-01-01 01:00:00.000000000 +0100
+++ gdb-avr-6.4.90.dfsg/makeinfo.diffs	2008-01-12 12:20:01.000000000 +0100
@@ -0,0 +1,46 @@
+--- gdb-6.4.orig/Makefile.in	2005-12-02 06:29:54.000000000 +0100
++++ gdb-6.4/Makefile.in	2007-12-04 00:28:35.000000000 +0100
+@@ -276,16 +276,13 @@
+ 	then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
+ 	else echo ${CONFIGURED_M4} ; fi`
+ 
+-# For an installed makeinfo, we require it to be from texinfo 4.2 or
+-# higher, else we use the "missing" dummy.  We also pass the subdirectory
+-# makeinfo even if only the Makefile is there, because Texinfo builds its
+-# manual when made, and it requires its own version.
++# We pass the subdirectory makeinfo even if only the Makefile
++# is there, because Texinfo builds its manual when made, and it
++# requires its own version.
+ CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
+ MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
+ 	then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
+-	else if (${CONFIGURED_MAKEINFO} --version \
+-	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
+-        then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
++	else echo ${CONFIGURED_MAKEINFO}; fi`
+ 
+ # This just becomes part of the MAKEINFO definition passed down to
+ # sub-makes.  It lets flags be given on the command line while still
+--- gdb-6.4.orig/Makefile.tpl	2005-10-22 12:37:55.000000000 +0200
++++ gdb-6.4/Makefile.tpl	2007-12-04 00:28:13.000000000 +0100
+@@ -279,16 +279,13 @@
+ 	then echo $$r/$(BUILD_SUBDIR)/m4/m4 ; \
+ 	else echo ${CONFIGURED_M4} ; fi`
+ 
+-# For an installed makeinfo, we require it to be from texinfo 4.2 or
+-# higher, else we use the "missing" dummy.  We also pass the subdirectory
+-# makeinfo even if only the Makefile is there, because Texinfo builds its
+-# manual when made, and it requires its own version.
++# We pass the subdirectory makeinfo even if only the Makefile
++# is there, because Texinfo builds its manual when made, and it
++# requires its own version.
+ CONFIGURED_MAKEINFO = @CONFIGURED_MAKEINFO@
+ MAKEINFO = `if [ -f $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/Makefile ] ; \
+ 	then echo $$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo ; \
+-	else if (${CONFIGURED_MAKEINFO} --version \
+-	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
+-        then echo ${CONFIGURED_MAKEINFO}; else echo $$s/missing makeinfo; fi; fi`
++	else echo ${CONFIGURED_MAKEINFO}; fi`
+ 
+ # This just becomes part of the MAKEINFO definition passed down to
+ # sub-makes.  It lets flags be given on the command line while still

Reply via email to