Package: freeglut
Followup-For: Bug #473305
As was threatened in the original bug report, I have uploaded an NMU of
your package to the 7-day DELAYED queue on gluck. If you take no action
this NMU will hit the archive in 7 days. If this is a problem please let
me know, or just upload your own package within the next week and it
will override my NMU.
Attached is the debdiff of my upload.
-- System Information:
Debian Release: lenny/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.24-1-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
reverted:
--- freeglut-2.4.0/progs/.cvsignore
+++ freeglut-2.4.0.orig/progs/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
reverted:
--- freeglut-2.4.0/progs/demos/CallbackMaker/.cvsignore
+++ freeglut-2.4.0.orig/progs/demos/CallbackMaker/.cvsignore
@@ -1,5 +0,0 @@
-.deps
-.libs
-CallbackMaker
-Makefile
-Makefile.in
reverted:
--- freeglut-2.4.0/progs/demos/shapes/.cvsignore
+++ freeglut-2.4.0.orig/progs/demos/shapes/.cvsignore
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-shapes
reverted:
--- freeglut-2.4.0/progs/demos/Lorenz/.cvsignore
+++ freeglut-2.4.0.orig/progs/demos/Lorenz/.cvsignore
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-lorenz
reverted:
--- freeglut-2.4.0/progs/demos/Fractals_random/.cvsignore
+++ freeglut-2.4.0.orig/progs/demos/Fractals_random/.cvsignore
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-fractals_random
reverted:
--- freeglut-2.4.0/progs/demos/One/.cvsignore
+++ freeglut-2.4.0.orig/progs/demos/One/.cvsignore
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-one
reverted:
--- freeglut-2.4.0/progs/demos/.cvsignore
+++ freeglut-2.4.0.orig/progs/demos/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
reverted:
--- freeglut-2.4.0/progs/demos/Fractals/.cvsignore
+++ freeglut-2.4.0.orig/progs/demos/Fractals/.cvsignore
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-fractals
diff -u freeglut-2.4.0/autogen.sh freeglut-2.4.0/autogen.sh
--- freeglut-2.4.0/autogen.sh
+++ freeglut-2.4.0/autogen.sh
@@ -3,10 +3,10 @@
echo "Generating build information using aclocal, automake and autoconf"
echo "This may take a while ..."
-aclocal-1.8
+aclocal-1.9
autoheader
libtoolize --copy --force
-automake-1.8 --copy --add-missing
+automake-1.9 --copy --add-missing
autoconf
echo "Now you are ready to run ./configure"
reverted:
--- freeglut-2.4.0/freeglut/.cvsignore
+++ freeglut-2.4.0.orig/freeglut/.cvsignore
@@ -1,17 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-autoscan.log
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-configure.scan
-freeglut-*.tar.gz
-libtool
-ltmain.sh
-stamp-h1
diff -u freeglut-2.4.0/config.sub freeglut-2.4.0/config.sub
--- freeglut-2.4.0/config.sub
+++ freeglut-2.4.0/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-06-28'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -813,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1021,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
reverted:
--- freeglut-2.4.0/doc/.cvsignore
+++ freeglut-2.4.0.orig/doc/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff -u freeglut-2.4.0/config.guess freeglut-2.4.0/config.guess
--- freeglut-2.4.0/config.guess
+++ freeglut-2.4.0/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-07-22'
+timestamp='2008-01-23'
# 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
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk
'{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1;
then
IBM_ARCH=rs6000
@@ -799,6 +799,9 @@
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
reverted:
--- freeglut-2.4.0/src/.cvsignore
+++ freeglut-2.4.0.orig/src/.cvsignore
@@ -1,6 +0,0 @@
-*.la
-*.lo
-.deps
-.libs
-Makefile
-Makefile.in
diff -u freeglut-2.4.0/debian/changelog freeglut-2.4.0/debian/changelog
--- freeglut-2.4.0/debian/changelog
+++ freeglut-2.4.0/debian/changelog
@@ -1,3 +1,11 @@
+freeglut (2.4.0-6.1) unstable; urgency=low
+
+ * NMU.
+ * autogen.sh, debian/control: Use automake 1.9 instead of automake
+ 1.8. (Closes: #473305)
+
+ -- Eric Dorland <[EMAIL PROTECTED]> Sat, 03 May 2008 00:50:47 -0400
+
freeglut (2.4.0-6) unstable; urgency=low
* Acknowledge NMUs. Thanks Daniel and Aurelien!
diff -u freeglut-2.4.0/debian/control freeglut-2.4.0/debian/control
--- freeglut-2.4.0/debian/control
+++ freeglut-2.4.0/debian/control
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Jamie Wilkinson <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxt-dev, libxext-dev,
xlibmesa-gl-dev | mesag-dev | libgl-dev, libglu1-xorg-dev | xlibmesa-glu-dev |
libglu-dev, libusbhid-dev [kfreebsd-i386 kfreebsd-amd64], automake1.8,
autoconf, libtool
+Build-Depends: debhelper (>= 4.0.0), libx11-dev, libxt-dev, libxext-dev,
xlibmesa-gl-dev | mesag-dev | libgl-dev, libglu1-xorg-dev | xlibmesa-glu-dev |
libglu-dev, libusbhid-dev [kfreebsd-i386 kfreebsd-amd64], automake1.9,
autoconf, libtool
Standards-Version: 3.7.2
Package: freeglut3
reverted:
--- freeglut-2.4.0/include/GL/.cvsignore
+++ freeglut-2.4.0.orig/include/GL/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
reverted:
--- freeglut-2.4.0/include/.cvsignore
+++ freeglut-2.4.0.orig/include/.cvsignore
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
