debian/copyright{,.in}: Adopt from Debian's upload candidate, being DEP-5…

debian/copyright.in

@@ -1484,7 +1484,6 @@ Files: nx-X11/extras/Mesa/include/GL/glext.h
  nx-X11/programs/Xserver/GL/glx/singlesize.h
  nx-X11/programs/Xserver/GL/glx/unpack.h
  nx-X11/programs/Xserver/GL/glx/xfont.c
- nx-X11/programs/Xserver/GL/include/GL/glx_ansic.h
 Copyright: 1991-2000, Silicon Graphics, Inc
   1991-2004, Silicon Graphics, Inc
 License: UNKNOWN
@@ -1862,16 +1861,6 @@ Copyright: 1994-1995, Hewlett-Packard Company
 License: Expat
  FIXME
 
-Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h
- nx-X11/programs/Xserver/GL/include/GL/xf86glx.h
- nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c
- nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
- nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h
- nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h
-Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas
-License: Expat
- FIXME
-
 Files: nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.c
  nx-X11/extras/Mesa/src/mesa/tnl/t_save_api.h
  nx-X11/extras/Mesa/src/mesa/tnl/t_vtx_api.c
@@ -1894,6 +1883,15 @@ Copyright: 1993-1994, 1998 The Open Group
 License: UNKNOWN
  FIXME
 
+Files: nx-X11/extras/Mesa/include/GL/xmesa_xf86.h
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glx.c
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.c
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glx_util.h
+ nx-X11/programs/Xserver/GL/mesa/X/xf86glxint.h
+Copyright: 1998-1999, Precision Insight, Inc., Cedar Park, Texas
+License: Expat
+ FIXME
+
 Files: nx-X11/lib/X11/XimintL.h
  nx-X11/lib/X11/imImSw.c
  nx-X11/lib/X11/imLcIm.c
@@ -1930,15 +1928,6 @@ Copyright: 2004, Eric Anholt
 License: UNKNOWN
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h
- nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h
- nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h
-Copyright: 1999-2001, Brian Paul
-  1999-2003, Brian Paul
-  IBM Corporation 2004
-License: Expat
- FIXME
-
 Files: nx-X11/extras/Mesa/src/mesa/shader/atifragshader.c
  nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.c
  nx-X11/extras/Mesa/src/mesa/swrast/s_atifragshader.h
@@ -2010,6 +1999,21 @@ Copyright: 1987, the Regents of the University of California
 License: UNKNOWN
  FIXME
 
+Files: nx-X11/extras/Mesa/src/mesa/glapi/glapitable.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glapitemp.h
+Copyright: 1999-2001, Brian Paul
+  1999-2003, Brian Paul
+  IBM Corporation 2004
+License: Expat
+ FIXME
+
+Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h
+ nx-X11/extras/Mesa/src/mesa/glapi/glprocs.h
+Copyright: 1999-2001, Brian Paul
+  IBM Corporation 2004,
+License: Expat
+ FIXME
+
 Files: nx-X11/programs/Xserver/dix/region.c
  nx-X11/programs/Xserver/mi/mivaltree.c
 Copyright: 1987-1989, 1998 The Open Group
@@ -2214,12 +2218,6 @@ Copyright: 2004, Alexander Gottwald
 License: Expat
  FIXME
 
-Files: nx-X11/extras/Mesa/src/mesa/glapi/glapioffsets.h
-Copyright: 1999-2001, Brian Paul
-  IBM Corporation 2004,
-License: Expat
- FIXME
-
 Files: nx-X11/extras/Mesa/src/mesa/main/simple_list.h
 Copyright: 1997, Keith Whitwell
   1999-2001, Brian Paul