tags 453637 + patch
thanks
Hi,
Attached is an updated diff for this bug. I haven't uploaded it, since
xorp FTBFS for me currently...
--
| Lucas Nussbaum
| [EMAIL PROTECTED] http://www.lucas-nussbaum.net/ |
| jabber: [EMAIL PROTECTED] GPG: 1024D/023B3F4F |
diff -u xorp-1.5~cvs.20070824/debian/changelog xorp-1.5~cvs.20070824/debian/changelog
--- xorp-1.5~cvs.20070824/debian/changelog
+++ xorp-1.5~cvs.20070824/debian/changelog
@@ -1,3 +1,12 @@
+xorp (1.5~cvs.20070824-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/rules: fixed bashisms (use of pushd/popd). Note that each
+ line in a makefile is executed in a sub-shell, so you don't need to
+ go back to the previous dir. Closes: #453637.
+
+ -- Lucas Nussbaum <[EMAIL PROTECTED]> Sun, 20 Jan 2008 15:39:59 +0100
+
xorp (1.5~cvs.20070824-1) unstable; urgency=low
* Upload this package to the main archive (Closes: #433467)
diff -u xorp-1.5~cvs.20070824/debian/rules xorp-1.5~cvs.20070824/debian/rules
--- xorp-1.5~cvs.20070824/debian/rules
+++ xorp-1.5~cvs.20070824/debian/rules
@@ -65,7 +65,7 @@
dh_testdir
# Add here commands to compile the indep part of the package.
- pushd docs && $(MAKE) && popd
+ cd docs && $(MAKE)
touch $@
@@ -73,7 +73,7 @@
dh_testdir
dh_testroot
# Add here commands to clean up after the build process.
- pushd docs ; $(MAKE) distclean || true ; popd
+ cd docs ; $(MAKE) distclean || true
-$(MAKE) distclean || true
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
@@ -111,7 +111,7 @@
# Binaries :
find debian/xorp/usr/lib/xorp/bin/ -type f -exec mv -v {} debian/xorp/usr/sbin/ \;
mv debian/xorp/usr/bin/xorp_rtrmgr debian/xorp/usr/sbin/
- pushd debian/xorp/usr/sbin/ && find -type f -exec ln -vsf /usr/sbin/{} ../lib/xorp/bin/ \; && popd
+ cd debian/xorp/usr/sbin/ && find -type f -exec ln -vsf /usr/sbin/{} ../lib/xorp/bin/ \;
# Config files :
cp debian/config.boot.small debian/xorp/etc/xorp/config.boot
diff -u xorp-1.5~cvs.20070824/config.guess xorp-1.5~cvs.20070824/config.guess
--- xorp-1.5~cvs.20070824/config.guess
+++ xorp-1.5~cvs.20070824/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-03-06'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -330,7 +330,7 @@
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
- i86pc:SunOS:5.*:*)
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
exit ;;
sun4*:SunOS:6*:*)
@@ -793,7 +793,7 @@
exit ;;
*:Interix*:[3456]*)
case ${UNAME_MACHINE} in
- x86)
+ x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
EM64T | authenticamd)
diff -u xorp-1.5~cvs.20070824/config.sub xorp-1.5~cvs.20070824/config.sub
--- xorp-1.5~cvs.20070824/config.sub
+++ xorp-1.5~cvs.20070824/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2007-01-18'
+timestamp='2007-06-28'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -475,8 +475,8 @@
basic_machine=craynv-cray
os=-unicosmp
;;
- cr16c)
- basic_machine=cr16c-unknown
+ cr16)
+ basic_machine=cr16-unknown
os=-elf
;;
crds | unos)
@@ -683,6 +683,10 @@
basic_machine=i386-pc
os=-mingw32
;;
+ mingw32ce)
+ basic_machine=arm-unknown
+ os=-mingw32ce
+ ;;
miniframe)
basic_machine=m68000-convergent
;;
